diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-08-02 11:59:16 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-08-02 11:59:16 +0300 |
| commit | f4b51ad784cffc3493f32a9b4f1e9afc6fd2a43c (patch) | |
| tree | 1471983c9cfce00b4a0c6b26f6c3c0429405c904 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml | |
| parent | da3ed099835ff1dd9b21cdd590e252360df2312d (diff) | |
| parent | 66aa9beeec79e5f828fc13ce7a5e41c15227ec9a (diff) | |
| download | Tango-f4b51ad784cffc3493f32a9b4f1e9afc6fd2a43c.tar.gz Tango-f4b51ad784cffc3493f32a9b4f1e9afc6fd2a43c.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml index aa2b014fe..995ac4575 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml @@ -46,11 +46,17 @@ </Grid> <Grid Grid.Row="1" Margin="10 0 10 10"> + <Grid.RowDefinitions> - <RowDefinition Height="1*"/> - <RowDefinition Height="50"/> + <RowDefinition Height="1*"></RowDefinition> + <RowDefinition Height="Auto"></RowDefinition> </Grid.RowDefinitions> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="1*"></ColumnDefinition> + <ColumnDefinition Width="Auto"></ColumnDefinition> + </Grid.ColumnDefinitions> + <Grid d:DataContext="{d:DesignInstance Type=integ:MachineOperator, IsDesignTimeCreatable=False}"> <ContentControl Content="{Binding ApplicationManager.ConnectedMachine}"> <ContentControl.Resources> @@ -125,18 +131,31 @@ </ContentControl> </Grid> - <Grid Grid.Row="1"> + <Grid Grid.Row="1" Grid.ColumnSpan="2"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Height="40" VerticalAlignment="Bottom"> - <Button Height="Auto" Width="140" Command="{Binding ResetCommand}" Background="#FF5454" BorderBrush="#FF5454" Margin="0 0 10 0" ToolTip="Reset the embedded device">RESET</Button> - <Button Height="Auto" Command="{Binding UploadHardwareConfigurationCommand}" ToolTip="Upload the current hardware configuration stored for this machine"> - <StackPanel Orientation="Horizontal"> - <TextBlock VerticalAlignment="Center">UPLOAD HW CONFIG</TextBlock> - <materialDesign:PackIcon Margin="10 0 0 0" Width="16" Height="16" VerticalAlignment="Center" Kind="ArrowRightBold"/> - </StackPanel> - </Button> - <Button Height="Auto" Width="140" Command="{Binding DisconnectCommand}" Margin="10 0 0 0">DISCONNECT</Button> + + </StackPanel> + </Grid> + + <Grid Grid.Row="1" Grid.ColumnSpan="2"> + <StackPanel HorizontalAlignment="Right" Orientation="Horizontal"> + <Button DockPanel.Dock="Bottom" Height="40" Width="170" Command="{Binding UploadHardwareConfigurationCommand}" ToolTip="Upload the current hardware configuration stored for this machine">UPLOAD HW CONFIG</Button> + <Button DockPanel.Dock="Bottom" Height="40" Width="140" Command="{Binding DisconnectCommand}" Margin="10 0 0 0">DISCONNECT</Button> </StackPanel> </Grid> + + <Grid Grid.Column="1"> + <DockPanel> + <StackPanel> + <Button FontSize="11" Height="40" Width="140" Command="{Binding ResetCommand}" Background="Transparent" BorderBrush="#202020" Foreground="#202020" Margin="0 2" ToolTip="Reset the embedded device">RESET</Button> + <Button FontSize="11" Height="40" Width="140" Command="{Binding TurnOffHeatersCommand}" Background="Transparent" BorderBrush="#202020" Foreground="#202020" Margin="0 2" ToolTip="Resets the current process parameters in the embedded device"> + <TextBlock TextWrapping="Wrap" TextAlignment="Center"> + TURN OFF HEATERS + </TextBlock> + </Button> + </StackPanel> + </DockPanel> + </Grid> </Grid> </Grid> </Grid> |