This commit is contained in:
GukSang.Jin
2026-05-20 11:19:43 +08:00
parent 954afaaf39
commit 9da775aa37
2 changed files with 20 additions and 10 deletions

View File

@@ -339,6 +339,7 @@ namespace TabletTester2025.ViewModels
SaveDisintegrationResultCommand = new AsyncRelayCommand(SaveDisintegrationResultAsync);
_ = LoadFriabilitySettingsAsync();
_ = LoadMediumTemperatureAsync();
}
public void ApplyPharmaDefaults()
@@ -390,6 +391,7 @@ namespace TabletTester2025.ViewModels
}
_ = WriteFriabilityRoundsAsync(FriabilityTargetRounds);
_ = LoadMediumTemperatureAsync();
}
private void LoadPharmaDefaults()
@@ -1463,6 +1465,20 @@ namespace TabletTester2025.ViewModels
}
}
private async Task LoadMediumTemperatureAsync()
{
if (_plcConfig.DisintegrationTemp == 0)
return;
try
{
double value = await _plc.ReadFloatAsync(_plcConfig.DisintegrationTemp);
if (double.IsFinite(value) && value > 0)
DisintegrationTemp = value;
}
catch { }
}
private async Task WriteDisintegrationTimeAsync(double value)
{
if (_plcConfig.DisintegrationTime == 0 || value <= 0 || !double.IsFinite(value))

View File

@@ -486,6 +486,10 @@
<TextBlock Text="30min最低溶出度Q(%)" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="{Binding DissolutionMinPercentAt30Min, StringFormat=F1}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Style="{StaticResource ParamRow}">
<TextBlock Text="介质温度(℃)" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="{Binding DisintegrationTemp, StringFormat=F1}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel>
</WrapPanel>
</GroupBox>
@@ -621,16 +625,6 @@
<GroupBox Header="当前参数" Grid.Row="0">
<WrapPanel>
<StackPanel Style="{StaticResource ParamRow}">
<TextBlock Text="剂型规格:" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="{Binding DisintegrationDosageForm}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Style="{StaticResource ParamRow}">
<TextBlock Text="崩解速度(r/min)" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="{Binding DisintegrationSpeedRpm, StringFormat=F1}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Style="{StaticResource ParamRow}">
<TextBlock Text="崩解时间(min)" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="{Binding DisintegrationTimeMin, StringFormat=F1}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/>