-
Notifications
You must be signed in to change notification settings - Fork 310
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.
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
ENH: モーフィングUIの実装 #1030
Merged
Merged
ENH: モーフィングUIの実装 #1030
Changes from 3 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
bc41c37
ENH: audioStoreにモーフィング適用するための操作を追加
sabonerune 202f31a
FIX: MorphingInfo型からundefinedを除去
sabonerune 9a15da6
ENH: モーフィングUIとプリセットを追加
sabonerune bd6e7a2
Update src/components/AudioInfo.vue
sabonerune c5991c8
Update src/components/AudioInfo.vue
sabonerune efe21bd
FIX: 変数名等を修正
sabonerune 811dee7
FIX: convertAudioQueryFromEditorToEngineを共通化
sabonerune 9ba2528
ADD: モーフィングの設定が不正である場合エラーを返してその旨をダイアログに表示する
sabonerune 9355128
Merge branch 'main' into morphing_ui/audioStore
sabonerune 8156f65
FIX: GenerateAudioResultObjectを廃止して例外を投げるように変更
sabonerune 586ed7b
FIX: PLAY_AUDIOのエラー処理を変更
sabonerune f754a6e
FIX: 設定でモーフィングが無効化されていてもモーフィングが行われるように変更
sabonerune 5dc0556
FIXMEコメントの追加
sabonerune bd2b4f1
FIX: Errorの型名を変更
sabonerune 97a59af
Merge branch 'main' into working/morphing_ui
sabonerune File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,9 +24,9 @@ | |
transition-show="none" | ||
transition-hide="none" | ||
> | ||
<q-list> | ||
<q-list style="min-width: max-content"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 右方向に十分スペースがなかったときスタイル名が改行されてしまう問題への対処 |
||
<q-item | ||
v-if="selectedStyleInfo == undefined" | ||
v-if="selectedStyleInfo == undefined && !emptiable" | ||
class="row no-wrap items-center" | ||
> | ||
<span class="text-warning vertical-middle" | ||
|
@@ -123,7 +123,7 @@ | |
class="character-menu" | ||
v-model="subMenuOpenFlags[characterIndex]" | ||
> | ||
<q-list> | ||
<q-list style="min-width: max-content"> | ||
<q-item | ||
v-for="(style, styleIndex) in characterInfo.metas.styles" | ||
:key="styleIndex" | ||
|
@@ -221,6 +221,7 @@ export default defineComponent({ | |
|
||
const selectedCharacter = computed(() => { | ||
const selectedVoice = props.selectedVoice; | ||
if (selectedVoice == undefined) return undefined; | ||
const character = props.characterInfos.find( | ||
(characterInfo) => | ||
characterInfo.metas.speakerUuid === selectedVoice?.speakerId && | ||
|
@@ -261,9 +262,10 @@ export default defineComponent({ | |
(x) => x.speakerUuid === speakerUuid | ||
)?.defaultStyleId; | ||
|
||
const defaultStyle = characterInfo?.metas.styles.find( | ||
(style) => style.styleId === defaultStyleId | ||
); | ||
const defaultStyle = | ||
characterInfo?.metas.styles.find( | ||
(style) => style.styleId === defaultStyleId | ||
) ?? characterInfo?.metas.styles[0]; // FIXME: デフォルトのスタイルIDが見つからない場合stylesの先頭を選択する | ||
Hiroshiba marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
if (defaultStyle == undefined) | ||
throw new Error("defaultStyle == undefined"); | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
スタイル選択ボタンの表記と合わせて横並びにすると馴染み深いかもと思いました!
まあAudioInfoを最小幅にすると消えちゃうのですが・・・。
(デザインは全体的に見て最終調整するので、そのままにしていただいても大丈夫です!)