This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
xmlns:conv="clr-namespace:MembranePoreTester.Converters">
|
||||
<UserControl.Resources>
|
||||
<conv:InverseBooleanConverter x:Key="InverseBooleanConverter"/>
|
||||
<conv:DoubleStringConverter x:Key="DoubleStringConverter"/>
|
||||
|
||||
<Style TargetType="RadioButton">
|
||||
<Setter Property="Margin" Value="5,2"/>
|
||||
@@ -53,7 +54,7 @@
|
||||
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Record.RoomTemperature}" Margin="5"/>-->
|
||||
|
||||
<Label Grid.Row="1" Grid.Column="0" Content="浸润时间(h):"/>
|
||||
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Record.SoakingTime}" Margin="5"/>
|
||||
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Record.SoakingTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource DoubleStringConverter}}" Margin="5"/>
|
||||
|
||||
<Label Grid.Row="2" Grid.Column="0" Content="加压速率:"/>
|
||||
<TextBox Grid.Row="2" Grid.Column="1" IsEnabled="False" Text="{Binding Record.SpeedRate1}" Margin="5"/>
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
Background="#F5F7FA" >
|
||||
<UserControl.Resources>
|
||||
<conv:InverseBooleanConverter x:Key="InverseBooleanConverter"/>
|
||||
<conv:DoubleStringConverter x:Key="DoubleStringConverter"/>
|
||||
|
||||
<!-- 统一按钮样式 -->
|
||||
<Style TargetType="Button">
|
||||
@@ -137,7 +138,7 @@
|
||||
<TextBox Grid.Row="0" Grid.Column="3" Text="{Binding Record.RoomTemperature}"/>-->
|
||||
|
||||
<Label Grid.Row="1" Grid.Column="2" Content="浸润时间(h):"/>
|
||||
<TextBox Grid.Row="1" Grid.Column="3" Text="{Binding Record.SoakingTime}"/>
|
||||
<TextBox Grid.Row="1" Grid.Column="3" Text="{Binding Record.SoakingTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource DoubleStringConverter}}"/>
|
||||
|
||||
<Label Grid.Row="1" Grid.Column="0" Content="测试液体:"/>
|
||||
<ComboBox Grid.Row="1" Grid.Column="1" ItemsSource="{Binding Liquids}"
|
||||
@@ -178,9 +179,14 @@
|
||||
<TextBlock Text="L/min" VerticalAlignment="Center" Margin="5,0,0,0"/>
|
||||
</StackPanel>-->
|
||||
|
||||
<Label Grid.Row="4" Grid.Column="0" Content="加压速率:"/>
|
||||
<TextBox Grid.Row="4" Grid.Column="1" IsEnabled="False" Text="{Binding SpeedRate1, StringFormat=F2}" Margin="5"/>
|
||||
|
||||
<Label Grid.Row="4" Grid.Column="0" Content="实时流量(L/min):"/>
|
||||
<TextBox Grid.Row="4" Grid.Column="1" IsEnabled="False" Text="{Binding CurrentFlow, StringFormat=F2}"/>
|
||||
|
||||
<Label Grid.Row="4" Grid.Column="2" Content="实时流量(L/min):"/>
|
||||
<TextBox Grid.Row="4" Grid.Column="3" IsEnabled="False" Text="{Binding CurrentFlow, StringFormat=F2}"/>
|
||||
<!--<Label Grid.Row="4" Grid.Column="0" Content="实时流量(L/min):"/>
|
||||
<TextBox Grid.Row="4" Grid.Column="1" IsEnabled="False" Text="{Binding CurrentFlow, StringFormat=F2}"/>-->
|
||||
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
|
||||
Reference in New Issue
Block a user