Skip to content

Commit

Permalink
Merge pull request #466 from xenharmonic-devs/generate-historical
Browse files Browse the repository at this point in the history
Generate historical temperaments and target-tempered generator-stacks
  • Loading branch information
frostburn authored Dec 21, 2023
2 parents d2108d3 + 1b0596e commit b3b1daf
Show file tree
Hide file tree
Showing 5 changed files with 978 additions and 1 deletion.
4 changes: 4 additions & 0 deletions src/assets/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@ button:disabled:hover {
color: var(--color-accent-mute);
background-color: var(--color-accent-background);
}
input:disabled {
color: var(--color-accent-mute);
background-color: var(--color-background-mute);
}
ul.btn-group,
.btn-dropdown-group ul {
list-style: none;
Expand Down
15 changes: 15 additions & 0 deletions src/components/ScaleBuilder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import ApproximateByHarmonicsModal from '@/components/modals/modification/Approx
import SubharmonicSeriesModal from '@/components/modals/generation/SubharmonicSeries.vue'
import EnumerateChordModal from '@/components/modals/generation/EnumerateChord.vue'
import CpsModal from '@/components/modals/generation/CombinationProductSet.vue'
import HistoricalModal from '@/components/modals/generation/HistoricalScale.vue'
import CrossPolytopeModal from '@/components/modals/generation/CrossPolytope.vue'
import LatticeModal from '@/components/modals/generation/SpanLattice.vue'
import EulerGenusModal from '@/components/modals/generation/EulerGenus.vue'
Expand Down Expand Up @@ -162,6 +163,7 @@ const showEulerGenusModal = ref(false)
const showDwarfModal = ref(false)
const showRankTwoModal = ref(false)
const showCrossPolytopeModal = ref(false)
const showHistoricalModal = ref(false)
const showRotateModal = ref(false)
const showSubsetModal = ref(false)
Expand Down Expand Up @@ -250,6 +252,7 @@ function updateScaleAndHideModals(scale: Scale) {
showDwarfModal.value = false
showCrossPolytopeModal.value = false
showLatticeModal.value = false
showHistoricalModal.value = false
showRotateModal.value = false
showSubsetModal.value = false
showStretchModal.value = false
Expand Down Expand Up @@ -291,6 +294,7 @@ function confirmPreset() {
<a href="#" @click="showEnumerateChordModal = true"><li>Enumerate chord</li></a>
<a href="#" @click="showCpsModal = true"><li>Combination product set</li></a>
<a href="#" @click="showMosModal = true"><li>Moment of symmetry scale</li></a>
<a href="#" @click="showHistoricalModal = true"><li>Historical temperament</li></a>
<a href="#" @click="showEulerGenusModal = true"><li>Euler-Fokker genus</li></a>
<a href="#" @click="showDwarfModal = true"><li>Dwarf scale</li></a>
<a href="#" @click="showCrossPolytopeModal = true"><li>Cross-polytope</li></a>
Expand Down Expand Up @@ -540,6 +544,17 @@ function confirmPreset() {
@cancel="showRankTwoModal = false"
/>

<HistoricalModal
:show="showHistoricalModal"
:centsFractionDigits="centsFractionDigits"
@update:scaleName="emit('update:scaleName', $event)"
@update:scale="updateScaleAndHideModals"
@update:baseFrequency="emit('update:baseFrequency', $event)"
@update:baseMidiNote="emit('update:baseMidiNote', $event)"
@update:keyColors="emit('update:keyColors', $event)"
@cancel="showHistoricalModal = false"
/>

<ShareUrlModal
ref="shareUrlModal"
:show="showShareUrlModal"
Expand Down
Loading

0 comments on commit b3b1daf

Please sign in to comment.