更新
This commit is contained in:
@@ -339,6 +339,7 @@ namespace TabletTester2025.ViewModels
|
|||||||
SaveDisintegrationResultCommand = new AsyncRelayCommand(SaveDisintegrationResultAsync);
|
SaveDisintegrationResultCommand = new AsyncRelayCommand(SaveDisintegrationResultAsync);
|
||||||
|
|
||||||
_ = LoadFriabilitySettingsAsync();
|
_ = LoadFriabilitySettingsAsync();
|
||||||
|
_ = LoadMediumTemperatureAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ApplyPharmaDefaults()
|
public void ApplyPharmaDefaults()
|
||||||
@@ -390,6 +391,7 @@ namespace TabletTester2025.ViewModels
|
|||||||
}
|
}
|
||||||
|
|
||||||
_ = WriteFriabilityRoundsAsync(FriabilityTargetRounds);
|
_ = WriteFriabilityRoundsAsync(FriabilityTargetRounds);
|
||||||
|
_ = LoadMediumTemperatureAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void LoadPharmaDefaults()
|
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)
|
private async Task WriteDisintegrationTimeAsync(double value)
|
||||||
{
|
{
|
||||||
if (_plcConfig.DisintegrationTime == 0 || value <= 0 || !double.IsFinite(value))
|
if (_plcConfig.DisintegrationTime == 0 || value <= 0 || !double.IsFinite(value))
|
||||||
|
|||||||
@@ -486,6 +486,10 @@
|
|||||||
<TextBlock Text="30min最低溶出度Q(%):" Style="{StaticResource ParamLabel}"/>
|
<TextBlock Text="30min最低溶出度Q(%):" Style="{StaticResource ParamLabel}"/>
|
||||||
<TextBlock Text="{Binding DissolutionMinPercentAt30Min, StringFormat=F1}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/>
|
<TextBlock Text="{Binding DissolutionMinPercentAt30Min, StringFormat=F1}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
<StackPanel Style="{StaticResource ParamRow}">
|
||||||
|
<TextBlock Text="介质温度(℃):" Style="{StaticResource ParamLabel}"/>
|
||||||
|
<TextBlock Text="{Binding DisintegrationTemp, StringFormat=F1}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/>
|
||||||
|
</StackPanel>
|
||||||
</WrapPanel>
|
</WrapPanel>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
|
|
||||||
@@ -621,16 +625,6 @@
|
|||||||
|
|
||||||
<GroupBox Header="当前参数" Grid.Row="0">
|
<GroupBox Header="当前参数" Grid.Row="0">
|
||||||
<WrapPanel>
|
<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}">
|
<StackPanel Style="{StaticResource ParamRow}">
|
||||||
<TextBlock Text="崩解时间(min):" Style="{StaticResource ParamLabel}"/>
|
<TextBlock Text="崩解时间(min):" Style="{StaticResource ParamLabel}"/>
|
||||||
<TextBlock Text="{Binding DisintegrationTimeMin, StringFormat=F1}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/>
|
<TextBlock Text="{Binding DisintegrationTimeMin, StringFormat=F1}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user