Make it possible to cancel "Approximate by ratios"

ref #683
xenharmonic-devs · Jun 13, 2024 · e1b5cf9 · e1b5cf9
1 parent bcb5875
commit e1b5cf9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/cypress/e2e/basic.cy.ts b/cypress/e2e/basic.cy.ts
@@ -49,7 +49,7 @@ describe("Scale generation/modification", () => {
     for (let i = 0; i < 5; ++i) {
       cy.get("button").contains("Apply").click();
     }
-    cy.get("button").contains("Close").click();
+    cy.get("button").contains("Done").click();
     cy.get("#scale-data").should("contain.value", "8/7");
   });
 });
diff --git a/src/components/ModifyScale.vue b/src/components/ModifyScale.vue
@@ -141,7 +141,7 @@ function clickSubset() {
 }
 
 function clickApproximateByRatios() {
-  approx.initialize()
+  approx.initialize(scale.sourceText)
   showApproximateByRatiosModal.value = true
 }
 

diff --git a/src/components/modals/modification/ApproximateByRatios.vue b/src/components/modals/modification/ApproximateByRatios.vue
@@ -121,10 +121,15 @@ function modify(expand = true) {
   scale.computeScale()
   emit('done')
 }
+
+function cancel() {
+  scale.sourceText = approx.originalSource
+  emit('done')
+}
 </script>
 
 <template>
-  <Modal @confirm="modify(true)" @cancel="modify(false)">
+  <Modal @confirm="modify(true)" @cancel="cancel">
     <template #header>
       <h2>Approximate by ratios</h2>
     </template>
@@ -233,8 +238,9 @@ function modify(expand = true) {
     <template #footer>
       <div class="btn-group">
         <button @click="modifyAndAdvance">Apply</button>
-        <button @click="modify(true)">Close</button>
+        <button @click="modify(true)">Done</button>
         <button @click="modify(false)">Raw</button>
+        <button @click="cancel">Cancel</button>
       </div>
     </template>
   </Modal>

diff --git a/src/stores/approximate-by-ratios.ts b/src/stores/approximate-by-ratios.ts
@@ -12,6 +12,7 @@ export const useApproximateByRatiosStore = defineStore('approximate-by-ratios',
   const oddLimit = ref(9)
   const primeLimit = ref(7)
   const maxExponent = ref(2)
+  const originalSource = ref('')
 
   const safeOddLimit = computed(() => clamp(3, 101, 2 * Math.floor(oddLimit.value / 2) + 1))
   const safePrimeLimit = computed(() => {
@@ -92,9 +93,10 @@ export const useApproximateByRatiosStore = defineStore('approximate-by-ratios',
     return '>97-limit'
   }
 
-  function initialize() {
+  function initialize(source: string) {
     degree.value = 1
     approximationIndex.value = 0
+    originalSource.value = source
   }
 
   return {
@@ -110,6 +112,7 @@ export const useApproximateByRatiosStore = defineStore('approximate-by-ratios',
     safeOddLimit,
     safePrimeLimit,
     safeMaxExponent,
+    originalSource,
     modifyPrimeLimit,
     primeLimitString,
     initialize