实验次数

Views/MainWindow.xaml

@@ -577,12 +577,12 @@
                                                 <TextBlock Text="{Binding DisintegrationSeconds}" Style="{StaticResource MetricValue}"/>
                                             </StackPanel>
                                         </Border>
-                                        <!--<Border Style="{StaticResource MetricCard}">
+                                        <Border Style="{StaticResource MetricCard}">
                                             <StackPanel>
                                                 <TextBlock Text="剩余未崩解管数" Style="{StaticResource MetricLabel}"/>
                                                 <TextBlock Text="{Binding RemainingTubes}" Foreground="#C62828" Style="{StaticResource MetricValue}"/>
                                             </StackPanel>
-                                        </Border>-->
+                                        </Border>
                                     </UniformGrid>
                                 </GroupBox>
 

Views/SettingsWindow.xaml

@@ -100,7 +100,7 @@
                                 <TextBox x:Name="FriabilityRpmBox" TextChanged="FriabilityCalculationBox_TextChanged"/>
                             </StackPanel>
                             <StackPanel Style="{StaticResource ParamRow}">
-                                <TextBlock Text="试验时间(min):" Style="{StaticResource ParamLabel}"/>
+                                <TextBlock Text="试验次数(次):" Style="{StaticResource ParamLabel}"/>
                                 <TextBox x:Name="FriabilityTimeBox" TextChanged="FriabilityCalculationBox_TextChanged"/>
                             </StackPanel>
                             <StackPanel Style="{StaticResource ParamRow}">

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();
@@ -97,7 +97,7 @@ namespace TabletTester2025
                 return;
 
             if (int.TryParse(FriabilityTimeBox?.Text, out int timeMin)
-                && int.TryParse(FriabilityRpmBox?.Text, out int rpm)
+                && double.TryParse(FriabilityRpmBox?.Text, out double rpm)
                 && timeMin > 0
                 && rpm > 0)
             {

appsettings.json

@@ -23,9 +23,8 @@
     "HardnessPoSun": 400, // 硬度破损判定输入N
     "HardnessMax": 72, //最大力采集
     "HardnessShishilizhi": 1314, //力显示
-    
-    "FriabilityRoundsBox": 410, //实验转速
-    "DisintegrationSeconds": 420, //崩解时间
+
+
 
 
 
@@ -36,7 +35,7 @@
     "FriabilityStartCoilReset": 95, // 脆碎复位启动
 
 
-    "FriabilityTestTime": 410, // 脆碎试验时间(min)
+    "FriabilityTestTime": 410, // 试验次数(次)
     "FriabilityWeightBefore": 412, // 脆碎前质量(g)
     "FriabilityWeightAfter": 414, // 脆碎后质量(g)
     "WeightBefore": 412,