update

TeamAAS-VM/Controls/RobotManual.xaml

@@ -154,7 +154,7 @@
                         Command="{Binding JogCommand}"
                         CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=Y+}">
                     <StackPanel Orientation="Vertical">
-                        <materialDesign:PackIcon Kind="ArrowBottomBold"
+                        <materialDesign:PackIcon Kind="ArrowTopBold"
                                                  Width="26"
                                                  Height="26" />
                         <TextBlock Text="+Y"

TeamAAS-VM/Views/DebugMod/RobotManualStep.xaml

@@ -103,102 +103,186 @@
                 <RowDefinition Height="auto" />
                 <RowDefinition Height="auto" />
             </Grid.RowDefinitions>
-            <Button Content="X-"
-                    Grid.Row="1"
+            <Button Grid.Row="1"
                     Grid.Column="0"
                     Margin="10,10,10,10"
                     materialDesign:ButtonAssist.CornerRadius="10"
                     Style="{StaticResource MaterialDesignRaisedDarkButton}"
                     Command="{Binding JogCommand}"
-                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=X-}" />
-            <Button Content="X+"
-                    Grid.Row="1"
+                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=X-}">
+                <StackPanel Orientation="Vertical">
+                    <materialDesign:PackIcon Kind="ArrowLeftBold"
+                                             Width="26"
+                                             Height="26" />
+                    <TextBlock Text="-X"
+                               HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+            <Button Grid.Row="1"
                     Grid.Column="2"
                     Margin="10,10,10,10"
                     materialDesign:ButtonAssist.CornerRadius="10"
                     Style="{StaticResource MaterialDesignRaisedDarkButton}"
                     Command="{Binding JogCommand}"
-                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=X+}" />
-            <Button Content="Y+"
-                    Grid.Row="0"
+                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=X+}">
+                <StackPanel Orientation="Vertical">
+                    <materialDesign:PackIcon Kind="ArrowRightBold"
+                                             Width="26"
+                                             Height="26" />
+                    <TextBlock Text="+X"
+                               HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+            <Button Grid.Row="0"
                     Grid.Column="1"
                     Margin="10,10,10,10"
                     materialDesign:ButtonAssist.CornerRadius="10"
                     Style="{StaticResource MaterialDesignRaisedDarkButton}"
                     Command="{Binding JogCommand}"
-                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=Y+}"/>
-            <Button Content="Y-"
-                    Grid.Row="2"
+                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=Y+}">
+                <StackPanel Orientation="Vertical">
+                    <materialDesign:PackIcon Kind="ArrowTopBold"
+                                             Width="26"
+                                             Height="26" />
+                    <TextBlock Text="+Y"
+                               HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+            <Button Grid.Row="2"
                     Grid.Column="1"
                     Margin="10,10,10,10"
                     materialDesign:ButtonAssist.CornerRadius="10"
                     Style="{StaticResource MaterialDesignRaisedDarkButton}"
                     Command="{Binding JogCommand}"
-                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=Y-}" />
-            <Button Content="Z+"
-                    Grid.Row="0"
+                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=Y-}">
+                <StackPanel Orientation="Vertical">
+                    <materialDesign:PackIcon Kind="ArrowBottomBold"
+                                             Width="26"
+                                             Height="26" />
+                    <TextBlock Text="-Y"
+                               HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+            <Button Grid.Row="0"
                     Grid.Column="3"
                     Margin="10,10,10,10"
                     materialDesign:ButtonAssist.CornerRadius="10"
                     Style="{StaticResource MaterialDesignRaisedDarkButton}"
                     Command="{Binding JogCommand}"
-                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=Z+}" />
-            <Button Content="Z-"
-                    Grid.Row="2"
+                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=Z+}">
+                <StackPanel Orientation="Vertical">
+                    <materialDesign:PackIcon Kind="ArrowTopBold"
+                                             Width="26"
+                                             Height="26" />
+                    <TextBlock Text="+Z"
+                               HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+            <Button Grid.Row="2"
                     Grid.Column="3"
                     Margin="10,10,10,10"
                     materialDesign:ButtonAssist.CornerRadius="10"
                     Style="{StaticResource MaterialDesignRaisedDarkButton}"
                     Command="{Binding JogCommand}"
-                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=Z-}"/>
-            <Button Content="U+"
-                    Grid.Row="0"
+                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=Z-}">
+                <StackPanel Orientation="Vertical">
+                    <materialDesign:PackIcon Kind="ArrowBottomBold"
+                                             Width="26"
+                                             Height="26" />
+                    <TextBlock Text="-Z"
+                               HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+            <Button Grid.Row="0"
                     Grid.Column="4"
                     Margin="10,10,10,10"
                     materialDesign:ButtonAssist.CornerRadius="10"
                     Style="{StaticResource MaterialDesignRaisedDarkButton}"
                     Command="{Binding JogCommand}"
-                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=U+}"/>
-            <Button Content="U-"
-                    Grid.Row="2"
+                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=U+}">
+                <StackPanel Orientation="Vertical">
+                    <materialDesign:PackIcon Kind="AxisZRotateCounterclockwise"
+                                             Width="26"
+                                             Height="26" />
+                    <TextBlock Text="+U"
+                               HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+            <Button Grid.Row="2"
                     Grid.Column="4"
                     Margin="10,10,10,10"
                     materialDesign:ButtonAssist.CornerRadius="10"
                     Style="{StaticResource MaterialDesignRaisedDarkButton}"
                     Command="{Binding JogCommand}"
-                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=U-}"/>
-            <Button Content="V+"
-                    Grid.Row="0"
+                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=U-}">
+                <StackPanel Orientation="Vertical">
+                    <materialDesign:PackIcon Kind="AxisZRotateClockwise"
+                                             Width="26"
+                                             Height="26" />
+                    <TextBlock Text="-U"
+                               HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+            <Button Grid.Row="0"
                     Grid.Column="5"
                     Margin="10,10,10,10"
                     materialDesign:ButtonAssist.CornerRadius="10"
                     Style="{StaticResource MaterialDesignRaisedDarkButton}"
                     Command="{Binding JogCommand}"
-                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=V+}"/>
-            <Button Content="V-"
-                    Grid.Row="2"
+                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=V+}">
+                <StackPanel Orientation="Vertical">
+                    <materialDesign:PackIcon Kind="AxisYRotateCounterclockwise"
+                                             Width="26"
+                                             Height="26" />
+                    <TextBlock Text="+V"
+                               HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+            <Button Grid.Row="2"
                     Grid.Column="5"
                     Margin="10,10,10,10"
                     materialDesign:ButtonAssist.CornerRadius="10"
                     Style="{StaticResource MaterialDesignRaisedDarkButton}"
                     Command="{Binding JogCommand}"
-                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=V-}"/>
-            <Button Content="W+"
-                    Grid.Row="0"
+                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=V-}">
+                <StackPanel Orientation="Vertical">
+                    <materialDesign:PackIcon Kind="AxisYRotateClockwise"
+                                             Width="26"
+                                             Height="26" />
+                    <TextBlock Text="-V"
+                               HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+            <Button Grid.Row="0"
                     Grid.Column="6"
                     Margin="10,10,10,10"
                     materialDesign:ButtonAssist.CornerRadius="10"
                     Style="{StaticResource MaterialDesignRaisedDarkButton}"
                     Command="{Binding JogCommand}"
-                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=W+}"/>
-            <Button Content="W-"
-                    Grid.Row="2"
+                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=W+}">
+                <StackPanel Orientation="Vertical">
+                    <materialDesign:PackIcon Kind="AxisXRotateCounterclockwise"
+                                             Width="26"
+                                             Height="26" />
+                    <TextBlock Text="+W"
+                               HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+            <Button Grid.Row="2"
                     Grid.Column="6"
                     Margin="10,10,10,10"
                     materialDesign:ButtonAssist.CornerRadius="10"
                     Style="{StaticResource MaterialDesignRaisedDarkButton}"
                     Command="{Binding JogCommand}"
-                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=W-}"/>
+                    CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=W-}">
+                <StackPanel Orientation="Vertical">
+                    <materialDesign:PackIcon Kind="AxisXRotateClockwise"
+                                             Width="26"
+                                             Height="26" />
+                    <TextBlock Text="-W"
+                               HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
             <StackPanel Grid.Row="3"
                         Grid.ColumnSpan="7"
                         Margin="50,10,0,0"

TeamAAS-VM/Views/Product/RobotPointParams.xaml

@@ -554,7 +554,7 @@
                                                         Command="{Binding DataContext.JogCommand,RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                                                         CommandParameter="{Binding ElementName=txtDistance,Path=Value,Converter={StaticResource JogConverter}, ConverterParameter=Y+}">
                                                     <StackPanel Orientation="Vertical">
-                                                        <materialDesign:PackIcon Kind="ArrowBottomBold"
+                                                        <materialDesign:PackIcon Kind="ArrowTopBold"
                                                                                  Width="26"
                                                                                  Height="26" />
                                                         <TextBlock Text="+Y"