From 09c1e15643f82b2187019025682b5da0bfbe1c1d Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 21 Nov 2019 09:20:44 +0200
Subject: Fixed issue with machine clone and device registration. Implemented
 device registration details and reset in Machine Designer.

---
 .../ViewModels/MainViewVM.cs                       |  21 +++
 .../Views/MachineSettingsView.xaml                 | 176 ++++++++++++---------
 .../Views/MachinesView.xaml                        |   4 +-
 3 files changed, 122 insertions(+), 79 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 5f2dcd00d..5fd086198 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -188,6 +188,12 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// Gets or sets the clone machine command.
         /// </summary>
         public RelayCommand CloneMachineCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the reset device registration command.
+        /// </summary>
+        public RelayCommand ResetDeviceRegistrationCommand { get; set; }
+
         #endregion
 
         #region Constructors
@@ -218,7 +224,9 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             AddSpoolCommand = new RelayCommand(AddNewSpool);
             RemoveSpoolCommand = new RelayCommand(RemoveSpool, () => SelectedSpool != null);
             CloneMachineCommand = new RelayCommand(CloneMachine, () => SelectedMachine != null);
+            ResetDeviceRegistrationCommand = new RelayCommand(ResetDeviceRegistration);
         }
+
         #endregion
 
         #region Application Ready
@@ -430,6 +438,9 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                             ActiveMachine = ActiveMachine.Clone();
                             ActiveMachine.Name = "";
                             ActiveMachine.SerialNumber = "";
+                            ActiveMachine.IsDeviceRegistered = false;
+                            ActiveMachine.DeviceId = null;
+                            ActiveMachine.DeviceName = null;
                             ActiveMachineAdapter.Context.Machines.Add(ActiveMachine);
                         }
                     }
@@ -690,6 +701,16 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             }
         }
 
+        private void ResetDeviceRegistration()
+        {
+            if (_notification.ShowQuestion("Are you sure you wish to reset this machine device registration?"))
+            {
+                ActiveMachine.IsDeviceRegistered = false;
+                ActiveMachine.DeviceId = null;
+                ActiveMachine.DeviceName = null;
+            }
+        }
+
         #endregion
 
         private void CloneMachine()
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
index 40ce9ea08..5e3f170dd 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
@@ -27,84 +27,104 @@
 
                 <local:MachineView DataContext="{Binding ActiveMachine}" IsHitTestVisible="False" />
 
-                <Border Grid.Column="1" Margin="100 70" CornerRadius="5" Background="{StaticResource TransparentBackgroundBrush600}" Padding="10" BorderBrush="{StaticResource borderBrush}" BorderThickness="1">
-                    <Grid TextElement.Foreground="{StaticResource GrayBrush280}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition/>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-                        <controls:TableGrid RowHeight="50" Margin="10">
-                            <TextBlock FontWeight="SemiBold">Serial Number</TextBlock>
-                            <TextBox Text="{Binding ActiveMachine.SerialNumber}"></TextBox>
-
-                            <TextBlock FontWeight="SemiBold">Name</TextBlock>
-                            <TextBox Text="{Binding ActiveMachine.Name}"></TextBox>
-
-                            <TextBlock FontWeight="SemiBold">Machine Version</TextBlock>
-                            <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
-
-                            <TextBlock FontWeight="SemiBold">Organization</TextBlock>
-                            <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Organizations}" SelectedItem="{Binding ActiveMachine.Organization}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
-
-                            <TextBlock FontWeight="SemiBold">Default RML</TextBlock>
-                            <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedItem="{Binding ActiveMachine.DefaultRml}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
-
-                            <TextBlock FontWeight="SemiBold">Loaded RML</TextBlock>
-                            <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedValue="{Binding ActiveMachine.LoadedRmlGuid}" SelectedValuePath="Guid" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
-
-                            <TextBlock FontWeight="SemiBold">Default Color Space</TextBlock>
-                            <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.ColorSpaces}" SelectedItem="{Binding ActiveMachine.DefaultColorSpace}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
-
-                            <TextBlock FontWeight="SemiBold">Default Segment Length</TextBlock>
-                            <mahapps:NumericUpDown HideUpDownButtons="True" BorderThickness="0 0 0 1" Background="Transparent" Minimum="0" Maximum="1000" Value="{Binding ActiveMachine.DefaultSegmentLength}" HasDecimals="False"></mahapps:NumericUpDown>
-
-                            <TextBlock FontWeight="SemiBold">Default Spool Type</TextBlock>
-                            <ComboBox  Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.SpoolTypes}" SelectedItem="{Binding ActiveMachine.DefaultSpoolType}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
-
-                            <TextBlock FontWeight="SemiBold">OS Key</TextBlock>
-                            <TextBox Text="{Binding ActiveMachine.OsKey}"></TextBox>
-
-                            <TextBlock FontWeight="SemiBold">Device COM Port</TextBlock>
-                            <TextBox Text="{Binding ActiveMachine.DeviceComPort}"></TextBox>
-                        </controls:TableGrid>
-                        <Rectangle Grid.Column="1" StrokeThickness="1" Stroke="{StaticResource borderBrush}" HorizontalAlignment="Center" Margin="50 50" />
-                        <controls:TableGrid RowHeight="50" Margin="10" Grid.Column="2">
-                            <TextBlock FontWeight="SemiBold">Auto Login</TextBlock>
-                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.AutoLogin}"></ToggleButton>
-
-                            <TextBlock FontWeight="SemiBold">Auto Check For Updates</TextBlock>
-                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.AutoCheckForUpdates}"></ToggleButton>
-
-                            <TextBlock FontWeight="SemiBold">Setup Activation</TextBlock>
-                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupActivation}"></ToggleButton>
-
-                            <TextBlock FontWeight="SemiBold">Setup Remote Assistance</TextBlock>
-                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupRemoteAssistance}"></ToggleButton>
-
-                            <TextBlock FontWeight="SemiBold">Setup UWF</TextBlock>
-                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupUwf}"></ToggleButton>
-
-                            <TextBlock FontWeight="SemiBold">Setup Firmware</TextBlock>
-                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupFirmware}"></ToggleButton>
-
-                            <TextBlock FontWeight="SemiBold">Setup FPGA</TextBlock>
-                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupFpga}"></ToggleButton>
-
-                            <TextBlock FontWeight="SemiBold">Is Demo Machine</TextBlock>
-                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.IsDemo}"></ToggleButton>
-
-                            <TextBlock FontWeight="SemiBold">Suspend Version Update</TextBlock>
-                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SuspendVersionUpdate}"></ToggleButton>
-
-                            <TextBlock FontWeight="SemiBold">Force Version Update</TextBlock>
-                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.ForceVersionUpdate}"></ToggleButton>
-
-                            <TextBlock FontWeight="SemiBold">Update Schema on Update</TextBlock>
-                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.PerformSchemaUpdateOnDataUpdate}"></ToggleButton>
-                        </controls:TableGrid>
-                    </Grid>
-                </Border>
+                <StackPanel Grid.Column="1" Margin="100 30">
+                    <Border CornerRadius="5" Background="{StaticResource TransparentBackgroundBrush600}" Padding="10" BorderBrush="{StaticResource borderBrush}" BorderThickness="1">
+                        <Grid TextElement.Foreground="{StaticResource GrayBrush280}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition/>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
+                            <controls:TableGrid RowHeight="50" Margin="10">
+                                <TextBlock FontWeight="SemiBold">Serial Number</TextBlock>
+                                <TextBox Text="{Binding ActiveMachine.SerialNumber}"></TextBox>
+
+                                <TextBlock FontWeight="SemiBold">Name</TextBlock>
+                                <TextBox Text="{Binding ActiveMachine.Name}"></TextBox>
+
+                                <TextBlock FontWeight="SemiBold">Machine Version</TextBlock>
+                                <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+
+                                <TextBlock FontWeight="SemiBold">Organization</TextBlock>
+                                <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Organizations}" SelectedItem="{Binding ActiveMachine.Organization}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+
+                                <TextBlock FontWeight="SemiBold">Default RML</TextBlock>
+                                <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedItem="{Binding ActiveMachine.DefaultRml}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+
+                                <TextBlock FontWeight="SemiBold">Loaded RML</TextBlock>
+                                <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedValue="{Binding ActiveMachine.LoadedRmlGuid}" SelectedValuePath="Guid" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+
+                                <TextBlock FontWeight="SemiBold">Default Color Space</TextBlock>
+                                <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.ColorSpaces}" SelectedItem="{Binding ActiveMachine.DefaultColorSpace}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+
+                                <TextBlock FontWeight="SemiBold">Default Segment Length</TextBlock>
+                                <mahapps:NumericUpDown HideUpDownButtons="True" BorderThickness="0 0 0 1" Background="Transparent" Minimum="0" Maximum="1000" Value="{Binding ActiveMachine.DefaultSegmentLength}" HasDecimals="False"></mahapps:NumericUpDown>
+
+                                <TextBlock FontWeight="SemiBold">Default Spool Type</TextBlock>
+                                <ComboBox  Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.SpoolTypes}" SelectedItem="{Binding ActiveMachine.DefaultSpoolType}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+
+                                <TextBlock FontWeight="SemiBold">OS Key</TextBlock>
+                                <TextBox Text="{Binding ActiveMachine.OsKey}"></TextBox>
+
+                                <TextBlock FontWeight="SemiBold">Device COM Port</TextBlock>
+                                <TextBox Text="{Binding ActiveMachine.DeviceComPort}"></TextBox>
+                            </controls:TableGrid>
+                            <Rectangle Grid.Column="1" StrokeThickness="1" Stroke="{StaticResource borderBrush}" HorizontalAlignment="Center" Margin="50 50" />
+                            <controls:TableGrid RowHeight="50" Margin="10" Grid.Column="2">
+                                <TextBlock FontWeight="SemiBold">Auto Login</TextBlock>
+                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.AutoLogin}"></ToggleButton>
+
+                                <TextBlock FontWeight="SemiBold">Auto Check For Updates</TextBlock>
+                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.AutoCheckForUpdates}"></ToggleButton>
+
+                                <TextBlock FontWeight="SemiBold">Setup Activation</TextBlock>
+                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupActivation}"></ToggleButton>
+
+                                <TextBlock FontWeight="SemiBold">Setup Remote Assistance</TextBlock>
+                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupRemoteAssistance}"></ToggleButton>
+
+                                <TextBlock FontWeight="SemiBold">Setup UWF</TextBlock>
+                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupUwf}"></ToggleButton>
+
+                                <TextBlock FontWeight="SemiBold">Setup Firmware</TextBlock>
+                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupFirmware}"></ToggleButton>
+
+                                <TextBlock FontWeight="SemiBold">Setup FPGA</TextBlock>
+                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupFpga}"></ToggleButton>
+
+                                <TextBlock FontWeight="SemiBold">Is Demo Machine</TextBlock>
+                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.IsDemo}"></ToggleButton>
+
+                                <TextBlock FontWeight="SemiBold">Suspend Version Update</TextBlock>
+                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SuspendVersionUpdate}"></ToggleButton>
+
+                                <TextBlock FontWeight="SemiBold">Force Version Update</TextBlock>
+                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.ForceVersionUpdate}"></ToggleButton>
+
+                                <TextBlock FontWeight="SemiBold">Update Schema on Update</TextBlock>
+                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.PerformSchemaUpdateOnDataUpdate}"></ToggleButton>
+                            </controls:TableGrid>
+                        </Grid>
+                    </Border>
+
+                    <Border Visibility="{Binding ActiveMachine.IsDeviceRegistered,Converter={StaticResource BoolToVisConverter}}" Margin="0 10 0 0" CornerRadius="5" Background="{StaticResource TransparentBackgroundBrush600}" Padding="20" BorderBrush="{StaticResource borderBrush}" BorderThickness="1">
+                        <DockPanel>
+                            <StackPanel DockPanel.Dock="Left">
+                                <TextBlock FontSize="16" FontWeight="SemiBold">Device Registration</TextBlock>
+                                <TextBlock Margin="0 10 0 0">
+                                <Run FontWeight="SemiBold">Device ID:</Run>
+                                <Run Text="{Binding ActiveMachine.DeviceId}"></Run>
+                                </TextBlock>
+                                <TextBlock Margin="0 5 0 0">
+                                <Run FontWeight="SemiBold">Device Name:</Run>
+                                <Run Text="{Binding ActiveMachine.DeviceName}"></Run>
+                                </TextBlock>
+                            </StackPanel>
+
+                            <Button Command="{Binding ResetDeviceRegistrationCommand}" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Padding="10" Height="Auto">RESET DEVICE REGISTRATION</Button>
+                        </DockPanel>
+                    </Border>
+                </StackPanel>
             </Grid>
         </DockPanel>
     </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
index 35b578b6a..a231e92a3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
@@ -15,6 +15,7 @@
              d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
     <UserControl.Resources>
         <converters:DateTimeUTCToShortDateTimeConverter x:Key="DateTimeUTCToShortDateTimeConverter" />
+        <converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter" />
     </UserControl.Resources>
 
     <Grid>
@@ -73,7 +74,8 @@
                         <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="Auto" />
                         <DataGridTextColumn Header="ORGANIZATION" Binding="{Binding Organization.Name}" Width="Auto" />
                         <DataGridTextColumn Header="VERSION" Binding="{Binding MachineVersion.Name}" Width="Auto" />
-                        <DataGridTextColumn Header="DEMO MACHINE" Binding="{Binding IsDemo}" Width="Auto" />
+                        <DataGridTextColumn Header="REGISTERED" Binding="{Binding IsDeviceRegistered,Converter={StaticResource BooleanToYesNoConverter}}" Width="Auto" />
+                        <DataGridTextColumn Header="DEMO MACHINE" Binding="{Binding IsDemo,Converter={StaticResource BooleanToYesNoConverter}}" Width="Auto" />
                         <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="1*" />
                     </DataGrid.Columns>
                 </controls:DoubleClickDataGrid>
-- 
cgit v1.3.1