|
@@ -252,7 +252,8 @@
|
|
|
materialDesign:ButtonAssist.CornerRadius="5"
|
|
materialDesign:ButtonAssist.CornerRadius="5"
|
|
|
Command="{Binding ImportCadPointCommand}">
|
|
Command="{Binding ImportCadPointCommand}">
|
|
|
<Button.Style>
|
|
<Button.Style>
|
|
|
- <Style TargetType="Button" BasedOn="{StaticResource MaterialDesignRaisedDarkButton}">
|
|
|
|
|
|
|
+ <Style TargetType="Button"
|
|
|
|
|
+ BasedOn="{StaticResource MaterialDesignRaisedDarkButton}">
|
|
|
<Setter Property="Visibility"
|
|
<Setter Property="Visibility"
|
|
|
Value="Collapsed" />
|
|
Value="Collapsed" />
|
|
|
<Style.Triggers>
|
|
<Style.Triggers>
|
|
@@ -270,7 +271,7 @@
|
|
|
<Border BorderBrush="LightGray"
|
|
<Border BorderBrush="LightGray"
|
|
|
BorderThickness="1"
|
|
BorderThickness="1"
|
|
|
Height="1"
|
|
Height="1"
|
|
|
- DockPanel.Dock="Bottom" />
|
|
|
|
|
|
|
+ DockPanel.Dock="Bottom" />
|
|
|
|
|
|
|
|
<DockPanel>
|
|
<DockPanel>
|
|
|
<!--不同点位类型的操作面板-->
|
|
<!--不同点位类型的操作面板-->
|
|
@@ -400,47 +401,146 @@
|
|
|
VerticalScrollBarVisibility="Disabled">
|
|
VerticalScrollBarVisibility="Disabled">
|
|
|
<StackPanel Orientation="Vertical">
|
|
<StackPanel Orientation="Vertical">
|
|
|
<TextBlock Text="拍1锁多时,相机拍照位置对应的产品坐标系中位置" />
|
|
<TextBlock Text="拍1锁多时,相机拍照位置对应的产品坐标系中位置" />
|
|
|
- <StackPanel Orientation="Horizontal"
|
|
|
|
|
- HorizontalAlignment="Left">
|
|
|
|
|
-
|
|
|
|
|
- <TextBlock Text="拍照1:"
|
|
|
|
|
|
|
+ <Grid HorizontalAlignment="Left">
|
|
|
|
|
+ <Grid.ColumnDefinitions>
|
|
|
|
|
+ <ColumnDefinition Width="Auto" />
|
|
|
|
|
+ <ColumnDefinition Width="Auto" />
|
|
|
|
|
+ <ColumnDefinition Width="Auto" />
|
|
|
|
|
+ <ColumnDefinition Width="Auto" />
|
|
|
|
|
+ <ColumnDefinition Width="Auto" />
|
|
|
|
|
+ <ColumnDefinition Width="Auto" />
|
|
|
|
|
+ <ColumnDefinition Width="Auto" />
|
|
|
|
|
+ <ColumnDefinition Width="Auto" />
|
|
|
|
|
+ </Grid.ColumnDefinitions>
|
|
|
|
|
+ <Grid.RowDefinitions>
|
|
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
|
|
+ </Grid.RowDefinitions>
|
|
|
|
|
+ <!--拍照1-->
|
|
|
|
|
+ <TextBlock Grid.Row="0"
|
|
|
|
|
+ Grid.Column="0"
|
|
|
|
|
+ Text="拍照1:"
|
|
|
VerticalAlignment="Center" />
|
|
VerticalAlignment="Center" />
|
|
|
-
|
|
|
|
|
- <TextBlock Margin="5,0,0,0"
|
|
|
|
|
|
|
+
|
|
|
|
|
+ <TextBlock Grid.Row="0"
|
|
|
|
|
+ Grid.Column="1"
|
|
|
|
|
+ Margin="5,0,0,0"
|
|
|
VerticalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
|
Text="X:" />
|
|
Text="X:" />
|
|
|
- <TextBox MinWidth="60"
|
|
|
|
|
- Text="{Binding SelectProduct.ScrewCameraLocalPos1.X_Position, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
|
|
|
|
- <TextBlock Margin="5,0,0,0"
|
|
|
|
|
|
|
+ <mah:NumericUpDown Grid.Row="0"
|
|
|
|
|
+ Grid.Column="2"
|
|
|
|
|
+ Value="{Binding SelectProduct.ScrewCameraLocalPos1.X_Position, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
|
|
+ Minimum="-9999.000"
|
|
|
|
|
+ Maximum="9999.000"
|
|
|
|
|
+ Interval="0.1"
|
|
|
|
|
+ StringFormat="F3"
|
|
|
|
|
+ MinWidth="60"
|
|
|
|
|
+ HorizontalAlignment="Stretch"
|
|
|
|
|
+ VerticalAlignment="Center"
|
|
|
|
|
+ Margin="0"
|
|
|
|
|
+ Padding="2" />
|
|
|
|
|
+ <TextBlock Grid.Row="0"
|
|
|
|
|
+ Grid.Column="3"
|
|
|
|
|
+ Margin="5,0,0,0"
|
|
|
VerticalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
|
Text="Y:" />
|
|
Text="Y:" />
|
|
|
- <TextBox MinWidth="60"
|
|
|
|
|
- Text="{Binding SelectProduct.ScrewCameraLocalPos1.Y_Position, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
|
|
|
|
- </StackPanel>
|
|
|
|
|
- <StackPanel Orientation="Horizontal"
|
|
|
|
|
- HorizontalAlignment="Left">
|
|
|
|
|
-
|
|
|
|
|
- <TextBlock Text="拍照2:"
|
|
|
|
|
|
|
+ <mah:NumericUpDown Grid.Row="0"
|
|
|
|
|
+ Grid.Column="4"
|
|
|
|
|
+ Value="{Binding SelectProduct.ScrewCameraLocalPos1.Y_Position, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
|
|
+ Minimum="-9999.000"
|
|
|
|
|
+ Maximum="9999.000"
|
|
|
|
|
+ Interval="0.1"
|
|
|
|
|
+ StringFormat="F3"
|
|
|
|
|
+ MinWidth="60"
|
|
|
|
|
+ HorizontalAlignment="Stretch"
|
|
|
|
|
+ VerticalAlignment="Center"
|
|
|
|
|
+ Margin="0"
|
|
|
|
|
+ Padding="2" />
|
|
|
|
|
+ <TextBlock Grid.Row="0"
|
|
|
|
|
+ Grid.Column="5"
|
|
|
|
|
+ Margin="5,0,0,0"
|
|
|
|
|
+ VerticalAlignment="Center"
|
|
|
|
|
+ Text="Z:" />
|
|
|
|
|
+ <mah:NumericUpDown Grid.Row="0"
|
|
|
|
|
+ Grid.Column="6"
|
|
|
|
|
+ Value="{Binding SelectProduct.ScrewCameraLocalPos1.Z_Position_Start, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
|
|
+ Minimum="-9999.000"
|
|
|
|
|
+ Maximum="9999.000"
|
|
|
|
|
+ Interval="0.1"
|
|
|
|
|
+ StringFormat="F3"
|
|
|
|
|
+ MinWidth="60"
|
|
|
|
|
+ HorizontalAlignment="Stretch"
|
|
|
|
|
+ VerticalAlignment="Center"
|
|
|
|
|
+ Margin="0"
|
|
|
|
|
+ Padding="2" />
|
|
|
|
|
+ <!--拍照2-->
|
|
|
|
|
+ <TextBlock Grid.Row="1"
|
|
|
|
|
+ Grid.Column="0"
|
|
|
|
|
+ Text="拍照2:"
|
|
|
VerticalAlignment="Center" />
|
|
VerticalAlignment="Center" />
|
|
|
|
|
|
|
|
- <TextBlock Margin="5,0,0,0"
|
|
|
|
|
|
|
+ <TextBlock Grid.Row="1"
|
|
|
|
|
+ Grid.Column="1"
|
|
|
|
|
+ Margin="5,0,0,0"
|
|
|
VerticalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
|
Text="X:" />
|
|
Text="X:" />
|
|
|
- <TextBox MinWidth="60"
|
|
|
|
|
- Text="{Binding SelectProduct.ScrewCameraLocalPos2.X_Position, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
|
|
|
|
- <TextBlock Margin="5,0,0,0"
|
|
|
|
|
|
|
+ <mah:NumericUpDown Grid.Row="1"
|
|
|
|
|
+ Grid.Column="2"
|
|
|
|
|
+ Value="{Binding SelectProduct.ScrewCameraLocalPos2.X_Position, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
|
|
+ Minimum="-9999.000"
|
|
|
|
|
+ Maximum="9999.000"
|
|
|
|
|
+ Interval="0.1"
|
|
|
|
|
+ StringFormat="F3"
|
|
|
|
|
+ MinWidth="60"
|
|
|
|
|
+ HorizontalAlignment="Stretch"
|
|
|
|
|
+ VerticalAlignment="Center"
|
|
|
|
|
+ Margin="0"
|
|
|
|
|
+ Padding="2" />
|
|
|
|
|
+ <TextBlock Grid.Row="1"
|
|
|
|
|
+ Grid.Column="3"
|
|
|
|
|
+ Margin="5,0,0,0"
|
|
|
VerticalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
|
Text="Y:" />
|
|
Text="Y:" />
|
|
|
- <TextBox MinWidth="60"
|
|
|
|
|
- Text="{Binding SelectProduct.ScrewCameraLocalPos2.Y_Position, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
|
|
|
|
- </StackPanel>
|
|
|
|
|
- <!--通过CAD导入点位按钮-->
|
|
|
|
|
- <Button Content="通过CAD导入点位"
|
|
|
|
|
- Margin="0,5,0,0"
|
|
|
|
|
- MinWidth="100"
|
|
|
|
|
- HorizontalAlignment="Left"
|
|
|
|
|
- materialDesign:ButtonAssist.CornerRadius="5"
|
|
|
|
|
- Command="{Binding ImportCadLockCameraPointCommand}" />
|
|
|
|
|
|
|
+ <mah:NumericUpDown Grid.Row="1"
|
|
|
|
|
+ Grid.Column="4"
|
|
|
|
|
+ Value="{Binding SelectProduct.ScrewCameraLocalPos2.Y_Position, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
|
|
+ Minimum="-9999.000"
|
|
|
|
|
+ Maximum="9999.000"
|
|
|
|
|
+ Interval="0.1"
|
|
|
|
|
+ StringFormat="F3"
|
|
|
|
|
+ MinWidth="60"
|
|
|
|
|
+ HorizontalAlignment="Stretch"
|
|
|
|
|
+ VerticalAlignment="Center"
|
|
|
|
|
+ Margin="0"
|
|
|
|
|
+ Padding="2" />
|
|
|
|
|
+ <TextBlock Grid.Row="1"
|
|
|
|
|
+ Grid.Column="5"
|
|
|
|
|
+ Margin="5,0,0,0"
|
|
|
|
|
+ VerticalAlignment="Center"
|
|
|
|
|
+ Text="Z:" />
|
|
|
|
|
+ <mah:NumericUpDown Grid.Row="1"
|
|
|
|
|
+ Grid.Column="6"
|
|
|
|
|
+ Value="{Binding SelectProduct.ScrewCameraLocalPos2.Z_Position_Start, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
|
|
|
|
+ Minimum="-9999.000"
|
|
|
|
|
+ Maximum="9999.000"
|
|
|
|
|
+ Interval="0.1"
|
|
|
|
|
+ StringFormat="F3"
|
|
|
|
|
+ MinWidth="60"
|
|
|
|
|
+ HorizontalAlignment="Stretch"
|
|
|
|
|
+ VerticalAlignment="Center"
|
|
|
|
|
+ Margin="0"
|
|
|
|
|
+ Padding="2" />
|
|
|
|
|
+ <!--通过CAD导入点位按钮-->
|
|
|
|
|
+ <Button Content="通过CAD导入点位"
|
|
|
|
|
+ Grid.Row="0"
|
|
|
|
|
+ Grid.Column="7"
|
|
|
|
|
+ Grid.RowSpan="2"
|
|
|
|
|
+ Margin="10,0"
|
|
|
|
|
+ MinWidth="100"
|
|
|
|
|
+ HorizontalAlignment="Left"
|
|
|
|
|
+ materialDesign:ButtonAssist.CornerRadius="5"
|
|
|
|
|
+ Command="{Binding ImportCadLockCameraPointCommand}" />
|
|
|
|
|
+ </Grid>
|
|
|
</StackPanel>
|
|
</StackPanel>
|
|
|
</ScrollViewer>
|
|
</ScrollViewer>
|
|
|
</StackPanel>
|
|
</StackPanel>
|
|
@@ -466,10 +566,11 @@
|
|
|
<ScrollViewer HorizontalScrollBarVisibility="Auto"
|
|
<ScrollViewer HorizontalScrollBarVisibility="Auto"
|
|
|
VerticalScrollBarVisibility="Disabled">
|
|
VerticalScrollBarVisibility="Disabled">
|
|
|
<StackPanel Orientation="Vertical">
|
|
<StackPanel Orientation="Vertical">
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
<StackPanel Orientation="Horizontal"
|
|
<StackPanel Orientation="Horizontal"
|
|
|
HorizontalAlignment="Left">
|
|
HorizontalAlignment="Left">
|
|
|
- <TextBlock Text="批量设置所有锁付点的起始Z轴高度:" VerticalAlignment="Center"/>
|
|
|
|
|
|
|
+ <TextBlock Text="批量设置所有锁付点的起始Z轴高度:"
|
|
|
|
|
+ VerticalAlignment="Center" />
|
|
|
<TextBlock Text="起始Z轴高度:"
|
|
<TextBlock Text="起始Z轴高度:"
|
|
|
Margin="5,0,0,0"
|
|
Margin="5,0,0,0"
|
|
|
VerticalAlignment="Center" />
|
|
VerticalAlignment="Center" />
|