csi_team/CSI-Z420-Tablet-Multi-Function-Tester
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

te

Browse Source
This commit is contained in:
rain
2026-05-15 10:20:30 +08:00
parent f91d5c3e98
commit 0b68413bf9
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Views/ShowData.xaml
View File

@@ -75,7 +75,7 @@
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource SettingLabel}" Text="最大力采集"/> <TextBlock Style="{StaticResource SettingLabel}" Text="最大力采集"/>
<TextBox Style="{StaticResource SettingTextBox}" Name="txt_MaxForceCollect"/> <TextBox Style="{StaticResource SettingTextBox}" Name="txt_MaxForceCollect" IsReadOnly="True"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Border> </Border>
@@ -139,7 +139,7 @@
<TextBlock Style="{StaticResource GroupTitle}" Text="⚙ 力值与温度校准"/> <TextBlock Style="{StaticResource GroupTitle}" Text="⚙ 力值与温度校准"/>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource SettingLabel}" Text="力显示"/> <TextBlock Style="{StaticResource SettingLabel}" Text="力显示"/>
<TextBox Style="{StaticResource SettingTextBox}" Name="txt_ForceDisplay"/> <TextBox Style="{StaticResource SettingTextBox}" Name="txt_ForceDisplay" IsReadOnly="True"/>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource SettingLabel}" Text="力系数"/> <TextBlock Style="{StaticResource SettingLabel}" Text="力系数"/>
@@ -151,7 +151,7 @@
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource SettingLabel}" Text="温度系数"/> <TextBlock Style="{StaticResource SettingLabel}" Text="温度系数"/>
<TextBox Style="{StaticResource SettingTextBox}" Name="txt_TemperatureCoefficient"/> <TextBox Style="{StaticResource SettingTextBox}" Name="txt_TemperatureCoefficient" IsReadOnly="True"/>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource SettingLabel}" Text="温度显示"/> <TextBlock Style="{StaticResource SettingLabel}" Text="温度显示"/>

27
Views/ShowData.xaml.cs
View File

@@ -75,10 +75,23 @@ namespace 片剂四用仪.Views
} }
} }
} }
// 正常循环的Delay，同样处理取消异常
try
{
await Task.Delay(1000, token);
}
catch (OperationCanceledException)
{
break;
}
}
catch (OperationCanceledException)
{
// 窗口关闭时的取消异常，正常退出循环
break;
} }
catch { }
await Task.Delay(1000, token); //await Task.Delay(1000, token);
} }
} }
@@ -123,7 +136,7 @@ namespace 片剂四用仪.Views
new PlcParamMapping("txt_HardnessDisplacement", 310, PlcParamType.Float), new PlcParamMapping("txt_HardnessDisplacement", 310, PlcParamType.Float),
new PlcParamMapping("txt_HardnessMotorLimit", 298, PlcParamType.Float), new PlcParamMapping("txt_HardnessMotorLimit", 298, PlcParamType.Float),
new PlcParamMapping("txt_HardnessDamageThreshold", 400, PlcParamType.Float), new PlcParamMapping("txt_HardnessDamageThreshold", 400, PlcParamType.Float),
new PlcParamMapping("txt_MaxForceCollect", 72, PlcParamType.Float),
new PlcParamMapping("txt_BrittlenessTestTime", 410, PlcParamType.Int), new PlcParamMapping("txt_BrittlenessTestTime", 410, PlcParamType.Int),
new PlcParamMapping("txt_PreBrittlenessMass", 412, PlcParamType.Int), new PlcParamMapping("txt_PreBrittlenessMass", 412, PlcParamType.Int),
@@ -136,11 +149,15 @@ namespace 片剂四用仪.Views
new PlcParamMapping("txt_DissolutionTime", 430, PlcParamType.Int), new PlcParamMapping("txt_DissolutionTime", 430, PlcParamType.Int),
new PlcParamMapping("txt_DissolutionSamplingInterval", 432, PlcParamType.Int), new PlcParamMapping("txt_DissolutionSamplingInterval", 432, PlcParamType.Int),
new PlcParamMapping("txt_ForceDisplay", 1314, PlcParamType.Float),
new PlcParamMapping("txt_ForceCoefficient", 1320, PlcParamType.Float), new PlcParamMapping("txt_ForceCoefficient", 1320, PlcParamType.Float),
new PlcParamMapping("txt_ForceProtection", 1322, PlcParamType.Float), new PlcParamMapping("txt_ForceProtection", 1322, PlcParamType.Float),
new PlcParamMapping("txt_TemperatureCoefficient", 1428, PlcParamType.Float),
new PlcParamMapping("txt_TemperatureDisplay", 1430, PlcParamType.Float), new PlcParamMapping("txt_TemperatureDisplay", 1430, PlcParamType.Float),
new PlcParamMapping("txt_MaxForceCollect", 72, PlcParamType.Float),//读取
new PlcParamMapping("txt_ForceDisplay", 1314, PlcParamType.Float),//读取
new PlcParamMapping("txt_TemperatureCoefficient", 1428, PlcParamType.Float),//读取
}; };
} }