diff --git a/Compatible/Compatible.cs b/Compatible/Compatible.cs index 2fbd0a6..76840b4 100644 --- a/Compatible/Compatible.cs +++ b/Compatible/Compatible.cs @@ -36,11 +36,39 @@ { if (HasTable("comment")) { - using var dbStatement = NewDBStatement(""" - UPDATE comment - SET Comment = REPLACE(Comment, '.pb', '') - """); - dbStatement.ExecuteNonQuery(); + try + { + using var dbStatement = NewDBStatement(""" + UPDATE comment + SET Comment = REPLACE(Comment, '.pb', '') + """); + dbStatement.ExecuteNonQuery(); + } + catch + { + } + try + { + using var dbStatement = NewDBStatement(""" + ALTER TABLE comment + RENAME COLUMN Put_Note_Set TO Set_Note_Put + """); + dbStatement.ExecuteNonQuery(); + } + catch + { + } + try + { + using var dbStatement = NewDBStatement(""" + ALTER TABLE comment + RENAME COLUMN Put_Note_Set_Millis TO Set_Note_Put_Millis + """); + dbStatement.ExecuteNonQuery(); + } + catch + { + } } if (HasTable("note")) diff --git a/Qwilight/Assets/Language.json b/Qwilight/Assets/Language.json index 0af75d8..0436265 100644 --- a/Qwilight/Assets/Language.json +++ b/Qwilight/Assets/Language.json @@ -643,7 +643,7 @@ "ko-KR": "순서대로 글꼴 모양을 설정합니다.", "en-US": "Sets the font appearance in order." }, - "ConfigureLabelledInputFavorMillisContents": { + "ConfigureInputFavorLabelledMillisContents": { "ko-KR": "대상 간격", "en-US": "Target Interval" }, @@ -651,11 +651,11 @@ "ko-KR": "사용할 난이도 테이블을 설정합니다.", "en-US": "Set the difficulty table to use" }, - "ConfigurePutNoteSetContents": { + "ConfigureSetNotePutContents": { "ko-KR": "대상 비율", "en-US": "Target Ratio" }, - "ConfigurePutNoteSetMillisContents": { + "ConfigureSetNotePutMillisContents": { "ko-KR": "대상 간격", "en-US": "Target Interval" }, @@ -1507,6 +1507,10 @@ "ko-KR": "노트 라인 개수를 수정하지 않습니다.", "en-US": "Do not modify the number of note lines." }, + "InputFavorLabelledAssist": { + "ko-KR": "대상 간격 이상 거리를 유지하여 자연스럽게 만듭니다.", + "en-US": "Make it natural by maintaining a distance beyond the target interval." + }, "InputFavorMode10": { "ko-KR": "10 으로 만듭니다.", "en-US": "Make it 10." @@ -1623,10 +1627,6 @@ "ko-KR": "\uD83C\uDFA8 NPS 비주얼라이저", "en-US": "\uD83C\uDFA8 NPS graph" }, - "InputNoteSetContents": { - "ko-KR": "롱 노트를 단일 노트로 만듭니다.", - "en-US": "Turn long notes into single notes" - }, "InputSaltModeContents": { "ko-KR": "노트 라인을 임의 배치합니다. (라인 랜덤)", "en-US": "Line Random mode" @@ -1655,6 +1655,10 @@ "ko-KR": "DEL: 모든 키 지우기", "en-US": "DEL: Clear all keys" }, + "InsetNotePutContents": { + "ko-KR": "롱 노트를 단일 노트로 만듭니다.", + "en-US": "Turn long notes into single notes" + }, "IOAvatarContents": { "ko-KR": "회원의 관전 요청만 받음", "en-US": "Only receive spectation requests from members" @@ -1743,10 +1747,6 @@ "ko-KR": "CORSAIR® CUE™ 활성화", "en-US": "Enable CORSAIR® CUE™" }, - "LabelledInputFavorAssist": { - "ko-KR": "대상 간격 이상 거리를 유지하여 자연스럽게 만듭니다.", - "en-US": "Make it natural by maintaining a distance beyond the target interval." - }, "LazyGCText": { "ko-KR": "게임 플레이 중 다음 메모리를 미리 할당하여 GC 스파이크를 방지합니다.", "en-US": "Preallocate the following memory during gameplay to prevent GC spikes." @@ -2767,10 +2767,6 @@ "ko-KR": "1P를 2P로 복사합니다. (⑤K, ⑦K만 적용)", "en-US": "Copy 1P to 2P. (⑤K, ⑦K only)" }, - "PutNoteSetAssist": { - "ko-KR": "대상 비율 만큼의 BGM을 대상 간격 이상 거리를 유지하여 추가 노트로 만듭니다.", - "en-US": "Make BGM as much as the target ratio into an additional note by maintaining a distance beyond the target interval." - }, "PutSetNoteModeContents": { "ko-KR": "BGM을 추가 노트로 만듭니다.", "en-US": "Make the BGM an additional note." @@ -2979,6 +2975,10 @@ "ko-KR": "추가 노트를 설정합니다.", "en-US": "Set up additional charts." }, + "SetNotePutAssist": { + "ko-KR": "대상 비율 만큼의 BGM을 대상 간격 이상 거리를 유지하여 추가 노트로 만듭니다.", + "en-US": "Make BGM as much as the target ratio into an additional note by maintaining a distance beyond the target interval." + }, "SetNotTotalText": { "ko-KR": "모두 선택 해제", "en-US": "Deselect All" diff --git a/Qwilight/Compiler/BaseCompiler.cs b/Qwilight/Compiler/BaseCompiler.cs index 2bef2be..f96a538 100644 --- a/Qwilight/Compiler/BaseCompiler.cs +++ b/Qwilight/Compiler/BaseCompiler.cs @@ -430,7 +430,7 @@ } else if (ModeComponent.InputFavorMode.Labelled4 <= inputFavorMode && inputFavorMode <= ModeComponent.InputFavorMode.Labelled48_4) { - var labelledInputFavorMillis = defaultComputer.ModeComponentValue.LabelledInputFavorMillis; + var inputFavorLabelledMillis = defaultComputer.ModeComponentValue.InputFavorLabelledMillis; var labelledNotes = new List(); foreach (var note in Notes.ToArray()) { @@ -484,7 +484,7 @@ bool WipeIfCollided(BaseNote note) { - if (labelledNotes.Any(labelledNote => labelledNote.LevyingInput == note.LevyingInput && labelledNote.IsCollided(note, labelledInputFavorMillis))) + if (labelledNotes.Any(labelledNote => labelledNote.LevyingInput == note.LevyingInput && labelledNote.IsCollided(note, inputFavorLabelledMillis))) { WipeNote(note); return true; @@ -917,13 +917,13 @@ }; if (putInputs.Length > 0) { - var putNoteSet = defaultComputer.ModeComponentValue.PutNoteSet; - var putNoteSetMillis = defaultComputer.ModeComponentValue.PutNoteSetMillis; + var setNotePut = (int)(100.0 * defaultComputer.ModeComponentValue.SetNotePut); + var setNotePutMillis = defaultComputer.ModeComponentValue.SetNotePutMillis; foreach (var (wait, audioNotes) in defaultComputer.WaitAudioNoteMap) { foreach (var audioNote in audioNotes.ToArray()) { - if (audioNote.Salt % 100 < putNoteSet) + if (audioNote.Salt % 100 < setNotePut) { var levyingInput = putInputs.First(); var putInputsLength = putInputs.Length; @@ -932,7 +932,7 @@ do { var inputNote = new InputNote(defaultComputer.WaitLogicalYMap[wait], wait, [audioNote], putInputs[putPosition]); - if (Notes.Any(note => note.LevyingInput == inputNote.LevyingInput && note.IsCollided(inputNote, putNoteSetMillis))) + if (Notes.Any(note => note.LevyingInput == inputNote.LevyingInput && note.IsCollided(inputNote, setNotePutMillis))) { if (++putPosition >= putInputsLength) { diff --git a/Qwilight/JSON.cs b/Qwilight/JSON.cs index 53147a2..f3aca10 100644 --- a/Qwilight/JSON.cs +++ b/Qwilight/JSON.cs @@ -484,8 +484,8 @@ public double lowestJudgment1; public double lowestLongNoteModify; public double highestLongNoteModify; - public double putNoteSet; - public double putNoteSetMillis; + public double setNotePut; + public double setNotePutMillis; public double highestHitPoints0; public double higherHitPoints0; public double highHitPoints0; diff --git a/Qwilight/ModeComponent.cs b/Qwilight/ModeComponent.cs index 742520e..6f375e8 100644 --- a/Qwilight/ModeComponent.cs +++ b/Qwilight/ModeComponent.cs @@ -99,11 +99,11 @@ LowestJudgmentConditionMode _lowestJudgmentConditionMode; PutCopyNotes _putCopyNotes; double _multiplierUnit = 0.01; - double _labelledInputFavorMillis = 125.0; - double _lowestLongNoteModify = 125.0; - double _highestLongNoteModify = 125.0; - double _putNoteSet = 25.0; - double _putNoteSetMillis = 125.0; + double _inputFavorLabelledMillis; + double _lowestLongNoteModify = 100.0; + double _highestLongNoteModify = 100.0; + double _setNotePut = 1.0; + double _setNotePutMillis; public bool IsNoteSaltModeWarning(Component.NoteSaltModeDate noteSaltModeDate) => noteSaltModeDate == Component.NoteSaltModeDate._1_0_0 && (NoteSaltModeValue == NoteSaltMode.InputSalt || NoteSaltModeValue == NoteSaltMode.Salt || NoteSaltModeValue == NoteSaltMode.MeterSalt || NoteSaltModeValue == NoteSaltMode.HalfInputSalt); @@ -815,11 +815,11 @@ set => SetProperty(ref FavorHitPoints[(int)Component.Judged.Lowest][1], value, nameof(LowestHitPoints1)); } - public void SetAutoLabelledInputFavorMillis() + public void SetAutoInputFavorLabelledMillis() { - if (Configure.Instance.AutoLabelledInputFavorMillis) + if (Configure.Instance.AutoInputFavorLabelledMillis) { - LabelledInputFavorMillis = 1000.0 * 240.0 / (BPM * AudioMultiplier) / Configure.Instance.AutoLabelledInputFavorMillisValue; + InputFavorLabelledMillis = 1000.0 * 240.0 / (BPM * AudioMultiplier) / Configure.Instance.AutoInputFavorLabelledMillisValue; } } @@ -833,25 +833,25 @@ public void SetAutoHighestLongNoteModify() { - if (Configure.Instance.HighestAutoLongNoteModify) + if (Configure.Instance.AutoHighestLongNoteModify) { HighestLongNoteModify = 1000.0 * 240.0 / (BPM * AudioMultiplier) / Configure.Instance.AutoHighestLongNoteModifyValue; } } - public void SetAutoPutNoteSetMillis() + public void SetAutoSetNotePutMillis() { - if (Configure.Instance.AutoPutNoteSetMillis) + if (Configure.Instance.AutoSetNotePutMillis) { - PutNoteSetMillis = 1000.0 * 240.0 / (BPM * AudioMultiplier) / Configure.Instance.AutoPutNoteSetMillisValue; + SetNotePutMillis = 1000.0 * 240.0 / (BPM * AudioMultiplier) / Configure.Instance.AutoSetNotePutMillisValue; } } - public double LabelledInputFavorMillis + public double InputFavorLabelledMillis { - get => _labelledInputFavorMillis; + get => _inputFavorLabelledMillis; - set => SetProperty(ref _labelledInputFavorMillis, value, nameof(LabelledInputFavorMillis)); + set => SetProperty(ref _inputFavorLabelledMillis, value, nameof(InputFavorLabelledMillis)); } public double LowestLongNoteModify @@ -868,18 +868,18 @@ set => SetProperty(ref _highestLongNoteModify, value, nameof(HighestLongNoteModify)); } - public double PutNoteSet + public double SetNotePut { - get => _putNoteSet; + get => _setNotePut; - set => SetProperty(ref _putNoteSet, value, nameof(PutNoteSet)); + set => SetProperty(ref _setNotePut, value, nameof(SetNotePut)); } - public double PutNoteSetMillis + public double SetNotePutMillis { - get => _putNoteSetMillis; + get => _setNotePutMillis; - set => SetProperty(ref _putNoteSetMillis, value, nameof(PutNoteSetMillis)); + set => SetProperty(ref _setNotePutMillis, value, nameof(SetNotePutMillis)); } public object GetJSON() => new @@ -914,8 +914,8 @@ lowestJudgment1 = LowestJudgment1, lowestLongNoteModify = LowestLongNoteModify, highestLongNoteModify = HighestLongNoteModify, - putNoteSet = PutNoteSet, - putNoteSetMillis = PutNoteSetMillis, + setNotePut = SetNotePut, + setNotePutMillis = SetNotePutMillis, highestHitPoints0 = HighestHitPoints0, higherHitPoints0 = HigherHitPoints0, highHitPoints0 = HighHitPoints0, @@ -994,7 +994,7 @@ { if (InputFavorMode.Labelled4 <= modeComponentValue.InputFavorModeValue && modeComponentValue.InputFavorModeValue <= InputFavorMode.Labelled48_4) { - if (LabelledInputFavorMillis != modeComponentValue.LabelledInputFavorMillis) + if (InputFavorLabelledMillis != modeComponentValue.InputFavorLabelledMillis) { return false; } @@ -1014,7 +1014,7 @@ { if (modeComponentValue.SetNoteModeValue != SetNoteMode.Default) { - if (PutNoteSet != modeComponentValue.PutNoteSet || PutNoteSetMillis != modeComponentValue.PutNoteSetMillis) + if (SetNotePut != modeComponentValue.SetNotePut || SetNotePutMillis != modeComponentValue.SetNotePutMillis) { return false; } @@ -1121,11 +1121,11 @@ OnPropertyChanged(nameof(HigherHitPoints1)); OnPropertyChanged(nameof(HighestHitPoints0)); OnPropertyChanged(nameof(HighestHitPoints1)); - LabelledInputFavorMillis = modeComponentValue.LabelledInputFavorMillis; + InputFavorLabelledMillis = modeComponentValue.InputFavorLabelledMillis; LowestLongNoteModify = modeComponentValue.LowestLongNoteModify; HighestLongNoteModify = modeComponentValue.HighestLongNoteModify; - PutNoteSet = modeComponentValue.PutNoteSet; - PutNoteSetMillis = modeComponentValue.PutNoteSetMillis; + SetNotePut = modeComponentValue.SetNotePut; + SetNotePutMillis = modeComponentValue.SetNotePutMillis; PutCopyNotesValueV2 = modeComponentValue.PutCopyNotesValueV2; CanModifyMultiplier = modeComponentValue.CanModifyMultiplier; SentMultiplier = modeComponentValue.SentMultiplier; @@ -1211,8 +1211,8 @@ LowestJudgment1 = modeComponentData.lowestJudgment1; LowestLongNoteModify = modeComponentData.lowestLongNoteModify; HighestLongNoteModify = modeComponentData.highestLongNoteModify; - PutNoteSet = modeComponentData.putNoteSet; - PutNoteSetMillis = modeComponentData.putNoteSetMillis; + SetNotePut = modeComponentData.setNotePut; + SetNotePutMillis = modeComponentData.setNotePutMillis; HighestHitPoints0 = modeComponentData.highestHitPoints0; HigherHitPoints0 = modeComponentData.higherHitPoints0; HighHitPoints0 = modeComponentData.highHitPoints0; diff --git a/Qwilight/System/Configure/Configure.cs b/Qwilight/System/Configure/Configure.cs index fbcf57d..72e6b87 100644 --- a/Qwilight/System/Configure/Configure.cs +++ b/Qwilight/System/Configure/Configure.cs @@ -250,14 +250,14 @@ int _hofViewTotalTabPosition; int _hofViewAtTabPosition; int _hofViewAbilityTabPosition; - bool _autoLabelledInputFavorMillis; + bool _autoInputFavorLabelledMillis; bool _autoLowestLongNoteModify; - bool _highestAutoLongNoteModify; - bool _autoPutNoteSetMillis; - double _autoLabelledInputFavorMillisValue; + bool _autoHighestLongNoteModify; + bool _autoSetNotePutMillis; + double _autoInputFavorLabelledMillisValue; double _autoLowestLongNoteModifyValue; double _autoHighestLongNoteModifyValue; - double _autoPutNoteSetMillisValue; + double _autoSetNotePutMillisValue; string _language; bool _setHwMode; HwMode _hwModeValue; @@ -641,15 +641,15 @@ [JsonIgnore] public string ConfigureFault { get; set; } - public bool AutoLabelledInputFavorMillis + public bool AutoInputFavorLabelledMillis { - get => _autoLabelledInputFavorMillis; + get => _autoInputFavorLabelledMillis; set { - if (SetProperty(ref _autoLabelledInputFavorMillis, value, nameof(AutoLabelledInputFavorMillis)) && _isLoaded) + if (SetProperty(ref _autoInputFavorLabelledMillis, value, nameof(AutoInputFavorLabelledMillis)) && _isLoaded) { - ViewModels.Instance.MainValue.ModeComponentValue.SetAutoLabelledInputFavorMillis(); + ViewModels.Instance.MainValue.ModeComponentValue.SetAutoInputFavorLabelledMillis(); } } } @@ -667,26 +667,26 @@ } } - public double AutoLabelledInputFavorMillisValue + public double AutoInputFavorLabelledMillisValue { - get => _autoLabelledInputFavorMillisValue; + get => _autoInputFavorLabelledMillisValue; set { - if (SetProperty(ref _autoLabelledInputFavorMillisValue, value, nameof(AutoLabelledInputFavorMillisValue)) && _isLoaded) + if (SetProperty(ref _autoInputFavorLabelledMillisValue, value, nameof(AutoInputFavorLabelledMillisValue)) && _isLoaded) { - ViewModels.Instance.MainValue.ModeComponentValue.SetAutoLabelledInputFavorMillis(); + ViewModels.Instance.MainValue.ModeComponentValue.SetAutoInputFavorLabelledMillis(); } } } - public bool HighestAutoLongNoteModify + public bool AutoHighestLongNoteModify { - get => _highestAutoLongNoteModify; + get => _autoHighestLongNoteModify; set { - if (SetProperty(ref _highestAutoLongNoteModify, value, nameof(HighestAutoLongNoteModify)) && _isLoaded) + if (SetProperty(ref _autoHighestLongNoteModify, value, nameof(AutoHighestLongNoteModify)) && _isLoaded) { ViewModels.Instance.MainValue.ModeComponentValue.SetAutoHighestLongNoteModify(); } @@ -719,18 +719,18 @@ } } - public bool AutoPutNoteSetMillis + public bool AutoSetNotePutMillis { - get => _autoPutNoteSetMillis; + get => _autoSetNotePutMillis; - set => SetProperty(ref _autoPutNoteSetMillis, value, nameof(AutoPutNoteSetMillis)); + set => SetProperty(ref _autoSetNotePutMillis, value, nameof(AutoSetNotePutMillis)); } - public double AutoPutNoteSetMillisValue + public double AutoSetNotePutMillisValue { - get => _autoPutNoteSetMillisValue; + get => _autoSetNotePutMillisValue; - set => SetProperty(ref _autoPutNoteSetMillisValue, value, nameof(AutoPutNoteSetMillisValue)); + set => SetProperty(ref _autoSetNotePutMillisValue, value, nameof(AutoSetNotePutMillisValue)); } public string Language @@ -2487,10 +2487,6 @@ SFX = false; Flange = false; } - if (isInit || Utility.IsLowerDate(Date, 1, 13, 33)) - { - AutoPutNoteSetMillisValue = 16.0; - } if (isInit || Utility.IsLowerDate(Date, 1, 13, 38)) { Limiter57Variety = true; @@ -3083,13 +3079,6 @@ Mode = FitMode.Title }; } - if (isInit || Utility.IsLowerDate(Date, 1, 14, 105)) - { - AutoLowestLongNoteModify = false; - HighestAutoLongNoteModify = false; - AutoLowestLongNoteModifyValue = 16.0; - AutoHighestLongNoteModifyValue = 16.0; - } if (isInit || Utility.IsLowerDate(Date, 1, 14, 107)) { LastWASAPIAudioValueID = 0; @@ -3392,6 +3381,17 @@ { LazyGCV2 = 0L; } + if (isInit || Utility.IsLowerDate(Date, 1, 16, 17)) + { + AutoInputFavorLabelledMillis = false; + AutoLowestLongNoteModify = false; + AutoHighestLongNoteModify = false; + AutoSetNotePutMillis = false; + AutoInputFavorLabelledMillisValue = 16.0; + AutoLowestLongNoteModifyValue = 16.0; + AutoHighestLongNoteModifyValue = 16.0; + AutoSetNotePutMillisValue = 16.0; + } if (!UIConfigureValuesV2.ContainsKey(UIItemValue.Title)) { UIConfigureValuesV2[UIItemValue.Title] = new(); diff --git a/Qwilight/System/DB.cs b/Qwilight/System/DB.cs index 5e009b8..5caf926 100644 --- a/Qwilight/System/DB.cs +++ b/Qwilight/System/DB.cs @@ -127,11 +127,11 @@ Low_Judgment_1 REAL DEFAULT 0.0, Lower_Judgment_1 REAL DEFAULT 0.0, Lowest_Judgment_1 REAL DEFAULT 0.0, - Lowest_Long_Note_Modify REAL DEFAULT 125.0, - Highest_Long_Note_Modify REAL DEFAULT 125.0, - Labelled_Input_Favor_Millis REAL DEFAULT 125.0, - Put_Note_Set REAL DEFAULT 25.0, - Put_Note_Set_Millis REAL DEFAULT 125.0, + Lowest_Long_Note_Modify REAL DEFAULT 100.0, + Highest_Long_Note_Modify REAL DEFAULT 100.0, + Input_Favor_Labelled_Millis REAL DEFAULT 0.0, + Set_Note_Put REAL DEFAULT 1.0, + Set_Note_Put_Millis REAL DEFAULT 0.0, Highest_Hit_Points_0 REAL DEFAULT 0.0, Higher_Hit_Points_0 REAL DEFAULT 0.0, High_Hit_Points_0 REAL DEFAULT 0.0, @@ -154,10 +154,10 @@ } if (HasTable("comment", ta)) { - // Labelled_Input_Favor_Millis + // Input_Favor_Labelled_Millis using (var dbStatement = NewDBStatement(""" INSERT - INTO tmp_comment(Date, Event_Note_ID, Comment, Name, Multiplier, Auto_Mode, Note_Salt_Mode, Audio_Multiplier, Faint_Note_Mode, Judgment_Mode, Hit_Points_Mode, Note_Mobility_Mode, Long_Note_Mode, Input_Favor_Mode, Note_Modify_Mode, BPM_Mode, Wave_Mode, Set_Note_Mode, Lowest_Judgment_Condition_Mode, Stand, Band, Is_P, Point, Salt, Highest_Judgment_0, Higher_Judgment_0, High_Judgment_0, Low_Judgment_0, Lower_Judgment_0, Lowest_Judgment_0, Highest_Judgment_1, Higher_Judgment_1, High_Judgment_1, Low_Judgment_1, Lower_Judgment_1, Lowest_Judgment_1, Lowest_Long_Note_Modify, Highest_Long_Note_Modify, Put_Note_Set, Put_Note_Set_Millis, Highest_Hit_Points_0, Higher_Hit_Points_0, High_Hit_Points_0, Low_Hit_Points_0, Lower_Hit_Points_0, Lowest_Hit_Points_0, Highest_Hit_Points_1, Higher_Hit_Points_1, High_Hit_Points_1, Low_Hit_Points_1, Lower_Hit_Points_1, Lowest_Hit_Points_1, Note_ID, Is_Paused, Input_Flags) + INTO tmp_comment(Date, Event_Note_ID, Comment, Name, Multiplier, Auto_Mode, Note_Salt_Mode, Audio_Multiplier, Faint_Note_Mode, Judgment_Mode, Hit_Points_Mode, Note_Mobility_Mode, Long_Note_Mode, Input_Favor_Mode, Note_Modify_Mode, BPM_Mode, Wave_Mode, Set_Note_Mode, Lowest_Judgment_Condition_Mode, Stand, Band, Is_P, Point, Salt, Highest_Judgment_0, Higher_Judgment_0, High_Judgment_0, Low_Judgment_0, Lower_Judgment_0, Lowest_Judgment_0, Highest_Judgment_1, Higher_Judgment_1, High_Judgment_1, Low_Judgment_1, Lower_Judgment_1, Lowest_Judgment_1, Lowest_Long_Note_Modify, Highest_Long_Note_Modify, Set_Note_Put, Set_Note_Put_Millis, Highest_Hit_Points_0, Higher_Hit_Points_0, High_Hit_Points_0, Low_Hit_Points_0, Lower_Hit_Points_0, Lowest_Hit_Points_0, Highest_Hit_Points_1, Higher_Hit_Points_1, High_Hit_Points_1, Low_Hit_Points_1, Lower_Hit_Points_1, Lowest_Hit_Points_1, Note_ID, Is_Paused, Input_Flags) SELECT * FROM comment """, ta)) @@ -543,7 +543,7 @@ { var commentItems = new List(); using var dbStatement = NewDBStatement($""" - SELECT Date, Comment, Name, Multiplier, Auto_Mode, Note_Salt_Mode, Audio_Multiplier, Faint_Note_Mode, Judgment_Mode, Hit_Points_Mode, Note_Mobility_Mode, Long_Note_Mode, Input_Favor_Mode, Note_Modify_Mode, BPM_Mode, Wave_Mode, Set_Note_Mode, Lowest_Judgment_Condition_Mode, Stand, Band, Is_P, Point, Salt, Highest_Judgment_0, Higher_Judgment_0, High_Judgment_0, Low_Judgment_0, Lower_Judgment_0, Lowest_Judgment_0, Highest_Judgment_1, Higher_Judgment_1, High_Judgment_1, Low_Judgment_1, Lower_Judgment_1, Lowest_Judgment_1, Labelled_Input_Favor_Millis, Lowest_Long_Note_Modify, Highest_Long_Note_Modify, Put_Note_Set, Put_Note_Set_Millis, Highest_Hit_Points_0, Higher_Hit_Points_0, High_Hit_Points_0, Low_Hit_Points_0, Lower_Hit_Points_0, Lowest_Hit_Points_0, Highest_Hit_Points_1, Higher_Hit_Points_1, High_Hit_Points_1, Low_Hit_Points_1, Lower_Hit_Points_1, Lowest_Hit_Points_1, Is_Paused, Input_Flags + SELECT Date, Comment, Name, Multiplier, Auto_Mode, Note_Salt_Mode, Audio_Multiplier, Faint_Note_Mode, Judgment_Mode, Hit_Points_Mode, Note_Mobility_Mode, Long_Note_Mode, Input_Favor_Mode, Note_Modify_Mode, BPM_Mode, Wave_Mode, Set_Note_Mode, Lowest_Judgment_Condition_Mode, Stand, Band, Is_P, Point, Salt, Highest_Judgment_0, Higher_Judgment_0, High_Judgment_0, Low_Judgment_0, Lower_Judgment_0, Lowest_Judgment_0, Highest_Judgment_1, Higher_Judgment_1, High_Judgment_1, Low_Judgment_1, Lower_Judgment_1, Lowest_Judgment_1, Input_Favor_Labelled_Millis, Lowest_Long_Note_Modify, Highest_Long_Note_Modify, Set_Note_Put, Set_Note_Put_Millis, Highest_Hit_Points_0, Higher_Hit_Points_0, High_Hit_Points_0, Low_Hit_Points_0, Lower_Hit_Points_0, Lowest_Hit_Points_0, Highest_Hit_Points_1, Higher_Hit_Points_1, High_Hit_Points_1, Low_Hit_Points_1, Lower_Hit_Points_1, Lowest_Hit_Points_1, Is_Paused, Input_Flags FROM comment WHERE {(string.IsNullOrEmpty(eventNoteID) ? "Note_ID = @noteID" : "Event_Note_ID = @eventNoteID")} ORDER BY Stand DESC @@ -603,11 +603,11 @@ LowJudgment1 = rows.GetDouble("Low_Judgment_1"), LowerJudgment1 = rows.GetDouble("Lower_Judgment_1"), LowestJudgment1 = rows.GetDouble("Lowest_Judgment_1"), - LabelledInputFavorMillis = rows.GetDouble("Labelled_Input_Favor_Millis"), + InputFavorLabelledMillis = rows.GetDouble("Input_Favor_Labelled_Millis"), LowestLongNoteModify = rows.GetDouble("Lowest_Long_Note_Modify"), HighestLongNoteModify = rows.GetDouble("Highest_Long_Note_Modify"), - PutNoteSet = rows.GetInt32("Put_Note_Set"), - PutNoteSetMillis = rows.GetDouble("Put_Note_Set_Millis"), + SetNotePut = rows.GetDouble("Set_Note_Put"), + SetNotePutMillis = rows.GetDouble("Set_Note_Put_Millis"), HighestHitPoints0 = 100.0 * rows.GetDouble("Highest_Hit_Points_0"), HigherHitPoints0 = 100.0 * rows.GetDouble("Higher_Hit_Points_0"), HighHitPoints0 = 100.0 * rows.GetDouble("High_Hit_Points_0"), @@ -935,7 +935,7 @@ using var dbStatement = NewDBStatement(""" INSERT INTO comment - VALUES(@date, @eventNoteID, @comment, @avatar, @multiplier, @autoMode, @noteSaltMode, @audioMultiplier, @faintNoteMode, @judgmentMode, @hitPointsMode, @noteMobilityMode, @longNoteMode, @inputFavorMode, @noteModifyMode, @bpmMode, @waveMode, @setNoteMode, @lowestJudgmentConditionMode, @stand, @band, @isP, @point, @salt, @highestJudgment0, @higherJudgment0, @highJudgment0, @lowJudgment0, @lowerJudgment0, @lowestJudgment0, @highestJudgment1, @higherJudgment1, @highJudgment1, @lowJudgment1, @lowerJudgment1, @lowestJudgment1, @labelledInputFavorMillis, @lowestLongNoteModify, @highestLongNoteModify, @putNoteSet, @putNoteSetMillis, @highestHitPoints0, @higherHitPoints0, @highHitPoints0, @lowHitPoints0, @lowerHitPoints0, @lowestHitPoints0, @highestHitPoints1, @higherHitPoints1, @highHitPoints1, @lowHitPoints1, @lowerHitPoints1, @lowestHitPoints1, @noteID, @isPaused, @inputFlags) + VALUES(@date, @eventNoteID, @comment, @avatar, @multiplier, @autoMode, @noteSaltMode, @audioMultiplier, @faintNoteMode, @judgmentMode, @hitPointsMode, @noteMobilityMode, @longNoteMode, @inputFavorMode, @noteModifyMode, @bpmMode, @waveMode, @setNoteMode, @lowestJudgmentConditionMode, @stand, @band, @isP, @point, @salt, @highestJudgment0, @higherJudgment0, @highJudgment0, @lowJudgment0, @lowerJudgment0, @lowestJudgment0, @highestJudgment1, @higherJudgment1, @highJudgment1, @lowJudgment1, @lowerJudgment1, @lowestJudgment1, @inputFavorLabelledMillis, @lowestLongNoteModify, @highestLongNoteModify, @setNotePut, @setNotePutMillis, @highestHitPoints0, @higherHitPoints0, @highHitPoints0, @lowHitPoints0, @lowerHitPoints0, @lowestHitPoints0, @highestHitPoints1, @higherHitPoints1, @highHitPoints1, @lowHitPoints1, @lowerHitPoints1, @lowestHitPoints1, @noteID, @isPaused, @inputFlags) """); dbStatement.Parameters.AddWithValue("date", date); dbStatement.Parameters.AddWithValue("eventNoteID", eventNoteID ?? DBNull.Value as object); @@ -973,11 +973,11 @@ dbStatement.Parameters.AddWithValue("lowJudgment1", modeComponentValue.LowJudgment1); dbStatement.Parameters.AddWithValue("lowerJudgment1", modeComponentValue.LowerJudgment1); dbStatement.Parameters.AddWithValue("lowestJudgment1", modeComponentValue.LowestJudgment1); - dbStatement.Parameters.AddWithValue("labelledInputFavorMillis", modeComponentValue.LabelledInputFavorMillis); + dbStatement.Parameters.AddWithValue("inputFavorLabelledMillis", modeComponentValue.InputFavorLabelledMillis); dbStatement.Parameters.AddWithValue("lowestLongNoteModify", modeComponentValue.LowestLongNoteModify); dbStatement.Parameters.AddWithValue("highestLongNoteModify", modeComponentValue.HighestLongNoteModify); - dbStatement.Parameters.AddWithValue("putNoteSet", modeComponentValue.PutNoteSet); - dbStatement.Parameters.AddWithValue("putNoteSetMillis", modeComponentValue.PutNoteSetMillis); + dbStatement.Parameters.AddWithValue("setNotePut", modeComponentValue.SetNotePut); + dbStatement.Parameters.AddWithValue("setNotePutMillis", modeComponentValue.SetNotePutMillis); dbStatement.Parameters.AddWithValue("highestHitPoints0", modeComponentValue.HighestHitPoints0 / 100.0); dbStatement.Parameters.AddWithValue("higherHitPoints0", modeComponentValue.HigherHitPoints0 / 100.0); dbStatement.Parameters.AddWithValue("highHitPoints0", modeComponentValue.HighHitPoints0 / 100.0); diff --git a/Qwilight/System/LanguageSystem/LanguageSystem.cs b/Qwilight/System/LanguageSystem/LanguageSystem.cs index 7995242..e81f713 100644 --- a/Qwilight/System/LanguageSystem/LanguageSystem.cs +++ b/Qwilight/System/LanguageSystem/LanguageSystem.cs @@ -163,7 +163,7 @@ NoteSaltModeTexts[(int)ModeComponent.NoteSaltMode.HalfInputSalt] = HalfInputSaltModeContents; NoteModifyModeTexts[(int)ModeComponent.NoteModifyMode.Default] = DefaultNoteModifyContents; - NoteModifyModeTexts[(int)ModeComponent.NoteModifyMode.InputNote] = InputNoteSetContents; + NoteModifyModeTexts[(int)ModeComponent.NoteModifyMode.InputNote] = InsetNotePutContents; NoteModifyModeTexts[(int)ModeComponent.NoteModifyMode.LongNote] = LongNoteModifyContents; BPMModeTexts[(int)ModeComponent.BPMMode.Default] = DefaultBPMModeContents; diff --git a/Qwilight/System/LanguageSystem/LanguageSystem.g.cs b/Qwilight/System/LanguageSystem/LanguageSystem.g.cs index c53b6fc..0952a8f 100644 --- a/Qwilight/System/LanguageSystem/LanguageSystem.g.cs +++ b/Qwilight/System/LanguageSystem/LanguageSystem.g.cs @@ -163,10 +163,10 @@ public string ConfigureBaseUIContents { get; set; } public string ConfigureEtcUIContents { get; set; } public string ConfigureFontFamilyContents { get; set; } - public string ConfigureLabelledInputFavorMillisContents { get; set; } + public string ConfigureInputFavorLabelledMillisContents { get; set; } public string ConfigureLevelContents { get; set; } - public string ConfigurePutNoteSetContents { get; set; } - public string ConfigurePutNoteSetMillisContents { get; set; } + public string ConfigureSetNotePutContents { get; set; } + public string ConfigureSetNotePutMillisContents { get; set; } public string ConfigureText { get; set; } public string ConfigureUIContents { get; set; } public string ControllerConfigure { get; set; } @@ -379,6 +379,7 @@ public string InputConfigure { get; set; } public string InputConfigureText { get; set; } public string InputDefaultMode { get; set; } + public string InputFavorLabelledAssist { get; set; } public string InputFavorMode10 { get; set; } public string InputFavorMode102 { get; set; } public string InputFavorMode142 { get; set; } @@ -408,7 +409,6 @@ public string InputFavorModeFill9 { get; set; } public string InputMapText { get; set; } public string InputNoteCountViewColor { get; set; } - public string InputNoteSetContents { get; set; } public string InputSaltModeContents { get; set; } public string InputVibrationModeText { get; set; } public string InputWantAssist { get; set; } @@ -416,6 +416,7 @@ public string InputWindowAssist1 { get; set; } public string InputWindowAssist2 { get; set; } public string InputWindowAssist3 { get; set; } + public string InsetNotePutContents { get; set; } public string IOAvatarContents { get; set; } public string IOCallableContents { get; set; } public string IOCompetenceContents { get; set; } @@ -438,7 +439,6 @@ public string JudgmentVisualizerPositionContents { get; set; } public string K70Contents { get; set; } public string K70Text { get; set; } - public string LabelledInputFavorAssist { get; set; } public string LazyGCText { get; set; } public string Level0Contents { get; set; } public string Level1Contents { get; set; } @@ -694,7 +694,6 @@ public string Power12 { get; set; } public string Power13 { get; set; } public string PutCopyNotesContents { get; set; } - public string PutNoteSetAssist { get; set; } public string PutSetNoteModeContents { get; set; } public string QuitComputingSituationContents { get; set; } public string QuitContents { get; set; } @@ -747,6 +746,7 @@ public string SetFavoritesF10 { get; set; } public string SetNoteFile { get; set; } public string SetNoteModeAssist { get; set; } + public string SetNotePutAssist { get; set; } public string SetNotTotalText { get; set; } public string SetPostItemInputText { get; set; } public string SetSaltText { get; set; } diff --git a/Qwilight/View/ConfigureWindow/ModeComponentWindow.xaml b/Qwilight/View/ConfigureWindow/ModeComponentWindow.xaml index 2461ab7..94cdf7f 100644 --- a/Qwilight/View/ConfigureWindow/ModeComponentWindow.xaml +++ b/Qwilight/View/ConfigureWindow/ModeComponentWindow.xaml @@ -194,14 +194,12 @@ - - - + diff --git a/Qwilight/View/LabeledInputFavorWindow.xaml b/Qwilight/View/LabeledInputFavorWindow.xaml index 85adf7d..a6bf7f6 100644 --- a/Qwilight/View/LabeledInputFavorWindow.xaml +++ b/Qwilight/View/LabeledInputFavorWindow.xaml @@ -1,9 +1,9 @@  @@ -27,8 +27,8 @@ - - + + @@ -36,12 +36,12 @@ - - - + + + - + diff --git a/Qwilight/View/LabeledInputFavorWindow.xaml.cs b/Qwilight/View/LabeledInputFavorWindow.xaml.cs index 30ba455..264d9c3 100644 --- a/Qwilight/View/LabeledInputFavorWindow.xaml.cs +++ b/Qwilight/View/LabeledInputFavorWindow.xaml.cs @@ -3,12 +3,12 @@ namespace Qwilight.View { - public sealed partial class LabelledInputFavorWindow + public sealed partial class InputFavorLabelledWindow { - public LabelledInputFavorWindow() => InitializeComponent(); + public InputFavorLabelledWindow() => InitializeComponent(); - void OnMeterModified(object sender, RoutedPropertyChangedEventArgs e) => (DataContext as LabelledInputFavorViewModel).OnMeterModified(); + void OnMeterModified(object sender, RoutedPropertyChangedEventArgs e) => (DataContext as InputFavorLabelledViewModel).OnMeterModified(); - void OnSetMeter(object sender, RoutedEventArgs e) => (DataContext as LabelledInputFavorViewModel).OnMeterModified(); + void OnSetMeter(object sender, RoutedEventArgs e) => (DataContext as InputFavorLabelledViewModel).OnMeterModified(); } } \ No newline at end of file diff --git a/Qwilight/View/LongNoteModifyWindow.xaml b/Qwilight/View/LongNoteModifyWindow.xaml index 48d82b7..b32b3d5 100644 --- a/Qwilight/View/LongNoteModifyWindow.xaml +++ b/Qwilight/View/LongNoteModifyWindow.xaml @@ -41,9 +41,9 @@ - - - + + + diff --git a/Qwilight/View/MainWindow/WPFView.xaml b/Qwilight/View/MainWindow/WPFView.xaml index 9858d41..d21973b 100644 --- a/Qwilight/View/MainWindow/WPFView.xaml +++ b/Qwilight/View/MainWindow/WPFView.xaml @@ -40,8 +40,8 @@ - - + + diff --git a/Qwilight/View/PutNoteSetWindow.xaml b/Qwilight/View/PutNoteSetWindow.xaml deleted file mode 100644 index 7aa7d65..0000000 --- a/Qwilight/View/PutNoteSetWindow.xaml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Qwilight/View/PutNoteSetWindow.xaml.cs b/Qwilight/View/PutNoteSetWindow.xaml.cs deleted file mode 100644 index 11b17b3..0000000 --- a/Qwilight/View/PutNoteSetWindow.xaml.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Qwilight.ViewModel; -using System.Windows; - -namespace Qwilight.View -{ - public sealed partial class PutNoteSetWindow - { - public PutNoteSetWindow() => InitializeComponent(); - - void OnMeterModified(object sender, RoutedPropertyChangedEventArgs e) => (DataContext as PutNoteSetViewModel).OnMeterModified(); - - void OnSetMeter(object sender, RoutedEventArgs e) => (DataContext as PutNoteSetViewModel).OnMeterModified(); - } -} \ No newline at end of file diff --git a/Qwilight/View/SetNotePutWindow.xaml b/Qwilight/View/SetNotePutWindow.xaml new file mode 100644 index 0000000..1e5be17 --- /dev/null +++ b/Qwilight/View/SetNotePutWindow.xaml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Qwilight/View/SetNotePutWindow.xaml.cs b/Qwilight/View/SetNotePutWindow.xaml.cs new file mode 100644 index 0000000..02afc54 --- /dev/null +++ b/Qwilight/View/SetNotePutWindow.xaml.cs @@ -0,0 +1,14 @@ +using Qwilight.ViewModel; +using System.Windows; + +namespace Qwilight.View +{ + public sealed partial class SetNotePutWindow + { + public SetNotePutWindow() => InitializeComponent(); + + void OnMeterModified(object sender, RoutedPropertyChangedEventArgs e) => (DataContext as SetNotePutViewModel).OnMeterModified(); + + void OnSetMeter(object sender, RoutedEventArgs e) => (DataContext as SetNotePutViewModel).OnMeterModified(); + } +} \ No newline at end of file diff --git a/Qwilight/ViewModel/LabeledInputFavorViewModel.cs b/Qwilight/ViewModel/LabeledInputFavorViewModel.cs index 3dd6012..d0a0098 100644 --- a/Qwilight/ViewModel/LabeledInputFavorViewModel.cs +++ b/Qwilight/ViewModel/LabeledInputFavorViewModel.cs @@ -2,7 +2,7 @@ namespace Qwilight.ViewModel { - public sealed class LabelledInputFavorViewModel : BaseViewModel + public sealed class InputFavorLabelledViewModel : BaseViewModel { public override double TargetLength => double.NaN; @@ -10,6 +10,6 @@ public override VerticalAlignment HeightSystem => VerticalAlignment.Bottom; - public void OnMeterModified() => ViewModels.Instance.MainValue.ModeComponentValue.SetAutoLabelledInputFavorMillis(); + public void OnMeterModified() => ViewModels.Instance.MainValue.ModeComponentValue.SetAutoInputFavorLabelledMillis(); } } \ No newline at end of file diff --git a/Qwilight/ViewModel/MainViewModel.cs b/Qwilight/ViewModel/MainViewModel.cs index d7c4220..3150faf 100644 --- a/Qwilight/ViewModel/MainViewModel.cs +++ b/Qwilight/ViewModel/MainViewModel.cs @@ -3473,7 +3473,7 @@ ModeComponentValue.ComputingValue = targetNoteFile; ModeComponentValue.Salt = salt; ModeComponentValue.SetAutoLowestLongNoteModify(); - ModeComponentValue.SetAutoPutNoteSetMillis(); + ModeComponentValue.SetAutoSetNotePutMillis(); OnJudgmentMeterMillisModified(); targetNoteFile.NotifyModel(); } diff --git a/Qwilight/ViewModel/ModifyModeComponentViewModel.cs b/Qwilight/ViewModel/ModifyModeComponentViewModel.cs index ca8b6cb..1392172 100644 --- a/Qwilight/ViewModel/ModifyModeComponentViewModel.cs +++ b/Qwilight/ViewModel/ModifyModeComponentViewModel.cs @@ -443,7 +443,7 @@ PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.LabelledInputFavorValue.Open(); + ViewModels.Instance.InputFavorLabelledValue.Open(); ModeComponentVariety = InputFavorModeVariety; ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled4); }) @@ -463,7 +463,7 @@ PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.LabelledInputFavorValue.Open(); + ViewModels.Instance.InputFavorLabelledValue.Open(); ModeComponentVariety = InputFavorModeVariety; ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled5); }) @@ -483,7 +483,7 @@ PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.LabelledInputFavorValue.Open(); + ViewModels.Instance.InputFavorLabelledValue.Open(); ModeComponentVariety = InputFavorModeVariety; ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled6); }) @@ -503,7 +503,7 @@ PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.LabelledInputFavorValue.Open(); + ViewModels.Instance.InputFavorLabelledValue.Open(); ModeComponentVariety = InputFavorModeVariety; ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled7); }) @@ -523,7 +523,7 @@ PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.LabelledInputFavorValue.Open(); + ViewModels.Instance.InputFavorLabelledValue.Open(); ModeComponentVariety = InputFavorModeVariety; ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled8); }) @@ -543,7 +543,7 @@ PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.LabelledInputFavorValue.Open(); + ViewModels.Instance.InputFavorLabelledValue.Open(); ModeComponentVariety = InputFavorModeVariety; ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled9); }) @@ -563,7 +563,7 @@ PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.LabelledInputFavorValue.Open(); + ViewModels.Instance.InputFavorLabelledValue.Open(); ModeComponentVariety = InputFavorModeVariety; ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled10); }) @@ -583,7 +583,7 @@ PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.LabelledInputFavorValue.Open(); + ViewModels.Instance.InputFavorLabelledValue.Open(); ModeComponentVariety = InputFavorModeVariety; ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled5_1); }) @@ -603,7 +603,7 @@ PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.LabelledInputFavorValue.Open(); + ViewModels.Instance.InputFavorLabelledValue.Open(); ModeComponentVariety = InputFavorModeVariety; ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled7_1); }) @@ -623,7 +623,7 @@ PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.LabelledInputFavorValue.Open(); + ViewModels.Instance.InputFavorLabelledValue.Open(); ModeComponentVariety = InputFavorModeVariety; ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled10_2); }) @@ -643,7 +643,7 @@ PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.LabelledInputFavorValue.Open(); + ViewModels.Instance.InputFavorLabelledValue.Open(); ModeComponentVariety = InputFavorModeVariety; ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled14_2); }) @@ -663,7 +663,7 @@ PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.LabelledInputFavorValue.Open(); + ViewModels.Instance.InputFavorLabelledValue.Open(); ModeComponentVariety = InputFavorModeVariety; ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled24_2); }) @@ -683,7 +683,7 @@ PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.LabelledInputFavorValue.Open(); + ViewModels.Instance.InputFavorLabelledValue.Open(); ModeComponentVariety = InputFavorModeVariety; ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled48_4); }) @@ -757,7 +757,7 @@ Drawing = BaseUI.Instance.ModeComponentDrawings[SetNoteModeVariety][(int)ModeComponent.SetNoteMode.Put]?.DefaultDrawing, OnConfigure = new(() => { - ViewModels.Instance.PutNoteSetValue.Open(); + ViewModels.Instance.SetNotePutValue.Open(); ModeComponentVariety = SetNoteModeVariety; ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.SetNoteMode.Put); }), @@ -770,7 +770,7 @@ Drawing = BaseUI.Instance.ModeComponentDrawings[SetNoteModeVariety][(int)ModeComponent.SetNoteMode.VoidPut]?.DefaultDrawing, OnConfigure = new(() => { - ViewModels.Instance.PutNoteSetValue.Open(); + ViewModels.Instance.SetNotePutValue.Open(); ModeComponentVariety = SetNoteModeVariety; ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.SetNoteMode.VoidPut); }), diff --git a/Qwilight/ViewModel/PutNoteSetViewModel.cs b/Qwilight/ViewModel/PutNoteSetViewModel.cs deleted file mode 100644 index c600974..0000000 --- a/Qwilight/ViewModel/PutNoteSetViewModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Windows; - -namespace Qwilight.ViewModel -{ - public sealed class PutNoteSetViewModel : BaseViewModel - { - public override double TargetLength => double.NaN; - - public override double TargetHeight => double.NaN; - - public override VerticalAlignment HeightSystem => VerticalAlignment.Bottom; - - public void OnMeterModified() => ViewModels.Instance.MainValue.ModeComponentValue.SetAutoPutNoteSetMillis(); - } -} \ No newline at end of file diff --git a/Qwilight/ViewModel/SetNotePutViewModel.cs b/Qwilight/ViewModel/SetNotePutViewModel.cs new file mode 100644 index 0000000..71042b4 --- /dev/null +++ b/Qwilight/ViewModel/SetNotePutViewModel.cs @@ -0,0 +1,15 @@ +using System.Windows; + +namespace Qwilight.ViewModel +{ + public sealed class SetNotePutViewModel : BaseViewModel + { + public override double TargetLength => double.NaN; + + public override double TargetHeight => double.NaN; + + public override VerticalAlignment HeightSystem => VerticalAlignment.Bottom; + + public void OnMeterModified() => ViewModels.Instance.MainValue.ModeComponentValue.SetAutoSetNotePutMillis(); + } +} \ No newline at end of file diff --git a/Qwilight/ViewModel/ViewModels.cs b/Qwilight/ViewModel/ViewModels.cs index 653bf66..681deeb 100644 --- a/Qwilight/ViewModel/ViewModels.cs +++ b/Qwilight/ViewModel/ViewModels.cs @@ -70,9 +70,9 @@ public LevelViewModel LevelValue { get; } = new(); - public LabelledInputFavorViewModel LabelledInputFavorValue { get; } = new(); + public InputFavorLabelledViewModel InputFavorLabelledValue { get; } = new(); - public PutNoteSetViewModel PutNoteSetValue { get; } = new(); + public SetNotePutViewModel SetNotePutValue { get; } = new(); public InputTextViewModel InputTextValue { get; } = new(); @@ -129,8 +129,8 @@ ModifyModeComponentValue, FontFamilyValue, LevelValue, - LabelledInputFavorValue, - PutNoteSetValue, + InputFavorLabelledValue, + SetNotePutValue, InputTextValue, InputPwValue, VoteValue,