This commit is contained in:
@@ -45,7 +45,7 @@
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Label Grid.Row="0" Grid.Column="0" Content="膜类型:"/>
|
||||
<ComboBox Grid.Row="0" Grid.Column="1" ItemsSource="{Binding MembraneTypes}" SelectedItem="{Binding Record.SampleType}" Margin="5"/>
|
||||
<ComboBox Grid.Row="0" Grid.Column="1" IsEnabled="False" IsReadOnly="True" ItemsSource="{Binding MembraneTypes}" SelectedItem="{Binding Record.SampleType}" Margin="5"/>
|
||||
|
||||
<!--<Label Grid.Row="0" Grid.Column="2" Content="规格:"/>
|
||||
<TextBox Grid.Row="0" Grid.Column="3" Text="{Binding Record.SampleSpec}" Margin="5"/>-->
|
||||
|
||||
@@ -135,7 +135,7 @@
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<ComboBox ItemsSource="{Binding PressureModeList}" SelectedItem="{Binding SelectedPressureMode}" Width="80"/>
|
||||
|
||||
<ComboBox ItemsSource="{Binding InTakeModeList}" SelectedItem="{Binding SelecteInTakeMode}" Width="80"/>
|
||||
<ComboBox ItemsSource="{Binding InTakeModeList}" SelectedItem="{Binding SelecteInTakeMode}" Width="80" IsEnabled="False"/>
|
||||
<Button Content="▶ 启动" Command="{Binding StartCommand}" Width="80" Background="#4CAF50"/>
|
||||
<Button Content="⏹ 停止" Command="{Binding StopCommand}" Width="80" Background="#F44336"/>
|
||||
<Button Content="{Binding PressButtonText}" Command="{Binding PressCommand}" Width="80" Background="#FF9800"/>
|
||||
@@ -163,12 +163,12 @@
|
||||
|
||||
<StackPanel Orientation="Horizontal" Margin="15,0,0,0">
|
||||
<StackPanel Orientation="Horizontal" Margin="0,0,10,0">
|
||||
<Label Content="加压上限:" VerticalAlignment="Center" Margin="0,0,5,0"/>
|
||||
<Label Content="加压上限(kPa):" VerticalAlignment="Center" Margin="0,0,5,0"/>
|
||||
<TextBox x:Name="txtPressureUpper" Width="120" FontSize="16" Height="32" VerticalAlignment="Center" Text="{Binding PressureUpperLimit, UpdateSourceTrigger=LostFocus, StringFormat=F3}" />
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Label Content="加压速率:" VerticalAlignment="Center" Margin="0,0,5,0"/>
|
||||
<TextBox x:Name="txtPressureRate" Width="120" FontSize="16" Height="32" VerticalAlignment="Center" Text="{Binding PressureRate, UpdateSourceTrigger=LostFocus, StringFormat=F3}" />
|
||||
<Label Content="加压速率(kPa):" VerticalAlignment="Center" Margin="0,0,5,0" ToolTip="每10ms加压速率,一般1-10,不要太高"/>
|
||||
<TextBox x:Name="txtPressureRate" ToolTip="每10ms加压速率,一般1-10,不要太高" Width="120" FontSize="16" Height="32" VerticalAlignment="Center" Text="{Binding PressureRate, UpdateSourceTrigger=LostFocus, StringFormat=F3}" />
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
|
||||
|
||||
@@ -132,7 +132,7 @@
|
||||
|
||||
<Label Grid.Row="0" Grid.Column="0" Content="膜类型:"/>
|
||||
<ComboBox Grid.Row="0" Grid.Column="1" ItemsSource="{Binding MembraneTypes}"
|
||||
SelectedItem="{Binding Record.SampleType}"/>
|
||||
SelectedItem="{Binding Record.SampleType}" IsEnabled="False" IsReadOnly="True"/>
|
||||
|
||||
|
||||
<!--<Label Grid.Row="0" Grid.Column="2" Content="室温(°C):"/>
|
||||
@@ -152,20 +152,11 @@
|
||||
SelectedItem="{Binding Record.PressureUnit}"/>
|
||||
|
||||
<Label Grid.Row="3" Grid.Column="2" Content="(干/湿膜)/(大/小流量):"/>
|
||||
<ComboBox HorizontalAlignment="Left" Grid.Row="3" Grid.Column="3" SelectedItem="{Binding TestMode}" Width="80">
|
||||
<ComboBoxItem Content="全部" />
|
||||
<ComboBoxItem Content="湿膜" IsSelected="True"/>
|
||||
<ComboBoxItem Content="干膜"/>
|
||||
</ComboBox>
|
||||
<ComboBox Grid.Row="3" HorizontalAlignment="Right" Grid.Column="3" ItemsSource="{Binding PressureModeList}"
|
||||
SelectedItem="{Binding SelectedPressureMode}" Width="100"/>
|
||||
<Button Grid.Row="3" Grid.Column="3"
|
||||
Content="🗑 清除数据"
|
||||
Command="{Binding ClearAllCommand}"
|
||||
Background="#F44336"
|
||||
Width="90"
|
||||
HorizontalAlignment="Center"
|
||||
Margin="0,5,5,5"/>
|
||||
<StackPanel Grid.Row="3" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
|
||||
<ComboBox ItemsSource="{Binding TestModes}" SelectedItem="{Binding TestMode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="80" Margin="0,0,5,0"/>
|
||||
<ComboBox ItemsSource="{Binding PressureModeList}" SelectedItem="{Binding SelectedPressureMode}" Width="100" Margin="0,0,5,0"/>
|
||||
<Button Content="🗑 清除数据" Command="{Binding ClearAllCommand}" Background="#F44336" Width="90" Margin="0,0,0,0"/>
|
||||
</StackPanel>
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user