Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#2418 の変更提案プルリクエスト #2

Merged
merged 2 commits into from
Dec 22, 2024
Merged

#2418 の変更提案プルリクエスト #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73501e1
a
Hiroshiba Dec 20, 2024
6997174
Merge remote-tracking branch 'takusea/redesign-preset-manage-dialog' …
Hiroshiba Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 25 additions & 71 deletions src/components/Dialog/PresetManageDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,27 +60,33 @@
<div class="parameter-list">
<h2 class="preset-name">{{ selectedPreset.name }}</h2>
<template
v-for="parameter in Object.entries(SLIDER_PARAMETERS)"
:key="parameter[0]"
v-for="(value, sliderKey) in SLIDER_PARAMETERS"
:key="sliderKey"
>
<div
v-if="getParameterConfig(parameter[0])"
v-if="sliderKey in parameterLabels"
class="parameter"
>
<div class="parameter-header">
<span>
{{ getParameterConfig(parameter[0])?.label }}
{{ parameterLabels[sliderKey as ParameterType] }}
</span>
<span>
{{ getParameterValue(parameter[0])?.toFixed(2) }}
{{
selectedPreset[
sliderKey as ParameterType
].toFixed(2)
}}
</span>
</div>
<!-- NOTE: プルリクエスト分割のため、まずは動かないスライダーが実装されている。変更機能も実装予定。 -->
<BaseSlider
:min="parameter[1].min()"
:max="parameter[1].max()"
:step="parameter[1].step()"
:modelValue="getParameterValue(parameter[0]) ?? 0"
:min="value.min()"
:max="value.max()"
:step="value.step()"
:modelValue="
selectedPreset[sliderKey as ParameterType]
"
/>
</div>
</template>
Expand Down Expand Up @@ -153,7 +159,7 @@ import BaseIconButton from "@/components/Base/BaseIconButton.vue";
import BaseSlider from "@/components/Base/BaseSlider.vue";
import CharacterButton from "@/components/CharacterButton.vue";
import { useDefaultPreset } from "@/composables/useDefaultPreset";
import { Preset, PresetKey } from "@/type/preload";
import { Preset, PresetKey, PresetSliderKey } from "@/type/preload";
import { SLIDER_PARAMETERS } from "@/store/utility";

const props = defineProps<{
Expand Down Expand Up @@ -205,67 +211,15 @@ const selectedPreset = computed(() => {
);
});

const parameterConfigs = [
{
label: "話速",
parameterKey: "speedScale",
},
{
label: "音高",
parameterKey: "pitchScale",
},
{
label: "抑揚",
parameterKey: "intonationScale",
},
{
label: "音量",
parameterKey: "volumeScale",
},
{
label: "開始無音",
parameterKey: "prePhonemeLength",
},
{
label: "終了無音",
parameterKey: "postPhonemeLength",
},
];

const getParameterConfig = (sliderKey: string) => {
switch (sliderKey) {
case "SPEED":
return parameterConfigs[0];
case "PITCH":
return parameterConfigs[1];
case "INTONATION":
return parameterConfigs[2];
case "VOLUME":
return parameterConfigs[3];
case "PRE_PHONEME_LENGTH":
return parameterConfigs[4];
case "POST_PHONEME_LENGTH":
return parameterConfigs[5];
}
};

const getParameterValue = (sliderKey: string) => {
if (!selectedPreset.value) {
throw new Error("selectedPreset is undefined");
}

const parameters = Object.entries(selectedPreset.value);
const parameter = parameters.find(
(preset) => preset[0] === getParameterConfig(sliderKey)?.parameterKey,
);

const parameterValue = Number(parameter?.[1]);

if (Number.isNaN(parameterValue)) {
return;
}

return parameterValue;
type ParameterType = Exclude<PresetSliderKey, "morphingRate">;
const parameterLabels: Record<ParameterType, string> = {
speedScale: "話速",
pitchScale: "音高",
intonationScale: "抑揚",
volumeScale: "音量",
pauseLengthScale: "間の長さ",
prePhonemeLength: "開始無音",
postPhonemeLength: "終了無音",
};

const reorderPreset = (featurePresetList: (Preset & { key: PresetKey })[]) => {
Expand Down
Loading