エディタ表示できた！

Hiroshiba · Sep 7, 2024 · cdec85a · cdec85a
1 parent 52c3e72
commit cdec85a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
@@ -216,6 +216,10 @@ import { applyGaussianFilter, linearInterpolation } from "@/sing/utility";
 import { useLyricInput } from "@/composables/useLyricInput";
 import { ExhaustiveError } from "@/type/utility";
 import { uuid4 } from "@/helpers/random";
+import {
+  onMountedOrActivated,
+  onUnmountedOrDeactivated,
+} from "@/composables/onMountOrActivate";
 
 type PreviewMode =
   | "ADD_NOTE"
@@ -1333,7 +1337,7 @@ onMounted(() => {
 let firstActivation = true;
 
 // スクロール位置を設定する
-onActivated(() => {
+onMountedOrActivated(() => {
   const sequencerBodyElement = sequencerBody.value;
   if (!sequencerBodyElement) {
     throw new Error("sequencerBodyElement is null.");
@@ -1362,7 +1366,7 @@ onActivated(() => {
 });
 
 // リスナー登録
-onActivated(() => {
+onMountedOrActivated(() => {
   void store.dispatch("ADD_PLAYHEAD_POSITION_CHANGE_LISTENER", {
     listener: playheadPositionChangeListener,
   });
@@ -1371,7 +1375,7 @@ onActivated(() => {
 });
 
 // リスナー解除
-onDeactivated(() => {
+onUnmountedOrDeactivated(() => {
   void store.dispatch("REMOVE_PLAYHEAD_POSITION_CHANGE_LISTENER", {
     listener: playheadPositionChangeListener,
   });

diff --git a/src/components/Sing/SingEditor.stories.ts b/src/components/Sing/SingEditor.stories.ts
@@ -27,8 +27,6 @@ import defaultTheme from "@/../public/themes/default.json";
 import { cloneWithUnwrapProxy } from "@/helpers/cloneWithUnwrapProxy";
 import { assetsPath } from "@/mock/engineMock/constants";
 
-TODO: SingEditorの縦幅を変わらないようにする;
-
 const meta: Meta<typeof SingEditor> = {
   component: SingEditor,
   args: {

diff --git a/src/components/Sing/SingEditor.vue b/src/components/Sing/SingEditor.vue
@@ -131,10 +131,8 @@ onetimeWatch(
 @use "@/styles/variables" as vars;
 @use "@/styles/colors" as colors;
 
-.layout-container {
-  min-height: calc(100vh - #{vars.$menubar-height});
-}
 .sing-main {
+  height: calc(100vh - #{vars.$toolbar-height});
   display: flex;
   overflow: hidden;
   position: relative;

diff --git a/src/mock/engineMock/index.ts b/src/mock/engineMock/index.ts
@@ -182,7 +182,7 @@ export function createOpenAPIEngineMock(): IEngineConnectorFactory {
               volume,
               phonemes,
               volumeScale: 1.0,
-              outputSamplingRate: 44100,
+              outputSamplingRate: 24000,
               outputStereo: false,
             };
           },

diff --git a/src/mock/engineMock/singModelMock.ts b/src/mock/engineMock/singModelMock.ts
@@ -112,14 +112,14 @@ export function notesAndFramePhonemesToPitchMock(
     if (phoneme.phoneme == "pau") {
       pitch = 0;
     } else {
-      console.log("notesAndFramePhonemesToPitchMock phoneme", phoneme);
-
       // IDが同じノートを探す
       const note = notes
         .filter((note) => note.id != undefined)
         .find((note) => note.id == phoneme.noteId);
       if (note == undefined)
-        throw new Error(`ノートが見つかりません: ${i} ${phoneme.phoneme}`);
+        throw new Error(
+          `ノートが見つかりません: index=${i} phoneme=${phoneme.phoneme}`,
+        );
 
       if (note.key != undefined) {
         pitch = phonemeAndKeyToPitchMock(phoneme.phoneme, note.key);

diff --git a/src/sing/phraseRendering.ts b/src/sing/phraseRendering.ts
@@ -65,6 +65,7 @@ const createNotesForRequestToEngine = (
     );
     const noteOffFrame = Math.round(noteOffSeconds * frameRate);
     notesForRequestToEngine.push({
+      id: note.id,
       key: note.noteNumber,
       frameLength: noteOffFrame - noteOnFrame,
       lyric: note.lyric,