diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-06-06 18:24:36 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-06-06 18:24:36 +0300 |
| commit | 0561aaa7f26f42c421fd653f2899c1f7a551efe5 (patch) | |
| tree | 51d413d13150bf82eec04fdf4c7a79f7799b5515 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician | |
| parent | 3c3b0df381cd864fc9bc5588d70b697f2c376849 (diff) | |
| parent | 755fe04412ec5ae662636863167cc43a5f5e238b (diff) | |
| download | Tango-0561aaa7f26f42c421fd653f2899c1f7a551efe5.tar.gz Tango-0561aaa7f26f42c421fd653f2899c1f7a551efe5.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician')
2 files changed, 12 insertions, 4 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs index d8369ea7b..381101c7e 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs @@ -224,7 +224,7 @@ namespace Tango.MachineStudio.Technician.ViewModels UploadHardwareConfigurationCommand = new RelayCommand(UploadHardwareConfiguration); SyncHardwareConfigurationCommand = new RelayCommand(SyncHardwareConfiguration); - ResetHardwareConfigurationCommand = new RelayCommand(ResetHardwareConfiguration); + ResetHardwareConfigurationCommand = new RelayCommand(() => ResetHardwareConfiguration()); } #endregion @@ -239,6 +239,11 @@ namespace Tango.MachineStudio.Technician.ViewModels private void ApplicationManager_ConnectedMachineChanged(object sender, IExternalBridgeClient machine) { MachineOperator = machine; + + if (MachineOperator != null) + { + ResetHardwareConfiguration(false); + } } /// <summary> @@ -1430,7 +1435,7 @@ namespace Tango.MachineStudio.Technician.ViewModels } } - private void ResetHardwareConfiguration() + private void ResetHardwareConfiguration(bool showMessage = true) { if (MachineOperator != null) { @@ -1486,7 +1491,10 @@ namespace Tango.MachineStudio.Technician.ViewModels } } - _notification.ShowInfo("Visual elements synced to hardware version " + hw.Name + ", " + hw.Version + "."); + if (showMessage) + { + _notification.ShowInfo("Visual elements synced to hardware version " + hw.Name + ", " + hw.Version + "."); + } } } 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 72d8da7ce..9843162de 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 @@ -161,7 +161,7 @@ <TextBlock VerticalAlignment="Center">RESET</TextBlock> </StackPanel> </Button> - <Button Height="Auto" Margin="0 0 10 0" FontSize="12" Command="{Binding SyncHardwareConfigurationCommand}" IsEnabled="{Binding ApplicationManager.IsMachineConnected}" ToolTip="Sync all visual elements to the current hardware configuration"> + <Button Height="Auto" Margin="0 0 10 0" FontSize="12" Command="{Binding SyncHardwareConfigurationCommand}" IsEnabled="{Binding ApplicationManager.IsMachineConnected}" ToolTip="Sync all visual elements to the current hardware configuration stored on the machine (last uploaded)"> <StackPanel Orientation="Horizontal"> <materialDesign:PackIcon Margin="0 0 0 0" Width="24" Height="24" Kind="ArrowDownBold"/> <TextBlock VerticalAlignment="Center">SYNC HW CONFIG</TextBlock> |