Lots of work !!

1 files changed, 79 insertions, 86 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
index 53fcafb8f..6d4f3aefd 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
@@ -206,7 +206,7 @@
                         </ListBox>
                     </StackPanel>
 
-                    <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Margin="0 0 255 10" VerticalAlignment="Bottom">
+                    <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Margin="0 0 335 10" VerticalAlignment="Bottom">
                         <ListBox x:Name="listMode" SelectedIndex="0" Style="{StaticResource MaterialDesignToolToggleListBox}">
                             <ListBoxItem Height="40" Width="60" HorizontalContentAlignment="Center" ToolTip="Edit Mode">
                                 <materialDesign:PackIcon HorizontalAlignment="Center" Width="30" Height="30"  Kind="Pencil" />
@@ -216,24 +216,13 @@
                             </ListBoxItem>
                         </ListBox>
                     </StackPanel>
-
-                    <Border HorizontalAlignment="Right" Width="220" Margin="10 0 5 8" BorderBrush="Gainsboro" BorderThickness="1 0 1 1" Padding="5">
-                        <Grid>
-                            <StackPanel TextElement.FontSize="10" VerticalAlignment="Center" TextElement.Foreground="Gray">
-                                <TextBlock HorizontalAlignment="Center"><Run FontWeight="SemiBold" FontStyle="Italic">Version Name:</Run> <Run Text="{Binding MachineOperator.DeviceInformation.Name,FallbackValue='N/A'}"></Run></TextBlock>
-                                <TextBlock HorizontalAlignment="Center" Margin="0 2 0 0"><Run FontWeight="SemiBold" FontStyle="Italic">Version Number:</Run> <Run Text="{Binding MachineOperator.DeviceInformation.Version,FallbackValue='N/A'}"></Run></TextBlock>
-                                <TextBlock HorizontalAlignment="Center" Margin="0 2 0 0"><Run FontWeight="SemiBold" FontStyle="Italic">Build Date:</Run> <Run Text="{Binding MachineOperator.DeviceInformation.BuildDate,FallbackValue='N/A'}"></Run></TextBlock>
-                                <TextBlock HorizontalAlignment="Center" Margin="0 2 0 0"><Run FontWeight="SemiBold" FontStyle="Italic">Diagnostics Frame Size:</Run> <Run Text="{Binding CurrentDiagnosticsResponseSize,Converter={StaticResource NumberToFileSizeConverter},FallbackValue='N/A'}"></Run></TextBlock>
-                            </StackPanel>
-                        </Grid>
-                    </Border>
                 </Grid>
             </Grid>
 
             <Grid Grid.Row="1" Margin="5">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="220"/>
+                    <ColumnDefinition Width="300"/>
                 </Grid.ColumnDefinitions>
 
                 <Grid>
@@ -321,84 +310,88 @@
                 <Grid Grid.Column="1">
                     <DockPanel>
                         <TextBlock DockPanel.Dock="Top" Margin="0 -30 0 0" DataContext="{Binding ElementName=editor,Path=SelectedElement.HostedElement}" Text="{Binding TechName}" FontSize="16" FontWeight="Bold" FontStyle="Italic"></TextBlock>
-                        <GroupBox DockPanel.Dock="Top" Header="BOUNDS" Padding="5">
+
+                        <ScrollViewer VerticalScrollBarVisibility="Auto">
                             <StackPanel>
-                                <!--Position-->
-                                <UniformGrid Columns="2" Margin="0 5 0 0">
-                                    <StackPanel Margin="0 0 5 0">
-                                        <TextBlock>Left</TextBlock>
-                                        <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="0" Maximum="{Binding ElementName=editor,Path=EditorWidth}" Value="{Binding ElementName=editor,Path=SelectedElement.Left}"></mahapps:NumericUpDown>
-                                    </StackPanel>
-                                    <StackPanel Margin="5 0 0 0">
-                                        <TextBlock>Top</TextBlock>
-                                        <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="0" Maximum="{Binding ElementName=editor,Path=EditorHeight}" Value="{Binding ElementName=editor,Path=SelectedElement.Top}"></mahapps:NumericUpDown>
-                                    </StackPanel>
-                                </UniformGrid>
+                                <GroupBox DockPanel.Dock="Top" Header="BOUNDS" Padding="5">
+                                    <StackPanel>
+                                        <!--Position-->
+                                        <UniformGrid Columns="2" Margin="0 5 0 0">
+                                            <StackPanel Margin="0 0 5 0">
+                                                <TextBlock>Left</TextBlock>
+                                                <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="0" Maximum="{Binding ElementName=editor,Path=EditorWidth}" Value="{Binding ElementName=editor,Path=SelectedElement.Left}"></mahapps:NumericUpDown>
+                                            </StackPanel>
+                                            <StackPanel Margin="5 0 0 0">
+                                                <TextBlock>Top</TextBlock>
+                                                <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="0" Maximum="{Binding ElementName=editor,Path=EditorHeight}" Value="{Binding ElementName=editor,Path=SelectedElement.Top}"></mahapps:NumericUpDown>
+                                            </StackPanel>
+                                        </UniformGrid>
 
-                                <!--Size-->
-                                <UniformGrid Columns="2" Margin="0 20 0 0">
-                                    <StackPanel Margin="0 0 5 0">
-                                        <TextBlock>Width</TextBlock>
-                                        <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="10" Maximum="{Binding ElementName=editor,Path=EditorWidth}" Value="{Binding ElementName=editor,Path=SelectedElement.Width}"></mahapps:NumericUpDown>
-                                    </StackPanel>
-                                    <StackPanel Margin="5 0 0 0">
-                                        <TextBlock>Height</TextBlock>
-                                        <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="10" Maximum="{Binding ElementName=editor,Path=EditorHeight}" Value="{Binding ElementName=editor,Path=SelectedElement.Height}"></mahapps:NumericUpDown>
+                                        <!--Size-->
+                                        <UniformGrid Columns="2" Margin="0 20 0 0">
+                                            <StackPanel Margin="0 0 5 0">
+                                                <TextBlock>Width</TextBlock>
+                                                <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="10" Maximum="{Binding ElementName=editor,Path=EditorWidth}" Value="{Binding ElementName=editor,Path=SelectedElement.Width}"></mahapps:NumericUpDown>
+                                            </StackPanel>
+                                            <StackPanel Margin="5 0 0 0">
+                                                <TextBlock>Height</TextBlock>
+                                                <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="10" Maximum="{Binding ElementName=editor,Path=EditorHeight}" Value="{Binding ElementName=editor,Path=SelectedElement.Height}"></mahapps:NumericUpDown>
+                                            </StackPanel>
+                                        </UniformGrid>
+
+                                        <!--<Angle-->
+                                        <Grid Margin="0 20 0 0">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="22*"></ColumnDefinition>
+                                                <ColumnDefinition Width="20*"></ColumnDefinition>
+                                            </Grid.ColumnDefinitions>
+                                            <TextBlock VerticalAlignment="Center" Margin="0 0 10 0" HorizontalAlignment="Left">Angle</TextBlock>
+                                            <mahapps:NumericUpDown Grid.Column="1" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Maximum="360" Minimum="-360" HasDecimals="False" Margin="0 5 0 0" Value="{Binding ElementName=editor,Path=SelectedElement.Angle}"></mahapps:NumericUpDown>
+                                        </Grid>
                                     </StackPanel>
-                                </UniformGrid>
+                                </GroupBox>
+                                <ContentControl Margin="0 10 0 0" DataContext="{Binding ElementName=editor,Path=SelectedElement.HostedElement}" Content="{Binding ElementName=editor,Path=SelectedElement.HostedElement}">
+                                    <ContentControl.Resources>
+                                        <DataTemplate DataType="{x:Type sys:Nullable}">
 
-                                <!--<Angle-->
-                                <Grid Margin="0 20 0 0">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="22*"></ColumnDefinition>
-                                        <ColumnDefinition Width="20*"></ColumnDefinition>
-                                    </Grid.ColumnDefinitions>
-                                    <TextBlock VerticalAlignment="Center" Margin="0 0 10 0" HorizontalAlignment="Left">Angle</TextBlock>
-                                    <mahapps:NumericUpDown Grid.Column="1" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Maximum="360" Minimum="-360" HasDecimals="False" Margin="0 5 0 0" Value="{Binding ElementName=editor,Path=SelectedElement.Angle}"></mahapps:NumericUpDown>
-                                </Grid>
+                                        </DataTemplate>
+                                        <DataTemplate DataType="{x:Type items:ControllerItem}">
+                                            <templates:ControllerTemplate/>
+                                        </DataTemplate>
+                                        <DataTemplate DataType="{x:Type items:MonitorItem}">
+                                            <templates:MonitorTemplate/>
+                                        </DataTemplate>
+                                        <DataTemplate DataType="{x:Type items:DigitalInItem}">
+                                            <templates:DigitalInTemplate/>
+                                        </DataTemplate>
+                                        <DataTemplate DataType="{x:Type items:MotorGroupItem}">
+                                            <templates:MotorGroupTemplate/>
+                                        </DataTemplate>
+                                        <DataTemplate DataType="{x:Type items:ThreadMotionItem}">
+                                            <templates:ThreadMotionTemplate/>
+                                        </DataTemplate>
+                                        <DataTemplate DataType="{x:Type items:DigitalOutItem}">
+                                            <templates:DigitalOutTemplate/>
+                                        </DataTemplate>
+                                        <DataTemplate DataType="{x:Type items:DispenserItem}">
+                                            <templates:DispenserTemplate/>
+                                        </DataTemplate>
+                                        <DataTemplate DataType="{x:Type items:MotorItem}">
+                                            <templates:MotorTemplate/>
+                                        </DataTemplate>
+                                        <DataTemplate DataType="{x:Type items:MeterItem}">
+                                            <templates:MeterTemplate/>
+                                        </DataTemplate>
+                                        <DataTemplate DataType="{x:Type items:SingleGraphItem}">
+                                            <templates:SingleGraphTemplate/>
+                                        </DataTemplate>
+                                        <DataTemplate DataType="{x:Type items:MultiGraphItem}">
+                                            <templates:MultiGraphTemplate/>
+                                        </DataTemplate>
+                                    </ContentControl.Resources>
+                                </ContentControl>
                             </StackPanel>
-                        </GroupBox>
-
-                        <ContentControl Margin="0 10 0 0" DataContext="{Binding ElementName=editor,Path=SelectedElement.HostedElement}" Content="{Binding ElementName=editor,Path=SelectedElement.HostedElement}">
-                            <ContentControl.Resources>
-                                <DataTemplate DataType="{x:Type sys:Nullable}">
-
-                                </DataTemplate>
-                                <DataTemplate DataType="{x:Type items:ControllerItem}">
-                                    <templates:ControllerTemplate/>
-                                </DataTemplate>
-                                <DataTemplate DataType="{x:Type items:MonitorItem}">
-                                    <templates:MonitorTemplate/>
-                                </DataTemplate>
-                                <DataTemplate DataType="{x:Type items:DigitalInItem}">
-                                    <templates:DigitalInTemplate/>
-                                </DataTemplate>
-                                <DataTemplate DataType="{x:Type items:MotorGroupItem}">
-                                    <templates:MotorGroupTemplate/>
-                                </DataTemplate>
-                                <DataTemplate DataType="{x:Type items:ThreadMotionItem}">
-                                    <templates:ThreadMotionTemplate/>
-                                </DataTemplate>
-                                <DataTemplate DataType="{x:Type items:DigitalOutItem}">
-                                    <templates:DigitalOutTemplate/>
-                                </DataTemplate>
-                                <DataTemplate DataType="{x:Type items:DispenserItem}">
-                                    <templates:DispenserTemplate/>
-                                </DataTemplate>
-                                <DataTemplate DataType="{x:Type items:MotorItem}">
-                                    <templates:MotorTemplate/>
-                                </DataTemplate>
-                                <DataTemplate DataType="{x:Type items:MeterItem}">
-                                    <templates:MeterTemplate/>
-                                </DataTemplate>
-                                <DataTemplate DataType="{x:Type items:SingleGraphItem}">
-                                    <templates:SingleGraphTemplate/>
-                                </DataTemplate>
-                                <DataTemplate DataType="{x:Type items:MultiGraphItem}">
-                                    <templates:MultiGraphTemplate/>
-                                </DataTemplate>
-                            </ContentControl.Resources>
-                        </ContentControl>
+                        </ScrollViewer>
                     </DockPanel>
                 </Grid>
             </Grid>