#5831 RML extension- Color shade window

1 files changed, 21 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
index 1cc6e1dcc..47965deb4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
@@ -264,6 +264,14 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             set { _colorCalibrationViewVM = value; RaisePropertyChangedAuto(); }
         }
 
+        private ColorShadeViewVM _solorShadeViewVM;
+        public ColorShadeViewVM ColorShadeViewVM
+        {
+            get { return _solorShadeViewVM; }
+            set { _solorShadeViewVM = value; RaisePropertyChangedAuto(); }
+        }
+       
+
         protected MachineModel _selectedMachine;
         /// <summary>
         /// Gets or sets the selected machine.
@@ -1051,7 +1059,12 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                     ColorCalibrationViewVM.ActiveRML = ActiveRML;
                     ColorCalibrationViewVM.RMLGUID = ActiveRML.Guid;
                     ColorCalibrationViewVM.Machine = SelectedMachine;
-                  
+
+                    ColorShadeViewVM = new ColorShadeViewVM(_notification, _actionLogManager);
+                    ColorShadeViewVM.RMLExtentionGUID = guid;
+                    ColorShadeViewVM.RMLGUID = ActiveRML.Guid;
+                    ColorShadeViewVM.SelectedMachineGUID = SelectedMachine != null ? SelectedMachine.Guid : null; ;
+                    
                     if (ActiveRMLExtension.RMLStatus == RMLExtensionStatus.New)
                     {
                         ColorParametersVewVM.SaveColorParameters -= UpdateStatus;
@@ -1060,6 +1073,8 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                         TestResultsViewVM.SaveTestResults += UpdateStatus;
                         ColorCalibrationViewVM.SaveColorCalibration -= UpdateStatus;
                         ColorCalibrationViewVM.SaveColorCalibration += UpdateStatus;
+                        ColorShadeViewVM.SaveColorShadesEvent -= UpdateStatus;
+                        ColorShadeViewVM.SaveColorShadesEvent += UpdateStatus;
                     }
 
                     View.NavigateTo(RMLExtensionNavigationView.RMLExtentionView);
@@ -1123,6 +1138,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                 ColorParametersVewVM.SaveColorParameters -= UpdateStatus;
                 TestResultsViewVM.SaveTestResults -= UpdateStatus;
                 ColorCalibrationViewVM.SaveColorCalibration -= UpdateStatus;
+                ColorShadeViewVM.SaveColorShadesEvent -= UpdateStatus;
                 ActiveRMLExtension.RMLStatus = RMLExtensionStatus.InProgress;
                 ActiveRMLExtension.LastUpdated = DateTime.UtcNow;
 
@@ -1153,6 +1169,10 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             {
                 ColorCalibrationViewVM.Machine = SelectedMachine;
             }
+            if(ColorShadeViewVM != null)
+            {
+                ColorShadeViewVM.SelectedMachineGUID = SelectedMachine.Guid;
+            }
         }
 
         #endregion