diff --git a/Views/MainWindow.xaml b/Views/MainWindow.xaml index 03ecfe7..08b65ff 100644 --- a/Views/MainWindow.xaml +++ b/Views/MainWindow.xaml @@ -577,12 +577,12 @@ - + diff --git a/Views/SettingsWindow.xaml.cs b/Views/SettingsWindow.xaml.cs index 6aa79c0..4032103 100644 --- a/Views/SettingsWindow.xaml.cs +++ b/Views/SettingsWindow.xaml.cs @@ -96,8 +96,8 @@ namespace TabletTester2025 if (FriabilityRoundsBox == null) return; - if (double.TryParse(FriabilityTimeBox?.Text, out double timeMin) - && double.TryParse(FriabilityRpmBox?.Text, out double rpm) + if (int.TryParse(FriabilityTimeBox?.Text, out int timeMin) + && int.TryParse(FriabilityRpmBox?.Text, out int rpm) && timeMin > 0 && rpm > 0) { diff --git a/appsettings.json b/appsettings.json index dd85afd..c12dc85 100644 --- a/appsettings.json +++ b/appsettings.json @@ -23,8 +23,9 @@ "HardnessPoSun": 400, // 硬度破损判定输入N "HardnessMax": 72, //最大力采集 "HardnessShishilizhi": 1314, //力显示 - - + + "FriabilityRoundsBox": 410, //实验转速 + "DisintegrationSeconds": 420, //崩解时间