From 88582e545af4536f4da49e3d970b43f142b5d9b9 Mon Sep 17 00:00:00 2001
From: Romot <romot@romotmbp16.local>
Date: Thu, 5 Jan 2023 18:37:42 +0900
Subject: [PATCH] =?UTF-8?q?#986=20=E4=B8=80=E5=BF=9C=E3=81=AA=E3=81=8C?=
 =?UTF-8?q?=E3=82=89=E8=BF=BD=E5=8A=A0/=E5=89=8A=E9=99=A4/=E6=AD=8C?=
 =?UTF-8?q?=E8=A9=9E=E5=85=A5=E5=8A=9B=E3=81=8C=E8=A1=8C=E3=81=88=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/ScoreSequencer.vue | 103 ++++++++++++++++++++++---
 src/helpers/singHelper.ts              |  19 +++++
 src/store/singing.ts                   |  46 +++++++++++
 src/store/type.ts                      |  15 ++++
 4 files changed, 173 insertions(+), 10 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index b2e0315e4c..0d873a6247 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -27,32 +27,41 @@
             y.pitch === 'C' ? 'key-c' : ''
           } ${y.pitch === 'F' ? 'key-f' : ''}`"
           :id="`sequencer-cell-${x}-${y.midi}`"
+          @click="addNote(x, y.midi)"
         />
       </div>
       <div
         v-for="(note, index) in notes"
         :key="index"
+        class="sequencer-note"
+        @dblclick="removeNote(index)"
         v-bind:style="{
-          background: '#ddd',
-          position: 'absolute',
-          border: '1px solid #333',
           left: `${note.position}px`,
-          bottom: `${(note.midi + 1) * 24}px`,
+          bottom: `${note.midi * 24}px`,
           width: `${note.duration}px`,
           height: '24px',
-          zIndex: 10,
         }"
       >
-        {{ note.midi }}
+        <input
+          type="text"
+          class="sequencer-note-lyric"
+          :value="note.lyric"
+          @input="(e) => setLyric(index, e)"
+        />
+        <div class="sequencer-note-bar" />
       </div>
     </div>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, ref } from "vue";
+import { defineComponent, computed } from "vue";
 import { useStore } from "@/store";
-import { midiKeys } from "@/helpers/singHelper";
+import {
+  midiKeys,
+  getPitchFromMidi,
+  getDoremiFromMidi,
+} from "@/helpers/singHelper";
 
 export default defineComponent({
   name: "SingScoreSequencer",
@@ -66,19 +75,63 @@ export default defineComponent({
       const minDuration = resolution * 4 * 16;
       const lastNote = store.state.score?.notes.slice(-1)[0];
       const totalDuration = lastNote
-        ? Math.min(lastNote.position + lastNote.duration, minDuration)
+        ? Math.max(lastNote.position + lastNote.duration, minDuration)
         : minDuration;
       // NOTE: グリッド幅1/16: 設定できるようにする必要あり
       const gridDuration = resolution / 4;
-      return [...Array(Math.ceil(totalDuration / gridDuration)).keys()];
+      return [...Array(Math.ceil(totalDuration / gridDuration)).keys()].map(
+        (gridNum) => gridNum * gridDuration
+      );
     });
     const notes = computed(() => store.state.score?.notes);
     const timeSignatures = computed(() => store.state.score?.timeSignatures);
+    const zoomX = computed(() => store.state.sequencerZoomX);
+    const zoomY = computed(() => store.state.sequencerZoomY);
+
+    const addNote = (position: number, midi: number) => {
+      // NOTE: フォーカスなど動作変更
+      store.dispatch("ADD_NOTE", {
+        note: {
+          position,
+          midi,
+          duration: 120,
+          lyric: getDoremiFromMidi(midi),
+        },
+      });
+    };
+
+    const removeNote = (index: number) => {
+      store.dispatch("REMOVE_NOTE", { index });
+    };
+
+    const setLyric = (index: number, event: Event) => {
+      if (!(event.target instanceof HTMLInputElement)) {
+        return;
+      }
+      if (event.target.value && store.state.score) {
+        const currentNote = store.state.score?.notes[index];
+        const lyric = event.target.value;
+        store.dispatch("CHANGE_NOTE", {
+          index,
+          note: {
+            ...currentNote,
+            lyric,
+          },
+        });
+      }
+    };
+
     return {
       timeSignatures,
       gridY,
       gridX,
       notes,
+      zoomX,
+      zoomY,
+      getPitchFromMidi,
+      addNote,
+      removeNote,
+      setLyric,
     };
   },
 });
@@ -184,5 +237,35 @@ export default defineComponent({
   &.key-c {
     border-bottom: 1px solid #ccc;
   }
+
+  &:hover {
+    background: rgba(colors.$primary-light-rgb, 0.5);
+    cursor: pointer;
+  }
+}
+
+.sequencer-note {
+  position: absolute;
+}
+
+.sequencer-note-lyric {
+  background: white;
+  border: 0;
+  border: 1px solid colors.$primary-light;
+  border-radius: 2px 2px 0 0;
+  font-weight: bold;
+  outline: none;
+  position: absolute;
+  top: -20px;
+  left: 4px;
+  width: 3rem;
+}
+
+.sequencer-note-bar {
+  background: colors.$primary;
+  border-radius: 2px;
+  height: 24px;
+  padding: 0 4px;
+  width: 100%;
 }
 </style>
diff --git a/src/helpers/singHelper.ts b/src/helpers/singHelper.ts
index b43c5882dd..e2e801227a 100644
--- a/src/helpers/singHelper.ts
+++ b/src/helpers/singHelper.ts
@@ -17,6 +17,25 @@ export function getPitchFromMidi(midi: number): string {
   return mapPitches[pitchPos];
 }
 
+export function getDoremiFromMidi(midi: number): string {
+  const mapPitches: Array<string> = [
+    "ド",
+    "ド",
+    "レ",
+    "レ",
+    "ミ",
+    "ファ",
+    "ファ",
+    "ソ",
+    "ソ",
+    "ラ",
+    "ラ",
+    "ラ",
+  ];
+  const pitchPos = midi % 12;
+  return mapPitches[pitchPos];
+}
+
 export function getOctaveFromMidi(midi: number): number {
   return Math.floor(midi / 12) - 1;
 }
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 9b98223af6..c2aff71fa3 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -270,6 +270,52 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
+  ADD_NOTE: {
+    mutation(state, { note }: { note: Note }) {
+      if (state.score) {
+        const notes = [...state.score.notes].concat(note).sort((a, b) => {
+          return a.position < b.position ? -1 : 1;
+        });
+        state.score.notes = notes;
+      }
+    },
+    // ノートを追加する
+    // NOTE: 重複削除など別途追加
+    async action({ state, commit }, { note }: { note: Note }) {
+      if (state.score === undefined) {
+        throw new Error("Score is not initialized.");
+      }
+      commit("ADD_NOTE", { note });
+    },
+  },
+
+  CHANGE_NOTE: {
+    mutation(state, { index, note }: { index: number; note: Note }) {
+      state.score?.notes.splice(index, 1, note);
+    },
+    async action(
+      { state, commit },
+      { index, note }: { index: number; note: Note }
+    ) {
+      if (state.score === undefined) {
+        throw new Error("Score is not initialized.");
+      }
+      commit("CHANGE_NOTE", { index, note });
+    },
+  },
+
+  REMOVE_NOTE: {
+    mutation(state, { index }: { index: number }) {
+      state.score?.notes.splice(index, 1);
+    },
+    async action({ state, commit }, { index }: { index: number }) {
+      if (state.score === undefined) {
+        throw new Error("Score is not initialized.");
+      }
+      commit("REMOVE_NOTE", { index });
+    },
+  },
+
   IMPORT_MIDI_FILE: {
     action: createUILockAction(
       async ({ dispatch }, { filePath }: { filePath?: string }) => {
diff --git a/src/store/type.ts b/src/store/type.ts
index a7c3f531d9..6a44620dca 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -745,6 +745,21 @@ export type SingingStoreTypes = {
     action(payload: { position: number }): void;
   };
 
+  ADD_NOTE: {
+    mutation: { note: Note };
+    action(payload: { note: Note }): void;
+  };
+
+  CHANGE_NOTE: {
+    mutation: { index: number; note: Note };
+    action(payload: { index: number; note: Note }): void;
+  };
+
+  REMOVE_NOTE: {
+    mutation: { index: number };
+    action(payload: { index: number }): void;
+  };
+
   IMPORT_MIDI_FILE: {
     action(payload: { filePath?: string }): void;
   };