|
|
@@ -301,7 +301,7 @@
|
|
|
Value="10" />
|
|
|
</Style>
|
|
|
</Grid.Resources>
|
|
|
- <!--相机1-->
|
|
|
+ <!--相机2-->
|
|
|
<Border Grid.Row="0"
|
|
|
Grid.Column="0"
|
|
|
HorizontalAlignment="Stretch"
|
|
|
@@ -325,7 +325,7 @@
|
|
|
</Grid.ColumnDefinitions>
|
|
|
<TextBlock Grid.Row="0"
|
|
|
Grid.ColumnSpan="3"
|
|
|
- Text="相机1轴控制"
|
|
|
+ Text="相机2轴控制"
|
|
|
FontWeight="Bold"
|
|
|
FontSize="14"
|
|
|
HorizontalAlignment="Center" />
|
|
|
@@ -335,8 +335,8 @@
|
|
|
Margin="10,0">
|
|
|
<TextBlock.Text>
|
|
|
<MultiBinding StringFormat="{}X: {0:F3} mm Y: {1:F3} mm">
|
|
|
- <Binding Path="Robot.Camera1CurrentPosition.X" />
|
|
|
- <Binding Path="Robot.Camera1CurrentPosition.Y" />
|
|
|
+ <Binding Path="Robot.Camera2CurrentPosition.X" />
|
|
|
+ <Binding Path="Robot.Camera2CurrentPosition.Y" />
|
|
|
</MultiBinding>
|
|
|
</TextBlock.Text>
|
|
|
</TextBlock>
|
|
|
@@ -346,12 +346,12 @@
|
|
|
HorizontalAlignment="Center">
|
|
|
<Button Content="{lex:Loc 上使能}"
|
|
|
Command="{Binding CameraAxisModerOnCommand}"
|
|
|
- CommandParameter="1"
|
|
|
+ CommandParameter="2"
|
|
|
Margin="2,0" />
|
|
|
<Button Content="{lex:Loc 下使能}"
|
|
|
Margin="2,0"
|
|
|
Command="{Binding CameraAxisModerOffCommand}"
|
|
|
- CommandParameter="1" />
|
|
|
+ CommandParameter="2" />
|
|
|
</StackPanel>
|
|
|
<Button Grid.Row="4"
|
|
|
Grid.Column="0"
|
|
|
@@ -361,7 +361,7 @@
|
|
|
Height="30"
|
|
|
Content="{materialDesign:PackIcon ArrowLeftBold}"
|
|
|
Command="{Binding CameraAxisJogCommand}"
|
|
|
- CommandParameter="1,X-" />
|
|
|
+ CommandParameter="2,X-" />
|
|
|
<Button Grid.Row="4"
|
|
|
Grid.Column="2"
|
|
|
MinHeight="30"
|
|
|
@@ -370,7 +370,7 @@
|
|
|
Height="30"
|
|
|
Content="{materialDesign:PackIcon ArrowRightBold}"
|
|
|
Command="{Binding CameraAxisJogCommand}"
|
|
|
- CommandParameter="1,X+" />
|
|
|
+ CommandParameter="2,X+" />
|
|
|
<Button Grid.Row="3"
|
|
|
Grid.Column="1"
|
|
|
MinHeight="30"
|
|
|
@@ -379,7 +379,7 @@
|
|
|
Height="30"
|
|
|
Content="{materialDesign:PackIcon ArrowTopBold}"
|
|
|
Command="{Binding CameraAxisJogCommand}"
|
|
|
- CommandParameter="1,Y+" />
|
|
|
+ CommandParameter="2,Y+" />
|
|
|
<Button Grid.Row="5"
|
|
|
Grid.Column="1"
|
|
|
MinHeight="30"
|
|
|
@@ -388,10 +388,10 @@
|
|
|
Height="30"
|
|
|
Content="{materialDesign:PackIcon ArrowBottomBold}"
|
|
|
Command="{Binding CameraAxisJogCommand}"
|
|
|
- CommandParameter="1,Y-" />
|
|
|
+ CommandParameter="2,Y-" />
|
|
|
</Grid>
|
|
|
</Border>
|
|
|
- <!--相机2-->
|
|
|
+ <!--相机4-->
|
|
|
<Border Grid.Row="0"
|
|
|
Grid.Column="1"
|
|
|
HorizontalAlignment="Stretch"
|
|
|
@@ -415,7 +415,7 @@
|
|
|
</Grid.ColumnDefinitions>
|
|
|
<TextBlock Grid.Row="0"
|
|
|
Grid.ColumnSpan="3"
|
|
|
- Text="相机2轴控制"
|
|
|
+ Text="相机4轴控制"
|
|
|
FontWeight="Bold"
|
|
|
FontSize="14"
|
|
|
HorizontalAlignment="Center" />
|
|
|
@@ -425,8 +425,8 @@
|
|
|
Margin="10,0">
|
|
|
<TextBlock.Text>
|
|
|
<MultiBinding StringFormat="{}X: {0:F3} mm Y: {1:F3} mm">
|
|
|
- <Binding Path="Robot.Camera2CurrentPosition.X" />
|
|
|
- <Binding Path="Robot.Camera2CurrentPosition.Y" />
|
|
|
+ <Binding Path="Robot.Camera4CurrentPosition.X" />
|
|
|
+ <Binding Path="Robot.Camera4CurrentPosition.Y" />
|
|
|
</MultiBinding>
|
|
|
</TextBlock.Text>
|
|
|
</TextBlock>
|
|
|
@@ -436,11 +436,11 @@
|
|
|
HorizontalAlignment="Center">
|
|
|
<Button Content="{lex:Loc 上使能}"
|
|
|
Command="{Binding CameraAxisModerOnCommand}"
|
|
|
- CommandParameter="2"
|
|
|
+ CommandParameter="4"
|
|
|
Margin="2,0" />
|
|
|
<Button Content="{lex:Loc 下使能}"
|
|
|
Command="{Binding CameraAxisModerOffCommand}"
|
|
|
- CommandParameter="2"
|
|
|
+ CommandParameter="4"
|
|
|
Margin="2,0" />
|
|
|
</StackPanel>
|
|
|
<Button Grid.Row="4"
|
|
|
@@ -451,7 +451,7 @@
|
|
|
Height="30"
|
|
|
Content="{materialDesign:PackIcon ArrowLeftBold}"
|
|
|
Command="{Binding CameraAxisJogCommand}"
|
|
|
- CommandParameter="2,X-" />
|
|
|
+ CommandParameter="4,X-" />
|
|
|
<Button Grid.Row="4"
|
|
|
Grid.Column="2"
|
|
|
MinHeight="30"
|
|
|
@@ -460,7 +460,7 @@
|
|
|
Height="30"
|
|
|
Content="{materialDesign:PackIcon ArrowRightBold}"
|
|
|
Command="{Binding CameraAxisJogCommand}"
|
|
|
- CommandParameter="2,X+" />
|
|
|
+ CommandParameter="4,X+" />
|
|
|
<Button Grid.Row="3"
|
|
|
Grid.Column="1"
|
|
|
MinHeight="30"
|
|
|
@@ -469,7 +469,7 @@
|
|
|
Height="30"
|
|
|
Content="{materialDesign:PackIcon ArrowTopBold}"
|
|
|
Command="{Binding CameraAxisJogCommand}"
|
|
|
- CommandParameter="2,Y+" />
|
|
|
+ CommandParameter="4,Y+" />
|
|
|
<Button Grid.Row="5"
|
|
|
Grid.Column="1"
|
|
|
MinHeight="30"
|
|
|
@@ -478,10 +478,10 @@
|
|
|
Height="30"
|
|
|
Content="{materialDesign:PackIcon ArrowBottomBold}"
|
|
|
Command="{Binding CameraAxisJogCommand}"
|
|
|
- CommandParameter="2,Y-" />
|
|
|
+ CommandParameter="4,Y-" />
|
|
|
</Grid>
|
|
|
</Border>
|
|
|
- <!--相机3-->
|
|
|
+ <!--相机1-->
|
|
|
<Border Grid.Row="1"
|
|
|
Grid.Column="0"
|
|
|
HorizontalAlignment="Stretch"
|
|
|
@@ -505,7 +505,7 @@
|
|
|
</Grid.ColumnDefinitions>
|
|
|
<TextBlock Grid.Row="0"
|
|
|
Grid.ColumnSpan="3"
|
|
|
- Text="相机3轴控制"
|
|
|
+ Text="相机1轴控制"
|
|
|
FontWeight="Bold"
|
|
|
FontSize="14"
|
|
|
HorizontalAlignment="Center" />
|
|
|
@@ -515,8 +515,8 @@
|
|
|
Margin="10,0">
|
|
|
<TextBlock.Text>
|
|
|
<MultiBinding StringFormat="{}X: {0:F3} mm Y: {1:F3} mm">
|
|
|
- <Binding Path="Robot.Camera3CurrentPosition.X" />
|
|
|
- <Binding Path="Robot.Camera3CurrentPosition.Y" />
|
|
|
+ <Binding Path="Robot.Camera1CurrentPosition.X" />
|
|
|
+ <Binding Path="Robot.Camera1CurrentPosition.Y" />
|
|
|
</MultiBinding>
|
|
|
</TextBlock.Text>
|
|
|
</TextBlock>
|
|
|
@@ -526,11 +526,11 @@
|
|
|
HorizontalAlignment="Center">
|
|
|
<Button Content="{lex:Loc 上使能}"
|
|
|
Command="{Binding CameraAxisModerOnCommand}"
|
|
|
- CommandParameter="3"
|
|
|
+ CommandParameter="1"
|
|
|
Margin="2,0" />
|
|
|
<Button Content="{lex:Loc 下使能}"
|
|
|
Command="{Binding CameraAxisModerOffCommand}"
|
|
|
- CommandParameter="3"
|
|
|
+ CommandParameter="1"
|
|
|
Margin="2,0" />
|
|
|
</StackPanel>
|
|
|
<Button Grid.Row="4"
|
|
|
@@ -541,7 +541,7 @@
|
|
|
Height="30"
|
|
|
Content="{materialDesign:PackIcon ArrowLeftBold}"
|
|
|
Command="{Binding CameraAxisJogCommand}"
|
|
|
- CommandParameter="3,X-" />
|
|
|
+ CommandParameter="1,X-" />
|
|
|
<Button Grid.Row="4"
|
|
|
Grid.Column="2"
|
|
|
MinHeight="30"
|
|
|
@@ -550,10 +550,10 @@
|
|
|
Height="30"
|
|
|
Content="{materialDesign:PackIcon ArrowRightBold}"
|
|
|
Command="{Binding CameraAxisJogCommand}"
|
|
|
- CommandParameter="3,X+" />
|
|
|
+ CommandParameter="1,X+" />
|
|
|
</Grid>
|
|
|
</Border>
|
|
|
- <!--相机4-->
|
|
|
+ <!--相机3-->
|
|
|
<Border Grid.Row="1"
|
|
|
Grid.Column="1"
|
|
|
HorizontalAlignment="Stretch"
|
|
|
@@ -577,7 +577,7 @@
|
|
|
</Grid.ColumnDefinitions>
|
|
|
<TextBlock Grid.Row="0"
|
|
|
Grid.ColumnSpan="3"
|
|
|
- Text="相机4轴控制"
|
|
|
+ Text="相机3轴控制"
|
|
|
FontWeight="Bold"
|
|
|
FontSize="14"
|
|
|
HorizontalAlignment="Center" />
|
|
|
@@ -587,8 +587,8 @@
|
|
|
Margin="10,0">
|
|
|
<TextBlock.Text>
|
|
|
<MultiBinding StringFormat="{}X: {0:F3} mm Y: {1:F3} mm">
|
|
|
- <Binding Path="Robot.Camera4CurrentPosition.X" />
|
|
|
- <Binding Path="Robot.Camera4CurrentPosition.Y" />
|
|
|
+ <Binding Path="Robot.Camera3CurrentPosition.X" />
|
|
|
+ <Binding Path="Robot.Camera3CurrentPosition.Y" />
|
|
|
</MultiBinding>
|
|
|
</TextBlock.Text>
|
|
|
</TextBlock>
|
|
|
@@ -598,11 +598,11 @@
|
|
|
HorizontalAlignment="Center">
|
|
|
<Button Content="{lex:Loc 上使能}"
|
|
|
Command="{Binding CameraAxisModerOnCommand}"
|
|
|
- CommandParameter="4"
|
|
|
+ CommandParameter="3"
|
|
|
Margin="2,0" />
|
|
|
<Button Content="{lex:Loc 下使能}"
|
|
|
Command="{Binding CameraAxisModerOffCommand}"
|
|
|
- CommandParameter="4"
|
|
|
+ CommandParameter="3"
|
|
|
Margin="2,0" />
|
|
|
</StackPanel>
|
|
|
<Button Grid.Row="4"
|
|
|
@@ -613,7 +613,7 @@
|
|
|
Height="30"
|
|
|
Content="{materialDesign:PackIcon ArrowLeftBold}"
|
|
|
Command="{Binding CameraAxisJogCommand}"
|
|
|
- CommandParameter="4,X-" />
|
|
|
+ CommandParameter="3,X-" />
|
|
|
<Button Grid.Row="4"
|
|
|
Grid.Column="2"
|
|
|
MinHeight="30"
|
|
|
@@ -622,7 +622,7 @@
|
|
|
Height="30"
|
|
|
Content="{materialDesign:PackIcon ArrowRightBold}"
|
|
|
Command="{Binding CameraAxisJogCommand}"
|
|
|
- CommandParameter="4,X+" />
|
|
|
+ CommandParameter="3,X+" />
|
|
|
</Grid>
|
|
|
</Border>
|
|
|
</Grid>
|