+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Advanced options
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
{{ rank2.error }}
+
+
+
+ MOS sizes
+ ⚠
+
+
+
@@ -463,7 +407,7 @@ function generate(expand = true) {
>
Raw
-
⚠
+
⚠
{{ rank2.previewMosPattern }}
@@ -492,4 +436,9 @@ function generate(expand = true) {
.wide-range {
width: 100%;
}
+
+p.warning {
+ height: 3em;
+ overflow-y: hidden;
+}
diff --git a/src/components/modals/generation/SpanLattice.vue b/src/components/modals/generation/SpanLattice.vue
index 62dc36f1..1c6fb63a 100644
--- a/src/components/modals/generation/SpanLattice.vue
+++ b/src/components/modals/generation/SpanLattice.vue
@@ -3,12 +3,12 @@ import { ref, watch } from 'vue'
import Modal from '@/components/ModalDialog.vue'
import ScaleLineInput from '@/components/ScaleLineInput.vue'
import { OCTAVE } from '@/constants'
-import Temperament from 'temperaments'
import { useLatticeStore } from '@/stores/tempering'
-import { setAndReportValidity } from '@/utils'
+import { centString, setAndReportValidity } from '@/utils'
import { useStateStore } from '@/stores/state'
import { arrayToString, expandCode, parseInterval } from '@/utils'
import { Interval, intervalValueAs } from 'sonic-weave'
+import { mmod } from 'xen-dev-utils'
defineProps<{
show: boolean
@@ -20,33 +20,36 @@ const lattice = useLatticeStore()
const state = useStateStore()
const basisElement = ref
(null)
+const valsInput = ref(null)
+const commasInput = ref(null)
+const subgroupInput = ref(null)
+
watch(
() => lattice.basisError,
(newError) => setAndReportValidity(basisElement.value, newError)
)
function calculateGenerators() {
- let temperament: Temperament
+ const generators = lattice.temperament.generators
+ if (!generators.length) {
+ return
+ }
if (lattice.method === 'vals') {
- temperament = Temperament.fromVals(lattice.vals, lattice.subgroup)
+ lattice.comment = `vals = ${lattice.valsString}`
+ } else if (lattice.method === 'commas') {
+ lattice.comment = `commas = ${lattice.commasString}`
} else {
- temperament = Temperament.fromCommas(lattice.commas, lattice.subgroup)
+ lattice.comment = ''
}
- let periodGenerators: number[]
- try {
- periodGenerators = temperament.periodGenerators(lattice.options)
- } catch {
- alert('Unable to calculate generators.')
- return
+ const period = generators.shift()!
+ for (let i = 0; i < generators.length; ++i) {
+ generators[i] = mmod(generators[i], period)
}
- lattice.equaveString = periodGenerators[0].toFixed(state.centsFractionDigits)
+ lattice.equaveString = centString(period, state.centsFractionDigits)
lattice.equave = parseInterval(lattice.equaveString)
- lattice.basisString = periodGenerators
- .slice(1)
- .map((g) => g.toFixed(state.centsFractionDigits))
- .join(' ')
+ lattice.basisString = generators.map((g) => centString(g, state.centsFractionDigits)).join(' ')
lattice.method = 'generators'
}
@@ -71,28 +74,24 @@ function flip(index: number) {
}
function generate(expand = true) {
- try {
- const source = `parallelotope(${arrayToString(lattice.basis)}, ${arrayToString(lattice.ups)}, ${arrayToString(lattice.downs)}, ${lattice.equave.toString()})`
- let name = `Parallelotope (${lattice.dimensions} of ${lattice.basisString}`
- if (lattice.basis.length === 0) {
- name = 'Parallelotope (unison'
- }
- if (!lattice.equave.equals(OCTAVE)) {
- name += ` over ${lattice.equave.toString()}`
- }
- name += ')'
- emit('update:scaleName', name)
- if (expand) {
- emit('update:source', expandCode(source))
- } else {
- emit('update:source', source)
- }
- } catch (error) {
- if (error instanceof Error) {
- alert(error.message)
- } else {
- alert(error)
- }
+ let source = ''
+ if (lattice.comment.length) {
+ source = `(* ${lattice.comment} *)\n`
+ }
+ source += `parallelotope(${arrayToString(lattice.basis)}, ${arrayToString(lattice.ups)}, ${arrayToString(lattice.downs)}, ${lattice.equave.toString()})`
+ let name = `Parallelotope (${lattice.dimensions} of ${lattice.basisString}`
+ if (lattice.basis.length === 0) {
+ name = 'Parallelotope (unison'
+ }
+ if (!lattice.equave.equals(OCTAVE)) {
+ name += ` over ${lattice.equave.toString()}`
+ }
+ name += ')'
+ emit('update:scaleName', name)
+ if (expand) {
+ emit('update:source', expandCode(source))
+ } else {
+ emit('update:source', source)
}
}
@@ -167,14 +166,22 @@ function generate(expand = true) {
/>