From ed28f9334ebe9bd3c0beb1dda19723c24a9107b9 Mon Sep 17 00:00:00 2001
From: Lumi Pakkanen <lumi.pakkanen@gmail.com>
Date: Mon, 29 Jul 2024 09:55:13 +0300
Subject: [PATCH] Show pitch associated with MIDI base index

ref #795
---
 CHANGELOG.md                     |  3 +++
 src/components/ScaleControls.vue | 10 +++++++++-
 src/utils.ts                     | 14 +++++++++++---
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 679574dd..ae759d25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change log
 
+## 3.0.1
+ * Regression: Show pitch associated with MIDI base index [#795](https://github.com/xenharmonic-devs/scale-workshop/issues/795)
+
 ## 3.0.0
  * Feature: Core language switched to from [scale-workshop-core](https://github.com/xenharmonic-devs/scale-workshop-core) to [sonic-weave](https://github.com/xenharmonic-devs/sonic-weave)
  * Feature: Custom interval labels e.g. `3/2 "my fifth"`
diff --git a/src/components/ScaleControls.vue b/src/components/ScaleControls.vue
index 46449468..cdf1cbda 100644
--- a/src/components/ScaleControls.vue
+++ b/src/components/ScaleControls.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useScaleStore } from '@/stores/scale'
-import { debounce } from '@/utils'
+import { debounce, midiNoteNumberToName } from '@/utils'
 import { ref } from 'vue'
 import ScaleRule from './ScaleRule.vue'
 import palette from '@/character-palette.json'
@@ -57,6 +57,9 @@ defineExpose({ focus, clearPaletteInfo })
         v-model="scale.baseMidiNote"
         @input="updateScale()"
       />
+      <span class="midi-name">{{
+        midiNoteNumberToName(scale.baseMidiNote, -1, scale.accidentalPreference)
+      }}</span>
     </div>
 
     <div class="control">
@@ -160,6 +163,11 @@ defineExpose({ focus, clearPaletteInfo })
 </template>
 
 <style scoped>
+.midi-name {
+  width: 1em;
+  margin-left: 0.4em;
+  margin-right: 0.4em;
+}
 .info {
   height: 3em;
   overflow-y: hidden;
diff --git a/src/utils.ts b/src/utils.ts
index b7da4177..a2bfcafc 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -123,7 +123,7 @@ export function debounce(func: (...args: any[]) => void, timeout = 300) {
   }
 }
 
-const MIDI_NOTE_NAMES = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'B']
+const MIDI_NOTE_NAMES = ['C♮', 'C♯', 'D♮', 'D♯', 'E♮', 'F♮', 'F♯', 'G♮', 'G♯', 'A♮', 'A♯', 'B♮']
 
 /**
  * Convert an integer MIDI note number to a name such as A4.
@@ -131,10 +131,18 @@ const MIDI_NOTE_NAMES = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', '
  * @param octaveOffset Defaults to the English standard: 69 = A4. An offset of zero results in the French standard 69 = A5.
  * @returns String representation of the MIDI note number.
  */
-export function midiNoteNumberToName(noteNumber: number, octaveOffset = -1) {
+export function midiNoteNumberToName(
+  noteNumber: number,
+  octaveOffset = -1,
+  accidentalStyle: AccidentalStyle = 'ASCII'
+) {
   const remainder = mmod(noteNumber, 12)
   const quotient = (noteNumber - remainder) / 12 + octaveOffset
-  return MIDI_NOTE_NAMES[remainder] + quotient.toString()
+  const result = MIDI_NOTE_NAMES[remainder] + quotient.toString()
+  if (accidentalStyle === 'ASCII') {
+    return result.replace('♮', '').replace('♯', '#')
+  }
+  return result
 }
 
 export function sanitizeFilename(input: string) {