From 81b257cbdc80a7703b363c1b6f0df2956448579b Mon Sep 17 00:00:00 2001 From: rain Date: Wed, 20 May 2026 07:05:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B4=A9=E8=A7=A3=E6=9C=80=E9=95=BF=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Views/SettingsWindow.xaml.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Views/SettingsWindow.xaml.cs b/Views/SettingsWindow.xaml.cs index 3f27ac1..c184f53 100644 --- a/Views/SettingsWindow.xaml.cs +++ b/Views/SettingsWindow.xaml.cs @@ -42,15 +42,15 @@ namespace TabletTester2025 HardnessMaxBox.Text = p.HardnessMax_N.ToString(); HardnessCountBox.Text = p.HardnessTestCount.ToString(); FriabilityRpmBox.Text = p.FriabilityTargetRpm.ToString(); - FriabilityTimeBox.Text = ResolveFriabilityTargetTimeMin(p).ToString("0.###"); + //FriabilityTimeBox.Text = ResolveFriabilityTargetTimeMin(p).ToString("0.###"); FriabilityRoundsBox.Text = ResolveFriabilityTargetRounds(p).ToString(); FriabilityMaxLossBox.Text = p.FriabilityMaxLossPercent.ToString(); SelectDisintegrationDosageForm(p.DisintegrationDosageForm); - DisintegrationMaxSecBox.Text = p.DisintegrationMaxSeconds.ToString(); + //DisintegrationMaxSecBox.Text = p.DisintegrationMaxSeconds.ToString(); DisintegrationSpeedBox.Text = p.DisintegrationSpeedRpm.ToString(); DisintegrationTempBox.Text = p.DisintegrationTemperatureC.ToString(); DissolutionMinPercentBox.Text = p.DissolutionMinPercentAt30min.ToString(); - DissolutionTempBox.Text = p.DissolutionTemperatureC.ToString(); + //DissolutionTempBox.Text = p.DissolutionTemperatureC.ToString(); Dissolution1TimeBox.Text = p.Dissolution1TimeMin.ToString(); Dissolution2TimeBox.Text = p.Dissolution2TimeMin.ToString(); Dissolution1IntervalBox.Text = p.Dissolution1SampleIntervalMin.ToString(); @@ -73,15 +73,15 @@ namespace TabletTester2025 int hardnessDamageThreshold = ParsePositiveInt(HardnessDamageThresholdBox.Text, "硬度破损判定"); double friabilityRpm = ParseFiniteDouble(FriabilityRpmBox.Text, "脆碎度转速"); p.FriabilityTargetRpm = friabilityRpm; - p.FriabilityTargetTimeMin = ParseFiniteDouble(FriabilityTimeBox.Text, "脆碎度试验时间"); + //p.FriabilityTargetTimeMin = ParseFiniteDouble(FriabilityTimeBox.Text, "脆碎度试验时间"); p.FriabilityTargetRounds = ParsePositiveInt(FriabilityRoundsBox.Text, "脆碎圈数"); p.FriabilityMaxLossPercent = ParseFiniteDouble(FriabilityMaxLossBox.Text, "最大失重率"); p.DisintegrationDosageForm = GetSelectedDisintegrationDosageForm(); - p.DisintegrationMaxSeconds = int.Parse(DisintegrationMaxSecBox.Text); + //p.DisintegrationMaxSeconds = int.Parse(DisintegrationMaxSecBox.Text); //崩解最长时间 p.DisintegrationSpeedRpm = ParseFiniteDouble(DisintegrationSpeedBox.Text, "崩解升降频率"); p.DisintegrationTemperatureC = ParseFiniteDouble(DisintegrationTempBox.Text, "崩解介质温度"); p.DissolutionMinPercentAt30min = ParseFiniteDouble(DissolutionMinPercentBox.Text, "30分钟最低溶出度"); - p.DissolutionTemperatureC = ParseFiniteDouble(DissolutionTempBox.Text, "溶出介质温度"); + //p.DissolutionTemperatureC = ParseFiniteDouble(DissolutionTempBox.Text, "溶出介质温度"); p.Dissolution1TimeMin = int.Parse(Dissolution1TimeBox.Text); p.Dissolution2TimeMin = int.Parse(Dissolution2TimeBox.Text); p.Dissolution1SampleIntervalMin = ParsePositiveInt(Dissolution1IntervalBox.Text, "溶出1取样间隔"); @@ -116,8 +116,8 @@ namespace TabletTester2025 private void DisintegrationDosageFormBox_SelectionChanged(object sender, SelectionChangedEventArgs e) { - if (DisintegrationDosageFormBox.SelectedItem is ComboBoxItem item && item.Tag is string seconds) - DisintegrationMaxSecBox.Text = seconds; + //if (DisintegrationDosageFormBox.SelectedItem is ComboBoxItem item && item.Tag is string seconds) + // DisintegrationMaxSecBox.Text = seconds; } private void SelectDisintegrationDosageForm(string dosageForm)