|
@@ -19,14 +19,14 @@
|
|
<RowDefinition Height="Auto"></RowDefinition>
|
|
<RowDefinition Height="Auto"></RowDefinition>
|
|
<RowDefinition Height="Auto"></RowDefinition>
|
|
<RowDefinition Height="Auto"></RowDefinition>
|
|
</Grid.RowDefinitions>
|
|
</Grid.RowDefinitions>
|
|
- <Grid Grid.Row="0">
|
|
|
|
|
|
+ <Grid Grid.Row="0" Margin="10,0">
|
|
<StackPanel>
|
|
<StackPanel>
|
|
- <Label Margin="10,10,0,0" Content="请选择相邻两层模型,进行立管连接检查"></Label>
|
|
|
|
|
|
+ <Label Margin="0,10,0,0" Content="请选择相邻两层模型,进行立管连接检查"></Label>
|
|
<Grid>
|
|
<Grid>
|
|
<Grid.ColumnDefinitions>
|
|
<Grid.ColumnDefinitions>
|
|
- <ColumnDefinition Width="100"></ColumnDefinition>
|
|
|
|
|
|
+ <ColumnDefinition Width="25"></ColumnDefinition>
|
|
<ColumnDefinition Width="*"></ColumnDefinition>
|
|
<ColumnDefinition Width="*"></ColumnDefinition>
|
|
- <ColumnDefinition Width="100"></ColumnDefinition>
|
|
|
|
|
|
+ <ColumnDefinition Width="83"></ColumnDefinition>
|
|
</Grid.ColumnDefinitions>
|
|
</Grid.ColumnDefinitions>
|
|
<Grid.RowDefinitions>
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="10" ></RowDefinition>
|
|
<RowDefinition Height="10" ></RowDefinition>
|
|
@@ -36,56 +36,58 @@
|
|
</Grid.RowDefinitions>
|
|
</Grid.RowDefinitions>
|
|
<Image Grid.Row="1" Grid.Column="0"
|
|
<Image Grid.Row="1" Grid.Column="0"
|
|
Source="../Image/上一层.png"></Image>
|
|
Source="../Image/上一层.png"></Image>
|
|
- <TextBox Grid.Row="1" Grid.Column="1" Name="TxtUpPath" IsReadOnly="True"
|
|
|
|
|
|
+ <TextBox Grid.Row="1" Grid.Column="1" Name="TxtUpPath" IsReadOnly="True" Margin="0,0,6,0"
|
|
|
|
+ VerticalContentAlignment="Center"
|
|
Text="{Binding Path=UpFilePath,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"></TextBox>
|
|
Text="{Binding Path=UpFilePath,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"></TextBox>
|
|
<Button Grid.Row="1" Grid.Column="2" Click="BtnSelectFileUp_OnClick" Content="选择"
|
|
<Button Grid.Row="1" Grid.Column="2" Click="BtnSelectFileUp_OnClick" Content="选择"
|
|
- Margin="10,0,5,0"></Button>
|
|
|
|
|
|
+ ></Button>
|
|
<Image Grid.Row="3" Grid.Column="0"
|
|
<Image Grid.Row="3" Grid.Column="0"
|
|
Source="../Image/下一层.png"></Image>
|
|
Source="../Image/下一层.png"></Image>
|
|
- <TextBox Grid.Row="3" Grid.Column="1" Name="TxtDownPath" IsReadOnly="True"
|
|
|
|
|
|
+ <TextBox Grid.Row="3" Grid.Column="1" Name="TxtDownPath" IsReadOnly="True" Margin="0,0,6,0"
|
|
|
|
+ VerticalContentAlignment="Center"
|
|
Text="{Binding Path=DownFilePath,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"></TextBox>
|
|
Text="{Binding Path=DownFilePath,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"></TextBox>
|
|
<Button Grid.Row="3" Grid.Column="2" Click="BtnSelectFileDown_OnClick" Content="选择"
|
|
<Button Grid.Row="3" Grid.Column="2" Click="BtnSelectFileDown_OnClick" Content="选择"
|
|
- Margin="10,0,5,0"></Button>
|
|
|
|
|
|
+ ></Button>
|
|
</Grid>
|
|
</Grid>
|
|
</StackPanel>
|
|
</StackPanel>
|
|
</Grid>
|
|
</Grid>
|
|
- <Grid Grid.Row="1">
|
|
|
|
|
|
+ <Grid Grid.Row="1" Margin="10,0">
|
|
<!--虚线-->
|
|
<!--虚线-->
|
|
- <Line X1="10" Y1="15" X2="590" Y2="15" StrokeDashArray="3" Stroke="LightGray" StrokeThickness="2"></Line>
|
|
|
|
|
|
+ <Line X1="0" Y1="15" X2="590" Y2="15" StrokeDashArray="3" Stroke="LightGray" StrokeThickness="2"></Line>
|
|
</Grid>
|
|
</Grid>
|
|
- <Grid Grid.Row="2" >
|
|
|
|
|
|
+ <Grid Grid.Row="2">
|
|
<Grid.RowDefinitions>
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition></RowDefinition>
|
|
<RowDefinition></RowDefinition>
|
|
<RowDefinition></RowDefinition>
|
|
<RowDefinition></RowDefinition>
|
|
<RowDefinition></RowDefinition>
|
|
<RowDefinition></RowDefinition>
|
|
</Grid.RowDefinitions>
|
|
</Grid.RowDefinitions>
|
|
- <Grid Grid.Row="0" Visibility="{Binding Path=ModelCheckState,
|
|
|
|
|
|
+ <Grid
|
|
|
|
+ Grid.Row="0" Visibility="{Binding Path=ModelCheckState,
|
|
Converter={StaticResource ItemImageUnEqualVisibleConverter},
|
|
Converter={StaticResource ItemImageUnEqualVisibleConverter},
|
|
ConverterParameter={x:Static local:ModelCheckState.Prepare}}">
|
|
ConverterParameter={x:Static local:ModelCheckState.Prepare}}">
|
|
<Grid.RowDefinitions>
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="40"></RowDefinition>
|
|
<RowDefinition Height="40"></RowDefinition>
|
|
<RowDefinition Height="40"></RowDefinition>
|
|
<RowDefinition Height="40"></RowDefinition>
|
|
- <RowDefinition Height="60"></RowDefinition>
|
|
|
|
|
|
+ <RowDefinition Height="43"></RowDefinition>
|
|
</Grid.RowDefinitions>
|
|
</Grid.RowDefinitions>
|
|
- <Grid Grid.Row="0" Margin="5,8,0,2">
|
|
|
|
- <Label Margin="10,0,0,0" Content="检查结果储存位置:" VerticalAlignment="Center" Foreground="LightGray"></Label>
|
|
|
|
|
|
+ <Grid Grid.Row="0" Margin="10,0" >
|
|
|
|
+ <Label Content="检查结果储存位置:" VerticalAlignment="Center" Foreground="LightGray"></Label>
|
|
</Grid>
|
|
</Grid>
|
|
- <Grid Grid.Row="1" Margin="5,3,0,8">
|
|
|
|
|
|
+ <Grid Grid.Row="1" Margin="10,0" >
|
|
<Grid.ColumnDefinitions>
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="*"></ColumnDefinition>
|
|
<ColumnDefinition Width="*"></ColumnDefinition>
|
|
- <ColumnDefinition Width="100"></ColumnDefinition>
|
|
|
|
|
|
+ <ColumnDefinition Width="83"></ColumnDefinition>
|
|
</Grid.ColumnDefinitions>
|
|
</Grid.ColumnDefinitions>
|
|
- <TextBox Margin="10,0,0,0" VerticalContentAlignment="Center" Height="25" IsReadOnly="True"
|
|
|
|
|
|
+ <TextBox Margin="6,0,6,0" VerticalContentAlignment="Center" Height="25" IsReadOnly="True"
|
|
Name="txtPath"
|
|
Name="txtPath"
|
|
Text="{Binding Path=SaveDir,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"
|
|
Text="{Binding Path=SaveDir,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"
|
|
VerticalAlignment="Center"></TextBox>
|
|
VerticalAlignment="Center"></TextBox>
|
|
- <Button Grid.Column="1" Content="浏览" Height="25" Margin="10,0,5,0"
|
|
|
|
|
|
+ <Button Grid.Column="1" Content="浏览" Height="25"
|
|
Click="SelectDir_OnClick"></Button>
|
|
Click="SelectDir_OnClick"></Button>
|
|
</Grid>
|
|
</Grid>
|
|
- <Grid Grid.Row="2" Background="LightGray">
|
|
|
|
- <Button Width="100" Height="25" Background="Black" Foreground="White" Content="开始检查"
|
|
|
|
- HorizontalAlignment="Right"
|
|
|
|
- Margin="0,0,5,0" VerticalAlignment="Center"
|
|
|
|
|
|
+ <Grid Grid.Row="2" Background="#F0F0F0">
|
|
|
|
+ <Button Width="82" Height="23" Content="开始检查"
|
|
|
|
+ HorizontalAlignment="Right" Margin="0,10,10,10"
|
|
Command="{Binding Path=Commands.Execute}"
|
|
Command="{Binding Path=Commands.Execute}"
|
|
CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=Window,Mode=FindAncestor}}"
|
|
CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=Window,Mode=FindAncestor}}"
|
|
></Button>
|
|
></Button>
|
|
@@ -97,18 +99,18 @@
|
|
<Grid.RowDefinitions>
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="40"></RowDefinition>
|
|
<RowDefinition Height="40"></RowDefinition>
|
|
<RowDefinition Height="40"></RowDefinition>
|
|
<RowDefinition Height="40"></RowDefinition>
|
|
- <RowDefinition Height="60"></RowDefinition>
|
|
|
|
|
|
+ <RowDefinition Height="43"></RowDefinition>
|
|
</Grid.RowDefinitions>
|
|
</Grid.RowDefinitions>
|
|
- <Grid Grid.Row="0" Margin="5,8,0,2">
|
|
|
|
- <Label Margin="10,0,0,0" Content="检查中..." VerticalAlignment="Center" Foreground="LightGray"></Label>
|
|
|
|
|
|
+ <Grid Grid.Row="0" Margin="10,0">
|
|
|
|
+ <Label Content="检查中..." VerticalAlignment="Center" Foreground="LightGray"></Label>
|
|
</Grid>
|
|
</Grid>
|
|
- <Grid Grid.Row="1" Margin="15,0">
|
|
|
|
|
|
+ <Grid Grid.Row="1" Margin="10,0">
|
|
<Image Height="15" gif:AnimationBehavior.SourceUri="../Image/进度条.gif" />
|
|
<Image Height="15" gif:AnimationBehavior.SourceUri="../Image/进度条.gif" />
|
|
</Grid>
|
|
</Grid>
|
|
- <Grid Grid.Row="2" Background="LightGray">
|
|
|
|
- <Button Width="100" Height="25"
|
|
|
|
|
|
+ <Grid Grid.Row="2" Background="#F0F0F0">
|
|
|
|
+ <Button Width="82" Height="23"
|
|
Content="检查中..." IsEnabled="False"
|
|
Content="检查中..." IsEnabled="False"
|
|
- HorizontalAlignment="Right" Margin="0,0,5,0" VerticalAlignment="Center"
|
|
|
|
|
|
+ HorizontalAlignment="Right" Margin="0,10,10,10"
|
|
></Button>
|
|
></Button>
|
|
</Grid>
|
|
</Grid>
|
|
</Grid>
|
|
</Grid>
|
|
@@ -118,23 +120,26 @@
|
|
<Grid.RowDefinitions>
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="30"></RowDefinition>
|
|
<RowDefinition Height="30"></RowDefinition>
|
|
<RowDefinition Height="40"></RowDefinition>
|
|
<RowDefinition Height="40"></RowDefinition>
|
|
- <RowDefinition Height="60"></RowDefinition>
|
|
|
|
|
|
+ <RowDefinition Height="43"></RowDefinition>
|
|
</Grid.RowDefinitions>
|
|
</Grid.RowDefinitions>
|
|
- <Grid Grid.Row="0" Margin="5,0">
|
|
|
|
|
|
+ <Grid Grid.Row="0" Margin="10,0">
|
|
<Label Content="当前校验结果:" VerticalAlignment="Center" Foreground="LightGray"></Label>
|
|
<Label Content="当前校验结果:" VerticalAlignment="Center" Foreground="LightGray"></Label>
|
|
</Grid>
|
|
</Grid>
|
|
- <Grid Grid.Row="1" Margin="5,0">
|
|
|
|
- <TextBlock Margin="10,0" Height="30" Text="{Binding Path=SavePath}"
|
|
|
|
|
|
+ <Grid Grid.Row="1" Margin="10,0">
|
|
|
|
+ <TextBlock Text="{Binding Path=SavePath}"
|
|
VerticalAlignment="Center"></TextBlock>
|
|
VerticalAlignment="Center"></TextBlock>
|
|
</Grid>
|
|
</Grid>
|
|
- <Grid Grid.Row="2" Background="LightGray">
|
|
|
|
- <Button Width="120" Height="25" Background="White" Foreground="Black" Content="打开文件位置"
|
|
|
|
- HorizontalAlignment="Right" Margin="0,0,115,0" VerticalAlignment="Center"
|
|
|
|
|
|
+ <Grid Grid.Row="2" Background="#F0F0F0">
|
|
|
|
+ <WrapPanel HorizontalAlignment="Right">
|
|
|
|
+ <Button Width="83" Height="23" Content="打开文件位置"
|
|
|
|
+ HorizontalAlignment="Right" Margin="0,10,6,10" VerticalAlignment="Center"
|
|
Command="{Binding Path=Commands.OpenDir}"
|
|
Command="{Binding Path=Commands.OpenDir}"
|
|
></Button>
|
|
></Button>
|
|
- <Button Width="100" Height="25" Background="Black" Foreground="White" Content="继续检查"
|
|
|
|
- HorizontalAlignment="Right" Margin="0,0,5,0" VerticalAlignment="Center"
|
|
|
|
|
|
+ <Button Width="83" Height="23" Content="继续检查"
|
|
|
|
+ HorizontalAlignment="Right" Margin="0,10,10,10" VerticalAlignment="Center"
|
|
Command="{Binding Path=Commands.Execute}" ></Button>
|
|
Command="{Binding Path=Commands.Execute}" ></Button>
|
|
|
|
+ </WrapPanel>
|
|
|
|
+
|
|
</Grid>
|
|
</Grid>
|
|
</Grid>
|
|
</Grid>
|
|
</Grid>
|
|
</Grid>
|