Skip to content

Commit

Permalink
调整某些设置的类型为int
Browse files Browse the repository at this point in the history
  • Loading branch information
imba-tjd committed Feb 10, 2022
1 parent d2d82a0 commit 8e43eaa
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions MisakaTranslator-WPF/Common.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ public static bool ExportTextractorHistory()
/// </summary>
public static void RepairFuncInit()
{
TextRepair.SingleWordRepeatTimes = int.Parse(repairSettings.SingleWordRepeatTimes);
TextRepair.SentenceRepeatFindCharNum = int.Parse(repairSettings.SentenceRepeatFindCharNum);
TextRepair.SingleWordRepeatTimes = repairSettings.SingleWordRepeatTimes;
TextRepair.SentenceRepeatFindCharNum = repairSettings.SentenceRepeatFindCharNum;
TextRepair.regexPattern = repairSettings.Regex;
TextRepair.regexReplacement = repairSettings.Regex_Replace;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public partial class ChooseTextRepairFuncPage : Page
public ChooseTextRepairFuncPage()
{
InitializeComponent();

RepairFuncCombox.ItemsSource = lstRepairFun;
RepairFuncCombox.SelectedIndex = 0;

Expand Down Expand Up @@ -93,7 +93,7 @@ private void ConfirmBtn_Click(object sender, RoutedEventArgs e)
$"UPDATE game_library SET repair_func = '{Common.UsingRepairFunc}' WHERE gameid = {Common.GameID};");
break;
}

}

//使用路由事件机制通知窗口来完成下一步操作
Expand All @@ -104,19 +104,19 @@ private void ConfirmBtn_Click(object sender, RoutedEventArgs e)

private void SingleConfirm_Click(object sender, RoutedEventArgs e)
{
Common.repairSettings.SingleWordRepeatTimes = Single_TextBox.Text;
if (!int.TryParse(Single_TextBox.Text, out int _))
if (!int.TryParse(Single_TextBox.Text, out int times))
return;
Common.repairSettings.SingleWordRepeatTimes = times;
Common.RepairFuncInit();
repairedTextBox.Text = TextRepair.RepairFun_RemoveSingleWordRepeat(sourceTextBox.Text);
Single_InputDrawer.IsOpen = false;
}

private void SentenceConfirm_Click(object sender, RoutedEventArgs e)
{
Common.repairSettings.SentenceRepeatFindCharNum = Sentence_TextBox.Text;
if (!int.TryParse(Sentence_TextBox.Text, out int _))
if (!int.TryParse(Sentence_TextBox.Text, out int num))
return;
Common.repairSettings.SentenceRepeatFindCharNum = num;
Common.RepairFuncInit();
repairedTextBox.Text = TextRepair.RepairFun_RemoveSentenceRepeat(sourceTextBox.Text);
Sentence_InputDrawer.IsOpen = false;
Expand Down
8 changes: 4 additions & 4 deletions MisakaTranslator-WPF/IAppSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -397,15 +397,15 @@ string ForegroundHex

public interface IRepeatRepairSettings
{
[Option(Alias = "RepairFun_RemoveSingleWordRepeat.RepeatTimes", DefaultValue = "0")]
string SingleWordRepeatTimes
[Option(Alias = "RepairFun_RemoveSingleWordRepeat.RepeatTimes", DefaultValue = 0)]
int SingleWordRepeatTimes
{
get;
set;
}

[Option(Alias = "RepairFun_RemoveSentenceRepeat.FindCharNum", DefaultValue = "4")]
string SentenceRepeatFindCharNum
[Option(Alias = "RepairFun_RemoveSentenceRepeat.FindCharNum", DefaultValue = 4)]
int SentenceRepeatFindCharNum
{
get;
set;
Expand Down
4 changes: 2 additions & 2 deletions MisakaTranslator-WPF/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,10 @@ private async Task StartTranslateByGid(int gid) {

switch (Common.UsingRepairFunc) {
case "RepairFun_RemoveSingleWordRepeat":
Common.repairSettings.SingleWordRepeatTimes = gameInfoList[gid].RepairParamA;
Common.repairSettings.SingleWordRepeatTimes = int.Parse(gameInfoList[gid].RepairParamA);
break;
case "RepairFun_RemoveSentenceRepeat":
Common.repairSettings.SentenceRepeatFindCharNum = gameInfoList[gid].RepairParamA;
Common.repairSettings.SentenceRepeatFindCharNum = int.Parse(gameInfoList[gid].RepairParamA);
break;
case "RepairFun_RegexReplace":
Common.repairSettings.Regex = gameInfoList[gid].RepairParamA;
Expand Down

0 comments on commit 8e43eaa

Please sign in to comment.