diff --git a/Qwilight/Assets/Language.json b/Qwilight/Assets/Language.json index 899a207..74709d6 100644 --- a/Qwilight/Assets/Language.json +++ b/Qwilight/Assets/Language.json @@ -11,7 +11,7 @@ "ko-KR": "{0}의 {1}를 방어함", "en-US": "Defends {1} of {0}" }, - "AlgorithmInputFavorFaultText": { + "LabelledInputFavorFaultText": { "ko-KR": "대상 간격이 올바르지 않습니다.", "en-US": "Destination spacing is not valid." }, @@ -631,7 +631,7 @@ "ko-KR": "스킨 설정", "en-US": "Skin Settings" }, - "ConfigureAlgorithmInputFavorMillisContents": { + "ConfigureLabelledInputFavorMillisContents": { "ko-KR": "대상 간격", "en-US": "Target Interval" }, @@ -2767,7 +2767,7 @@ "ko-KR": "1P를 2P로 복사합니다. (⑤K, ⑦K만 적용)", "en-US": "Copy 1P to 2P. (⑤K, ⑦K only)" }, - "AlgorithmInputFavorAssist": { + "LabelledInputFavorAssist": { "ko-KR": "대상 간격 이상 거리를 유지하여 자연스럽게 만듭니다." }, "PutNoteSetAssist": { diff --git a/Qwilight/Compiler/BaseCompiler.cs b/Qwilight/Compiler/BaseCompiler.cs index fb4400d..a917916 100644 --- a/Qwilight/Compiler/BaseCompiler.cs +++ b/Qwilight/Compiler/BaseCompiler.cs @@ -430,10 +430,10 @@ } } } - else if (ModeComponent.InputFavorMode.Algorithm4 <= inputFavorMode && inputFavorMode <= ModeComponent.InputFavorMode.Algorithm48_4) + else if (ModeComponent.InputFavorMode.Labelled4 <= inputFavorMode && inputFavorMode <= ModeComponent.InputFavorMode.Labelled48_4) { - var algorithmInputFavorMillis = defaultComputer.ModeComponentValue.AlgorithmInputFavorMillis; - var algorithmNotes = new List(); + var labelledInputFavorMillis = defaultComputer.ModeComponentValue.LabelledInputFavorMillis; + var labelledNotes = new List(); foreach (var note in Notes.ToArray()) { if (note.HasInput) @@ -449,36 +449,36 @@ } else { - var algorithmInput0 = (int)Math.Ceiling(GetAlgorithmInput(input, 0.0)); - var algorithmInput1 = (int)Math.Floor(GetAlgorithmInput(input, 1.0)); + var labelledInput0 = (int)Math.Ceiling(GetLabelledInput(input, 0.0)); + var labelledInput1 = (int)Math.Floor(GetLabelledInput(input, 1.0)); if (Component.DefaultInputCounts[(int)InputMode] < Component.DefaultInputCounts[(int)inputMode]) { - note.LevyingInput = algorithmInput0; + note.LevyingInput = labelledInput0; WipeIfCollided(note); - for (var algorithmInput = algorithmInput0 + 1; algorithmInput <= algorithmInput1; ++algorithmInput) + for (var labelledInput = labelledInput0 + 1; labelledInput <= labelledInput1; ++labelledInput) { - var algorithmNote = note switch + var labelledNote = note switch { - TrapNote trapNote => new TrapNote(trapNote.LogicalY, trapNote.Wait, Array.Empty(), algorithmInput), - LongNote longNote => new LongNote(longNote.LogicalY, longNote.Wait, Array.Empty(), algorithmInput, longNote.LongWait, longNote.LongHeight), - VoidNote voidNote => new VoidNote(voidNote.LogicalY, voidNote.Wait, Array.Empty(), algorithmInput), - InputNote inputNote => new InputNote(inputNote.LogicalY, inputNote.Wait, Array.Empty(), algorithmInput), + TrapNote trapNote => new TrapNote(trapNote.LogicalY, trapNote.Wait, Array.Empty(), labelledInput), + LongNote longNote => new LongNote(longNote.LogicalY, longNote.Wait, Array.Empty(), labelledInput, longNote.LongWait, longNote.LongHeight), + VoidNote voidNote => new VoidNote(voidNote.LogicalY, voidNote.Wait, Array.Empty(), labelledInput), + InputNote inputNote => new InputNote(inputNote.LogicalY, inputNote.Wait, Array.Empty(), labelledInput), _ => null }; - if (!WipeIfCollided(algorithmNote)) + if (!WipeIfCollided(labelledNote)) { - Notes.Add(algorithmNote); + Notes.Add(labelledNote); } } } else { - note.LevyingInput = (int)Math.Round(GetAlgorithmInput(input, (double)(input - defaultInputs.First()) / (defaultInputs.Last() - defaultInputs.First()))); + note.LevyingInput = (int)Math.Round(GetLabelledInput(input, (double)(input - defaultInputs.First()) / (defaultInputs.Last() - defaultInputs.First()))); WipeIfCollided(note); } - double GetAlgorithmInput(int input, double random) + double GetLabelledInput(int input, double random) { var rate = (double)(Component.DefaultInputCounts[(int)Component.GetInputMode(inputFavorMode)] - 1) / Component.DefaultInputCounts[(int)InputMode]; return rate * (input - defaultInputs.First()) + Component.DefaultInputs[(int)Component.GetInputMode(inputFavorMode)].First() + rate * random; @@ -486,14 +486,14 @@ bool WipeIfCollided(BaseNote note) { - if (algorithmNotes.Any(algorithmNote => algorithmNote.LevyingInput == note.LevyingInput && algorithmNote.IsCollided(note, algorithmInputFavorMillis))) + if (labelledNotes.Any(labelledNote => labelledNote.LevyingInput == note.LevyingInput && labelledNote.IsCollided(note, labelledInputFavorMillis))) { WipeNote(note); return true; } else { - algorithmNotes.Add(note); + labelledNotes.Add(note); return false; } } diff --git a/Qwilight/Component.cs b/Qwilight/Component.cs index 474c634..7794e4f 100644 --- a/Qwilight/Component.cs +++ b/Qwilight/Component.cs @@ -131,43 +131,43 @@ switch (inputFavorMode) { case ModeComponent.InputFavorMode._4: - case ModeComponent.InputFavorMode.Algorithm4: + case ModeComponent.InputFavorMode.Labelled4: return InputMode._4; case ModeComponent.InputFavorMode._5: - case ModeComponent.InputFavorMode.Algorithm5: + case ModeComponent.InputFavorMode.Labelled5: return InputMode._5; case ModeComponent.InputFavorMode._6: - case ModeComponent.InputFavorMode.Algorithm6: + case ModeComponent.InputFavorMode.Labelled6: return InputMode._6; case ModeComponent.InputFavorMode._7: - case ModeComponent.InputFavorMode.Algorithm7: + case ModeComponent.InputFavorMode.Labelled7: return InputMode._7; case ModeComponent.InputFavorMode._8: - case ModeComponent.InputFavorMode.Algorithm8: + case ModeComponent.InputFavorMode.Labelled8: return InputMode._8; case ModeComponent.InputFavorMode._9: - case ModeComponent.InputFavorMode.Algorithm9: + case ModeComponent.InputFavorMode.Labelled9: return InputMode._9; case ModeComponent.InputFavorMode._10: - case ModeComponent.InputFavorMode.Algorithm10: + case ModeComponent.InputFavorMode.Labelled10: return InputMode._10; case ModeComponent.InputFavorMode._5_1: - case ModeComponent.InputFavorMode.Algorithm5_1: + case ModeComponent.InputFavorMode.Labelled5_1: return InputMode._5_1; case ModeComponent.InputFavorMode._7_1: - case ModeComponent.InputFavorMode.Algorithm7_1: + case ModeComponent.InputFavorMode.Labelled7_1: return InputMode._7_1; case ModeComponent.InputFavorMode._10_2: - case ModeComponent.InputFavorMode.Algorithm10_2: + case ModeComponent.InputFavorMode.Labelled10_2: return InputMode._10_2; case ModeComponent.InputFavorMode._14_2: - case ModeComponent.InputFavorMode.Algorithm14_2: + case ModeComponent.InputFavorMode.Labelled14_2: return InputMode._14_2; case ModeComponent.InputFavorMode._24_2: - case ModeComponent.InputFavorMode.Algorithm24_2: + case ModeComponent.InputFavorMode.Labelled24_2: return InputMode._24_2; case ModeComponent.InputFavorMode._48_4: - case ModeComponent.InputFavorMode.Algorithm48_4: + case ModeComponent.InputFavorMode.Labelled48_4: return InputMode._48_4; default: throw new ArgumentException(inputFavorMode.ToString()); diff --git a/Qwilight/ModeComponent.cs b/Qwilight/ModeComponent.cs index bad58ae..f0f39c6 100644 --- a/Qwilight/ModeComponent.cs +++ b/Qwilight/ModeComponent.cs @@ -44,7 +44,7 @@ public enum InputFavorMode { Default, _4 = 4, _5, _6, _7, _8, _9, _5_1, _7_1, _10_2, _14_2, _10, _24_2, _48_4, - Algorithm4, Algorithm5, Algorithm6, Algorithm7, Algorithm8, Algorithm9, Algorithm10, Algorithm5_1, Algorithm7_1, Algorithm10_2, Algorithm14_2, Algorithm24_2, Algorithm48_4 + Labelled4, Labelled5, Labelled6, Labelled7, Labelled8, Labelled9, Labelled10, Labelled5_1, Labelled7_1, Labelled10_2, Labelled14_2, Labelled24_2, Labelled48_4 } public enum NoteModifyMode @@ -99,7 +99,7 @@ LowestJudgmentConditionMode _lowestJudgmentConditionMode; PutCopyNotes _putCopyNotes; double _multiplierUnit = 0.01; - double _algorithmInputFavorMillis = 100.0; + double _labelledInputFavorMillis = 100.0; double _lowestLongNoteModify = 100.0; double _highestLongNoteModify = 100.0; double _putNoteSet = 25.0; @@ -187,7 +187,7 @@ public bool CanBeTwilightComment => JudgmentModeValue != JudgmentMode.Favor && HandlingHitPointsModeValue != HitPointsMode.Favor && HandlingHitPointsModeValue != HitPointsMode.Test && LongNoteModeValue != LongNoteMode.Input && - InputFavorModeValue != InputFavorMode.Algorithm4 && InputFavorModeValue != InputFavorMode.Algorithm5 && InputFavorModeValue != InputFavorMode.Algorithm6 && InputFavorModeValue != InputFavorMode.Algorithm7 && InputFavorModeValue != InputFavorMode.Algorithm8 && InputFavorModeValue != InputFavorMode.Algorithm9 && InputFavorModeValue != InputFavorMode.Algorithm10 && InputFavorModeValue != InputFavorMode.Algorithm5_1 && InputFavorModeValue != InputFavorMode.Algorithm7_1 && InputFavorModeValue != InputFavorMode.Algorithm10_2 && InputFavorModeValue != InputFavorMode.Algorithm14_2 && InputFavorModeValue != InputFavorMode.Algorithm24_2 && InputFavorModeValue != InputFavorMode.Algorithm48_4 && + InputFavorModeValue != InputFavorMode.Labelled4 && InputFavorModeValue != InputFavorMode.Labelled5 && InputFavorModeValue != InputFavorMode.Labelled6 && InputFavorModeValue != InputFavorMode.Labelled7 && InputFavorModeValue != InputFavorMode.Labelled8 && InputFavorModeValue != InputFavorMode.Labelled9 && InputFavorModeValue != InputFavorMode.Labelled10 && InputFavorModeValue != InputFavorMode.Labelled5_1 && InputFavorModeValue != InputFavorMode.Labelled7_1 && InputFavorModeValue != InputFavorMode.Labelled10_2 && InputFavorModeValue != InputFavorMode.Labelled14_2 && InputFavorModeValue != InputFavorMode.Labelled24_2 && InputFavorModeValue != InputFavorMode.Labelled48_4 && NoteModifyModeValue != NoteModifyMode.LongNote && BPMModeValue == BPMMode.Default && WaveModeValue == WaveMode.Default && @@ -815,11 +815,11 @@ set => SetProperty(ref FavorHitPoints[(int)Component.Judged.Lowest][1], value, nameof(LowestHitPoints1)); } - public void SetAutoAlgorithmInputFavorMillis() + public void SetAutoLabelledInputFavorMillis() { - if (Configure.Instance.AutoAlgorithmInputFavorMillis) + if (Configure.Instance.AutoLabelledInputFavorMillis) { - AlgorithmInputFavorMillis = 1000.0 * 240.0 / (BPM * AudioMultiplier) / Configure.Instance.AutoAlgorithmInputFavorMillisValue; + LabelledInputFavorMillis = 1000.0 * 240.0 / (BPM * AudioMultiplier) / Configure.Instance.AutoLabelledInputFavorMillisValue; } } @@ -847,11 +847,11 @@ } } - public double AlgorithmInputFavorMillis + public double LabelledInputFavorMillis { - get => _algorithmInputFavorMillis; + get => _labelledInputFavorMillis; - set => SetProperty(ref _algorithmInputFavorMillis, value, nameof(AlgorithmInputFavorMillis)); + set => SetProperty(ref _labelledInputFavorMillis, value, nameof(LabelledInputFavorMillis)); } public double LowestLongNoteModify diff --git a/Qwilight/Qwilight.csproj b/Qwilight/Qwilight.csproj index 356944d..f075581 100644 --- a/Qwilight/Qwilight.csproj +++ b/Qwilight/Qwilight.csproj @@ -10,9 +10,9 @@ Qwilight.ico Taehui 불로그 - 1.16.16.574 - 1.16.16.574 - 1.16.16 + 1.16.17.575 + 1.16.17.575 + 1.16.17 true enable true diff --git a/Qwilight/System/Configure/Configure.cs b/Qwilight/System/Configure/Configure.cs index 54191e7..fbcf57d 100644 --- a/Qwilight/System/Configure/Configure.cs +++ b/Qwilight/System/Configure/Configure.cs @@ -250,11 +250,11 @@ int _hofViewTotalTabPosition; int _hofViewAtTabPosition; int _hofViewAbilityTabPosition; - bool _autoAlgorithmInputFavorMillis; + bool _autoLabelledInputFavorMillis; bool _autoLowestLongNoteModify; bool _highestAutoLongNoteModify; bool _autoPutNoteSetMillis; - double _autoAlgorithmInputFavorMillisValue; + double _autoLabelledInputFavorMillisValue; double _autoLowestLongNoteModifyValue; double _autoHighestLongNoteModifyValue; double _autoPutNoteSetMillisValue; @@ -641,15 +641,15 @@ [JsonIgnore] public string ConfigureFault { get; set; } - public bool AutoAlgorithmInputFavorMillis + public bool AutoLabelledInputFavorMillis { - get => _autoAlgorithmInputFavorMillis; + get => _autoLabelledInputFavorMillis; set { - if (SetProperty(ref _autoAlgorithmInputFavorMillis, value, nameof(AutoAlgorithmInputFavorMillis)) && _isLoaded) + if (SetProperty(ref _autoLabelledInputFavorMillis, value, nameof(AutoLabelledInputFavorMillis)) && _isLoaded) { - ViewModels.Instance.MainValue.ModeComponentValue.SetAutoAlgorithmInputFavorMillis(); + ViewModels.Instance.MainValue.ModeComponentValue.SetAutoLabelledInputFavorMillis(); } } } @@ -667,15 +667,15 @@ } } - public double AutoAlgorithmInputFavorMillisValue + public double AutoLabelledInputFavorMillisValue { - get => _autoAlgorithmInputFavorMillisValue; + get => _autoLabelledInputFavorMillisValue; set { - if (SetProperty(ref _autoAlgorithmInputFavorMillisValue, value, nameof(AutoAlgorithmInputFavorMillisValue)) && _isLoaded) + if (SetProperty(ref _autoLabelledInputFavorMillisValue, value, nameof(AutoLabelledInputFavorMillisValue)) && _isLoaded) { - ViewModels.Instance.MainValue.ModeComponentValue.SetAutoAlgorithmInputFavorMillis(); + ViewModels.Instance.MainValue.ModeComponentValue.SetAutoLabelledInputFavorMillis(); } } } diff --git a/Qwilight/System/DB.cs b/Qwilight/System/DB.cs index 2666d53..bfca219 100644 --- a/Qwilight/System/DB.cs +++ b/Qwilight/System/DB.cs @@ -129,7 +129,7 @@ Lowest_Judgment_1 REAL DEFAULT 0.0, Lowest_Long_Note_Modify REAL DEFAULT 0.0, Highest_Long_Note_Modify REAL DEFAULT 0.0, - Algorithm_Input_Favor_Millis REAL DEFAULT 0.0, + Labelled_Input_Favor_Millis REAL DEFAULT 0.0, Put_Note_Set INTEGER DEFAULT 0, Put_Note_Set_Millis REAL DEFAULT 0.0, Highest_Hit_Points_0 REAL DEFAULT 0.0, @@ -154,7 +154,7 @@ } if (HasTable("comment", ta)) { - // Algorithm_Input_Favor_Millis + // Labelled_Input_Favor_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) @@ -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, Algorithm_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, 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 FROM comment WHERE {(string.IsNullOrEmpty(eventNoteID) ? "Note_ID = @noteID" : "Event_Note_ID = @eventNoteID")} ORDER BY Stand DESC @@ -603,7 +603,7 @@ LowJudgment1 = rows.GetDouble("Low_Judgment_1"), LowerJudgment1 = rows.GetDouble("Lower_Judgment_1"), LowestJudgment1 = rows.GetDouble("Lowest_Judgment_1"), - AlgorithmInputFavorMillis = rows.GetDouble("Algorithm_Input_Favor_Millis"), + LabelledInputFavorMillis = rows.GetDouble("Labelled_Input_Favor_Millis"), LowestLongNoteModify = rows.GetDouble("Lowest_Long_Note_Modify"), HighestLongNoteModify = rows.GetDouble("Highest_Long_Note_Modify"), PutNoteSet = rows.GetInt32("Put_Note_Set"), @@ -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, @algorithmInputFavorMillis, @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, @labelledInputFavorMillis, @lowestLongNoteModify, @highestLongNoteModify, @putNoteSet, @putNoteSetMillis, @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,7 +973,7 @@ dbStatement.Parameters.AddWithValue("lowJudgment1", modeComponentValue.LowJudgment1); dbStatement.Parameters.AddWithValue("lowerJudgment1", modeComponentValue.LowerJudgment1); dbStatement.Parameters.AddWithValue("lowestJudgment1", modeComponentValue.LowestJudgment1); - dbStatement.Parameters.AddWithValue("algorithmInputFavorMillis", modeComponentValue.AlgorithmInputFavorMillis); + dbStatement.Parameters.AddWithValue("labelledInputFavorMillis", modeComponentValue.LabelledInputFavorMillis); dbStatement.Parameters.AddWithValue("lowestLongNoteModify", modeComponentValue.LowestLongNoteModify); dbStatement.Parameters.AddWithValue("highestLongNoteModify", modeComponentValue.HighestLongNoteModify); dbStatement.Parameters.AddWithValue("putNoteSet", modeComponentValue.PutNoteSet); diff --git a/Qwilight/System/LanguageSystem/LanguageSystem.cs b/Qwilight/System/LanguageSystem/LanguageSystem.cs index 6cd3909..7995242 100644 --- a/Qwilight/System/LanguageSystem/LanguageSystem.cs +++ b/Qwilight/System/LanguageSystem/LanguageSystem.cs @@ -141,19 +141,19 @@ InputFavorModeTexts[(int)ModeComponent.InputFavorMode._14_2] = InputFavorMode142; InputFavorModeTexts[(int)ModeComponent.InputFavorMode._24_2] = InputFavorMode242; InputFavorModeTexts[(int)ModeComponent.InputFavorMode._48_4] = InputFavorMode484; - InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm4] = InputFavorModeFill4; - InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm5] = InputFavorModeFill5; - InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm6] = InputFavorModeFill6; - InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm7] = InputFavorModeFill7; - InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm8] = InputFavorModeFill8; - InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm9] = InputFavorModeFill9; - InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm10] = InputFavorModeFill10; - InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm5_1] = InputFavorModeFill51; - InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm7_1] = InputFavorModeFill71; - InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm10_2] = InputFavorModeFill102; - InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm14_2] = InputFavorModeFill142; - InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm24_2] = InputFavorModeFill242; - InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm48_4] = InputFavorModeFill484; + InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled4] = InputFavorModeFill4; + InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled5] = InputFavorModeFill5; + InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled6] = InputFavorModeFill6; + InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled7] = InputFavorModeFill7; + InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled8] = InputFavorModeFill8; + InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled9] = InputFavorModeFill9; + InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled10] = InputFavorModeFill10; + InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled5_1] = InputFavorModeFill51; + InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled7_1] = InputFavorModeFill71; + InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled10_2] = InputFavorModeFill102; + InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled14_2] = InputFavorModeFill142; + InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled24_2] = InputFavorModeFill242; + InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled48_4] = InputFavorModeFill484; NoteSaltModeTexts[(int)ModeComponent.NoteSaltMode.Default] = DefaultSaltModeContents; NoteSaltModeTexts[(int)ModeComponent.NoteSaltMode.Symmetric] = SymmetricModeContents; diff --git a/Qwilight/System/LanguageSystem/LanguageSystem.g.cs b/Qwilight/System/LanguageSystem/LanguageSystem.g.cs index df232a6..b1064c0 100644 --- a/Qwilight/System/LanguageSystem/LanguageSystem.g.cs +++ b/Qwilight/System/LanguageSystem/LanguageSystem.g.cs @@ -5,7 +5,7 @@ public string _4DModeContents { get; set; } public string AbilityFittedText { get; set; } public string AegisPostedItemText { get; set; } - public string AlgorithmInputFavorFaultText { get; set; } + public string LabelledInputFavorFaultText { get; set; } public string AllowEssentialInputs { get; set; } public string AllowTotalLevyingText { get; set; } public string AllowTwilightCommentAssist { get; set; } @@ -160,7 +160,7 @@ public string ComputingGUIConfigure { get; set; } public string ComputingModeComponentConfigure { get; set; } public string ComputingUIConfigure { get; set; } - public string ConfigureAlgorithmInputFavorMillisContents { get; set; } + public string ConfigureLabelledInputFavorMillisContents { get; set; } public string ConfigureAssist { get; set; } public string ConfigureBaseUIContents { get; set; } public string ConfigureEtcUIContents { get; set; } diff --git a/Qwilight/View/AlgorithmInputFavorWindow.xaml b/Qwilight/View/AlgorithmInputFavorWindow.xaml deleted file mode 100644 index 281a48f..0000000 --- a/Qwilight/View/AlgorithmInputFavorWindow.xaml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Qwilight/View/AlgorithmInputFavorWindow.xaml.cs b/Qwilight/View/AlgorithmInputFavorWindow.xaml.cs deleted file mode 100644 index 18805c1..0000000 --- a/Qwilight/View/AlgorithmInputFavorWindow.xaml.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Qwilight.ViewModel; -using System.Windows; - -namespace Qwilight.View -{ - public sealed partial class AlgorithmInputFavorWindow - { - public AlgorithmInputFavorWindow() => InitializeComponent(); - - void OnMeterModified(object sender, RoutedPropertyChangedEventArgs e) => (DataContext as AlgorithmInputFavorViewModel).OnMeterModified(); - - void OnSetMeter(object sender, RoutedEventArgs e) => (DataContext as AlgorithmInputFavorViewModel).OnMeterModified(); - } -} \ No newline at end of file diff --git a/Qwilight/View/LabeledInputFavorWindow.xaml b/Qwilight/View/LabeledInputFavorWindow.xaml new file mode 100644 index 0000000..985d19f --- /dev/null +++ b/Qwilight/View/LabeledInputFavorWindow.xaml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Qwilight/View/LabeledInputFavorWindow.xaml.cs b/Qwilight/View/LabeledInputFavorWindow.xaml.cs new file mode 100644 index 0000000..30ba455 --- /dev/null +++ b/Qwilight/View/LabeledInputFavorWindow.xaml.cs @@ -0,0 +1,14 @@ +using Qwilight.ViewModel; +using System.Windows; + +namespace Qwilight.View +{ + public sealed partial class LabelledInputFavorWindow + { + public LabelledInputFavorWindow() => InitializeComponent(); + + void OnMeterModified(object sender, RoutedPropertyChangedEventArgs e) => (DataContext as LabelledInputFavorViewModel).OnMeterModified(); + + void OnSetMeter(object sender, RoutedEventArgs e) => (DataContext as LabelledInputFavorViewModel).OnMeterModified(); + } +} \ No newline at end of file diff --git a/Qwilight/View/MainWindow/WPFView.xaml b/Qwilight/View/MainWindow/WPFView.xaml index 0b37e96..9858d41 100644 --- a/Qwilight/View/MainWindow/WPFView.xaml +++ b/Qwilight/View/MainWindow/WPFView.xaml @@ -40,7 +40,7 @@ - + diff --git a/Qwilight/ViewModel/AlgorithmInputFavorViewModel.cs b/Qwilight/ViewModel/AlgorithmInputFavorViewModel.cs deleted file mode 100644 index 69a8e71..0000000 --- a/Qwilight/ViewModel/AlgorithmInputFavorViewModel.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Windows; - -namespace Qwilight.ViewModel -{ - public sealed class AlgorithmInputFavorViewModel : 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.SetAutoAlgorithmInputFavorMillis(); - - public override bool ClosingCondition - { - get - { - var modeComponentValue = ViewModels.Instance.MainValue.ModeComponentValue; - var algorithmInputFavorMillis = modeComponentValue.AlgorithmInputFavorMillis; - if (algorithmInputFavorMillis == 0.0) - { - NotifySystem.Instance.Notify(NotifySystem.NotifyVariety.Warning, NotifySystem.NotifyConfigure.Default, LanguageSystem.Instance.AlgorithmInputFavorFaultText); - return false; - } - - return base.ClosingCondition; - } - } - } -} \ No newline at end of file diff --git a/Qwilight/ViewModel/LabeledInputFavorViewModel.cs b/Qwilight/ViewModel/LabeledInputFavorViewModel.cs new file mode 100644 index 0000000..6280173 --- /dev/null +++ b/Qwilight/ViewModel/LabeledInputFavorViewModel.cs @@ -0,0 +1,31 @@ +using System.Windows; + +namespace Qwilight.ViewModel +{ + public sealed class LabelledInputFavorViewModel : 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.SetAutoLabelledInputFavorMillis(); + + public override bool ClosingCondition + { + get + { + var modeComponentValue = ViewModels.Instance.MainValue.ModeComponentValue; + var labelledInputFavorMillis = modeComponentValue.LabelledInputFavorMillis; + if (labelledInputFavorMillis == 0.0) + { + NotifySystem.Instance.Notify(NotifySystem.NotifyVariety.Warning, NotifySystem.NotifyConfigure.Default, LanguageSystem.Instance.LabelledInputFavorFaultText); + return false; + } + + return base.ClosingCondition; + } + } + } +} \ No newline at end of file diff --git a/Qwilight/ViewModel/ModifyModeComponentViewModel.cs b/Qwilight/ViewModel/ModifyModeComponentViewModel.cs index 843b705..ca8b6cb 100644 --- a/Qwilight/ViewModel/ModifyModeComponentViewModel.cs +++ b/Qwilight/ViewModel/ModifyModeComponentViewModel.cs @@ -437,15 +437,15 @@ }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() { - Value = (int)ModeComponent.InputFavorMode.Algorithm4, - Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm4], - Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Algorithm4]?.DefaultDrawing, + Value = (int)ModeComponent.InputFavorMode.Labelled4, + Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled4], + Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Labelled4]?.DefaultDrawing, PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.AlgorithmInputFavorValue.Open(); + ViewModels.Instance.LabelledInputFavorValue.Open(); ModeComponentVariety = InputFavorModeVariety; - ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Algorithm4); + ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled4); }) }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() @@ -457,15 +457,15 @@ }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() { - Value = (int)ModeComponent.InputFavorMode.Algorithm5, - Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm5], - Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Algorithm5]?.DefaultDrawing, + Value = (int)ModeComponent.InputFavorMode.Labelled5, + Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled5], + Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Labelled5]?.DefaultDrawing, PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.AlgorithmInputFavorValue.Open(); + ViewModels.Instance.LabelledInputFavorValue.Open(); ModeComponentVariety = InputFavorModeVariety; - ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Algorithm5); + ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled5); }) }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() @@ -477,15 +477,15 @@ }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() { - Value = (int)ModeComponent.InputFavorMode.Algorithm6, - Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm6], - Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Algorithm6]?.DefaultDrawing, + Value = (int)ModeComponent.InputFavorMode.Labelled6, + Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled6], + Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Labelled6]?.DefaultDrawing, PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.AlgorithmInputFavorValue.Open(); + ViewModels.Instance.LabelledInputFavorValue.Open(); ModeComponentVariety = InputFavorModeVariety; - ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Algorithm6); + ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled6); }) }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() @@ -497,15 +497,15 @@ }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() { - Value = (int)ModeComponent.InputFavorMode.Algorithm7, - Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm7], - Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Algorithm7]?.DefaultDrawing, + Value = (int)ModeComponent.InputFavorMode.Labelled7, + Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled7], + Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Labelled7]?.DefaultDrawing, PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.AlgorithmInputFavorValue.Open(); + ViewModels.Instance.LabelledInputFavorValue.Open(); ModeComponentVariety = InputFavorModeVariety; - ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Algorithm7); + ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled7); }) }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() @@ -517,15 +517,15 @@ }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() { - Value = (int)ModeComponent.InputFavorMode.Algorithm8, - Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm8], - Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Algorithm8]?.DefaultDrawing, + Value = (int)ModeComponent.InputFavorMode.Labelled8, + Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled8], + Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Labelled8]?.DefaultDrawing, PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.AlgorithmInputFavorValue.Open(); + ViewModels.Instance.LabelledInputFavorValue.Open(); ModeComponentVariety = InputFavorModeVariety; - ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Algorithm8); + ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled8); }) }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() @@ -537,15 +537,15 @@ }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() { - Value = (int)ModeComponent.InputFavorMode.Algorithm9, - Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm9], - Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Algorithm9]?.DefaultDrawing, + Value = (int)ModeComponent.InputFavorMode.Labelled9, + Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled9], + Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Labelled9]?.DefaultDrawing, PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.AlgorithmInputFavorValue.Open(); + ViewModels.Instance.LabelledInputFavorValue.Open(); ModeComponentVariety = InputFavorModeVariety; - ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Algorithm9); + ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled9); }) }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() @@ -557,15 +557,15 @@ }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() { - Value = (int)ModeComponent.InputFavorMode.Algorithm10, - Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm10], - Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Algorithm10]?.DefaultDrawing, + Value = (int)ModeComponent.InputFavorMode.Labelled10, + Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled10], + Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Labelled10]?.DefaultDrawing, PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.AlgorithmInputFavorValue.Open(); + ViewModels.Instance.LabelledInputFavorValue.Open(); ModeComponentVariety = InputFavorModeVariety; - ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Algorithm10); + ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled10); }) }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() @@ -577,15 +577,15 @@ }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() { - Value = (int)ModeComponent.InputFavorMode.Algorithm5_1, - Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm5_1], - Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Algorithm5_1]?.DefaultDrawing, + Value = (int)ModeComponent.InputFavorMode.Labelled5_1, + Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled5_1], + Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Labelled5_1]?.DefaultDrawing, PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.AlgorithmInputFavorValue.Open(); + ViewModels.Instance.LabelledInputFavorValue.Open(); ModeComponentVariety = InputFavorModeVariety; - ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Algorithm5_1); + ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled5_1); }) }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() @@ -597,15 +597,15 @@ }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() { - Value = (int)ModeComponent.InputFavorMode.Algorithm7_1, - Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm7_1], - Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Algorithm7_1]?.DefaultDrawing, + Value = (int)ModeComponent.InputFavorMode.Labelled7_1, + Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled7_1], + Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Labelled7_1]?.DefaultDrawing, PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.AlgorithmInputFavorValue.Open(); + ViewModels.Instance.LabelledInputFavorValue.Open(); ModeComponentVariety = InputFavorModeVariety; - ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Algorithm7_1); + ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled7_1); }) }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() @@ -617,15 +617,15 @@ }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() { - Value = (int)ModeComponent.InputFavorMode.Algorithm10_2, - Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm10_2], - Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Algorithm10_2]?.DefaultDrawing, + Value = (int)ModeComponent.InputFavorMode.Labelled10_2, + Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled10_2], + Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Labelled10_2]?.DefaultDrawing, PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.AlgorithmInputFavorValue.Open(); + ViewModels.Instance.LabelledInputFavorValue.Open(); ModeComponentVariety = InputFavorModeVariety; - ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Algorithm10_2); + ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled10_2); }) }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() @@ -637,15 +637,15 @@ }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() { - Value = (int)ModeComponent.InputFavorMode.Algorithm14_2, - Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm14_2], - Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Algorithm14_2]?.DefaultDrawing, + Value = (int)ModeComponent.InputFavorMode.Labelled14_2, + Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled14_2], + Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Labelled14_2]?.DefaultDrawing, PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.AlgorithmInputFavorValue.Open(); + ViewModels.Instance.LabelledInputFavorValue.Open(); ModeComponentVariety = InputFavorModeVariety; - ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Algorithm14_2); + ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled14_2); }) }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() @@ -657,15 +657,15 @@ }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() { - Value = (int)ModeComponent.InputFavorMode.Algorithm24_2, - Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm24_2], - Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Algorithm24_2]?.DefaultDrawing, + Value = (int)ModeComponent.InputFavorMode.Labelled24_2, + Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled24_2], + Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Labelled24_2]?.DefaultDrawing, PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.AlgorithmInputFavorValue.Open(); + ViewModels.Instance.LabelledInputFavorValue.Open(); ModeComponentVariety = InputFavorModeVariety; - ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Algorithm24_2); + ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled24_2); }) }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() @@ -677,15 +677,15 @@ }); ModifyModeComponentItems[InputFavorModeVariety].Add(new() { - Value = (int)ModeComponent.InputFavorMode.Algorithm48_4, - Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Algorithm48_4], - Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Algorithm48_4]?.DefaultDrawing, + Value = (int)ModeComponent.InputFavorMode.Labelled48_4, + Data = LanguageSystem.Instance.InputFavorModeTexts[(int)ModeComponent.InputFavorMode.Labelled48_4], + Drawing = BaseUI.Instance.ModeComponentDrawings[InputFavorModeVariety][(int)ModeComponent.InputFavorMode.Labelled48_4]?.DefaultDrawing, PointedPaintID = 2, OnConfigure = new(() => { - ViewModels.Instance.AlgorithmInputFavorValue.Open(); + ViewModels.Instance.LabelledInputFavorValue.Open(); ModeComponentVariety = InputFavorModeVariety; - ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Algorithm48_4); + ModeComponentItem = ModeComponentItems.Find(modeComponentItem => modeComponentItem.Value == (int)ModeComponent.InputFavorMode.Labelled48_4); }) }); diff --git a/Qwilight/ViewModel/ViewModels.cs b/Qwilight/ViewModel/ViewModels.cs index 29e602e..653bf66 100644 --- a/Qwilight/ViewModel/ViewModels.cs +++ b/Qwilight/ViewModel/ViewModels.cs @@ -70,7 +70,7 @@ public LevelViewModel LevelValue { get; } = new(); - public AlgorithmInputFavorViewModel AlgorithmInputFavorValue { get; } = new(); + public LabelledInputFavorViewModel LabelledInputFavorValue { get; } = new(); public PutNoteSetViewModel PutNoteSetValue { get; } = new(); @@ -129,7 +129,7 @@ ModifyModeComponentValue, FontFamilyValue, LevelValue, - AlgorithmInputFavorValue, + LabelledInputFavorValue, PutNoteSetValue, InputTextValue, InputPwValue,