diff --git a/Views/SettingsWindow.xaml b/Views/SettingsWindow.xaml index cdd7245..8ef5f3f 100644 --- a/Views/SettingsWindow.xaml +++ b/Views/SettingsWindow.xaml @@ -100,7 +100,7 @@ - + diff --git a/Views/SettingsWindow.xaml.cs b/Views/SettingsWindow.xaml.cs index 6aa79c0..cba9423 100644 --- a/Views/SettingsWindow.xaml.cs +++ b/Views/SettingsWindow.xaml.cs @@ -48,7 +48,7 @@ namespace TabletTester2025 p.HardnessMax_N = double.Parse(HardnessMaxBox.Text); p.HardnessTestCount = int.Parse(HardnessCountBox.Text); p.FriabilityTargetRpm = double.Parse(FriabilityRpmBox.Text); - p.FriabilityTargetTimeMin = double.Parse(FriabilityTimeBox.Text); + p.FriabilityTargetTimeMin = int.Parse(FriabilityTimeBox.Text); p.FriabilityTargetRounds = CalculateFriabilityRounds(p.FriabilityTargetTimeMin, p.FriabilityTargetRpm); p.FriabilityMaxLossPercent = double.Parse(FriabilityMaxLossBox.Text); p.DisintegrationDosageForm = GetSelectedDisintegrationDosageForm(); @@ -96,7 +96,7 @@ namespace TabletTester2025 if (FriabilityRoundsBox == null) return; - if (double.TryParse(FriabilityTimeBox?.Text, out double timeMin) + if (int.TryParse(FriabilityTimeBox?.Text, out int timeMin) && double.TryParse(FriabilityRpmBox?.Text, out double rpm) && timeMin > 0 && rpm > 0) diff --git a/appsettings.json b/appsettings.json index dd85afd..013b66e 100644 --- a/appsettings.json +++ b/appsettings.json @@ -35,7 +35,7 @@ "FriabilityStartCoilReset": 95, // 脆碎复位启动 - "FriabilityTestTime": 410, // 脆碎试验时间(min) + "FriabilityTestTime": 410, // 试验次数(次) "FriabilityWeightBefore": 412, // 脆碎前质量(g) "FriabilityWeightAfter": 414, // 脆碎后质量(g) "WeightBefore": 412,