|
@@ -286,7 +286,7 @@
|
|
Height="20" Width="60" Background="Transparent" Foreground="Blue" FontSize="14" />
|
|
Height="20" Width="60" Background="Transparent" Foreground="Blue" FontSize="14" />
|
|
</Grid>
|
|
</Grid>
|
|
|
|
|
|
- <Grid Height="50" Margin="10 0 10 0">
|
|
|
|
|
|
+ <Grid Height="50" Margin="10 0 10 0" x:Name="grdRedInd">
|
|
<Grid.ColumnDefinitions>
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="90" />
|
|
<ColumnDefinition Width="90" />
|
|
<ColumnDefinition Width="*" />
|
|
<ColumnDefinition Width="*" />
|
|
@@ -332,11 +332,17 @@
|
|
Height="20" Width="60" Background="Transparent" Foreground="Blue" FontSize="14" />
|
|
Height="20" Width="60" Background="Transparent" Foreground="Blue" FontSize="14" />
|
|
</Grid>
|
|
</Grid>
|
|
|
|
|
|
-
|
|
|
|
- <Grid Height="40" Margin="10 0 10 0">
|
|
|
|
- <Button x:Name="btnMarkMeter" Click="BtnMarkMeter_Click"
|
|
|
|
- Grid.Column="2" Content="根据水表照片标定位置" BorderThickness="0 0 0 1" BorderBrush="Blue" HorizontalAlignment="Left"
|
|
|
|
|
|
+ <StackPanel Height="1" Background="#D3D3D3" Margin="10 0 10 0" />
|
|
|
|
+ <Grid Height="50" Margin="10 0 10 0">
|
|
|
|
+ <Grid.RowDefinitions>
|
|
|
|
+ <RowDefinition Height="30" />
|
|
|
|
+ <RowDefinition Height="30" />
|
|
|
|
+ </Grid.RowDefinitions>
|
|
|
|
+ <Button x:Name="btnMarkMeter" Click="BtnMarkMeter_Click"
|
|
|
|
+ Grid.Row="0" Content="根据水表照片标定位置(可选)" BorderThickness="0 0 0 1" BorderBrush="Blue" HorizontalAlignment="Left"
|
|
Height="20" Background="Transparent" Foreground="Blue" FontSize="14" />
|
|
Height="20" Background="Transparent" Foreground="Blue" FontSize="14" />
|
|
|
|
+ <TextBlock Text="*配置以上参数后,识别结果类型为88时,需要配置。" Foreground="Red" FontSize="13"
|
|
|
|
+ Grid.Row="1" Margin="0 0 0 0" />
|
|
</Grid>
|
|
</Grid>
|
|
|
|
|
|
<Grid Height="50" Margin="10 0 10 0">
|
|
<Grid Height="50" Margin="10 0 10 0">
|
|
@@ -345,7 +351,8 @@
|
|
<ColumnDefinition Width="*" />
|
|
<ColumnDefinition Width="*" />
|
|
<ColumnDefinition Width="80" />
|
|
<ColumnDefinition Width="80" />
|
|
</Grid.ColumnDefinitions>
|
|
</Grid.ColumnDefinitions>
|
|
- <TextBlock Grid.Column="0" Text="表盘范围" VerticalAlignment="Center" FontSize="14" />
|
|
|
|
|
|
+ <!--<TextBlock Grid.Column="0" Text="表盘范围" VerticalAlignment="Center" FontSize="14" />-->
|
|
|
|
+ <CheckBox x:Name="chkMeterRegion" Grid.Column="0" Content="表盘范围" VerticalAlignment="Center" FontSize="14" VerticalContentAlignment="Center" />
|
|
<TextBox Grid.Column="1" x:Name="txtMeterRegion" Height="26" Padding="2" FontSize="14px" IsReadOnly="True" />
|
|
<TextBox Grid.Column="1" x:Name="txtMeterRegion" Height="26" Padding="2" FontSize="14px" IsReadOnly="True" />
|
|
<Button x:Name="btnMeterRegion" Click="BtnMeterRegion_Click"
|
|
<Button x:Name="btnMeterRegion" Click="BtnMeterRegion_Click"
|
|
Grid.Column="3" Content="说明示例" BorderThickness="0 0 0 1" BorderBrush="Blue"
|
|
Grid.Column="3" Content="说明示例" BorderThickness="0 0 0 1" BorderBrush="Blue"
|
|
@@ -357,7 +364,10 @@
|
|
<ColumnDefinition Width="*" />
|
|
<ColumnDefinition Width="*" />
|
|
<ColumnDefinition Width="80" />
|
|
<ColumnDefinition Width="80" />
|
|
</Grid.ColumnDefinitions>
|
|
</Grid.ColumnDefinitions>
|
|
- <TextBlock x:Name="txtFeatureRegionTitle" Grid.Column="0" Text="数字范围" VerticalAlignment="Center" FontSize="14" TextWrapping="Wrap" />
|
|
|
|
|
|
+ <!--<TextBlock x:Name="txtFeatureRegionTitle" Grid.Column="0" Text="数字范围" VerticalAlignment="Center" FontSize="14" TextWrapping="Wrap" />-->
|
|
|
|
+ <CheckBox x:Name="chkFeatureRegion" Grid.Column="0" VerticalAlignment="Center" FontSize="14" VerticalContentAlignment="Center">
|
|
|
|
+ <TextBlock x:Name="txtFeatureRegionTitle" Text="数字范围" VerticalAlignment="Center" FontSize="14" TextWrapping="Wrap" />
|
|
|
|
+ </CheckBox>
|
|
<TextBox Grid.Column="1" x:Name="txtFeatureRegion" Height="26" Padding="2" FontSize="14px" IsReadOnly="True" />
|
|
<TextBox Grid.Column="1" x:Name="txtFeatureRegion" Height="26" Padding="2" FontSize="14px" IsReadOnly="True" />
|
|
<Button x:Name="btnFeatureRegion" Click="BtnFeatureRegion_Click"
|
|
<Button x:Name="btnFeatureRegion" Click="BtnFeatureRegion_Click"
|
|
Grid.Column="3" Content="说明示例" BorderThickness="0 0 0 1" BorderBrush="Blue"
|
|
Grid.Column="3" Content="说明示例" BorderThickness="0 0 0 1" BorderBrush="Blue"
|
|
@@ -373,6 +383,11 @@
|
|
<TextBlock Text="采样频率项:" VerticalAlignment="Center" Foreground="Blue" FontSize="14" />
|
|
<TextBlock Text="采样频率项:" VerticalAlignment="Center" Foreground="Blue" FontSize="14" />
|
|
</Grid>
|
|
</Grid>
|
|
|
|
|
|
|
|
+ <Grid Height="30" Margin="10 0 10 0" >
|
|
|
|
+ <TextBlock Text="需要改变采样间隔时,配置以下选项。" Foreground="DarkBlue" FontSize="14"
|
|
|
|
+ Grid.Row="1" Margin="0 0 0 0" VerticalAlignment="Center" FontWeight="Bold"/>
|
|
|
|
+ </Grid>
|
|
|
|
+
|
|
<Grid Height="50" Margin="10 0 10 0">
|
|
<Grid Height="50" Margin="10 0 10 0">
|
|
<Grid.ColumnDefinitions>
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="90" />
|
|
<ColumnDefinition Width="90" />
|
|
@@ -381,7 +396,7 @@
|
|
<ColumnDefinition Width="80" />
|
|
<ColumnDefinition Width="80" />
|
|
</Grid.ColumnDefinitions>
|
|
</Grid.ColumnDefinitions>
|
|
<!--<TextBlock Grid.Column="0" Text="采样周期" VerticalAlignment="Center" FontSize="14" TextWrapping="Wrap" />-->
|
|
<!--<TextBlock Grid.Column="0" Text="采样周期" VerticalAlignment="Center" FontSize="14" TextWrapping="Wrap" />-->
|
|
- <CheckBox x:Name="chkSampleInterval" Grid.Column="0" Content="采样周期" VerticalAlignment="Center" FontSize="14" />
|
|
|
|
|
|
+ <CheckBox x:Name="chkSampleInterval" Grid.Column="0" Content="采样周期" VerticalAlignment="Center" FontSize="14" VerticalContentAlignment="Center" />
|
|
<TextBox Visibility="Collapsed" Grid.Column="1" x:Name="txtSampleInterval1" Height="26" Padding="2" FontSize="14px" IsReadOnly="False" />
|
|
<TextBox Visibility="Collapsed" Grid.Column="1" x:Name="txtSampleInterval1" Height="26" Padding="2" FontSize="14px" IsReadOnly="False" />
|
|
<!--<ComboBox Grid.Column="1" x:Name="cmbFlowRate" Height="26" FontSize="14px"
|
|
<!--<ComboBox Grid.Column="1" x:Name="cmbFlowRate" Height="26" FontSize="14px"
|
|
IsEditable="True" PreviewTextInput="TextBox_PreviewTextInput"
|
|
IsEditable="True" PreviewTextInput="TextBox_PreviewTextInput"
|
|
@@ -407,11 +422,11 @@
|
|
<Grid.ColumnDefinitions>
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="90" />
|
|
<ColumnDefinition Width="90" />
|
|
<ColumnDefinition Width="*" />
|
|
<ColumnDefinition Width="*" />
|
|
- <ColumnDefinition Width="40" />
|
|
|
|
|
|
+ <ColumnDefinition Width="30" />
|
|
<ColumnDefinition Width="80" />
|
|
<ColumnDefinition Width="80" />
|
|
</Grid.ColumnDefinitions>
|
|
</Grid.ColumnDefinitions>
|
|
<!--<TextBlock Grid.Column="0" Text="采样周期" VerticalAlignment="Center" FontSize="14" TextWrapping="Wrap" />-->
|
|
<!--<TextBlock Grid.Column="0" Text="采样周期" VerticalAlignment="Center" FontSize="14" TextWrapping="Wrap" />-->
|
|
- <CheckBox x:Name="chkFirstHour" Grid.Column="0" Content="首采时间" VerticalAlignment="Center" FontSize="14" />
|
|
|
|
|
|
+ <CheckBox x:Name="chkFirstHour" Grid.Column="0" Content="首采时间" VerticalAlignment="Center" FontSize="14" VerticalContentAlignment="Center" />
|
|
<!--<TextBox Grid.Column="1" x:Name="txtFirstHour" Height="26" Padding="2" FontSize="14px" IsReadOnly="False" />-->
|
|
<!--<TextBox Grid.Column="1" x:Name="txtFirstHour" Height="26" Padding="2" FontSize="14px" IsReadOnly="False" />-->
|
|
<ComboBox Grid.Column="1" x:Name="cmbFirstHour" Height="26" FontSize="14px"
|
|
<ComboBox Grid.Column="1" x:Name="cmbFirstHour" Height="26" FontSize="14px"
|
|
IsTextSearchEnabled="False"
|
|
IsTextSearchEnabled="False"
|