#5821 RML extension - Color calibration window

1 files changed, 48 insertions, 25 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 4802e0af1..e8aafca9d 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
@@ -257,6 +257,13 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             set { _testResultsViewVM = value; RaisePropertyChangedAuto(); }
         }
 
+        private ColorCalibrationViewVM _colorCalibrationViewVM;
+        public ColorCalibrationViewVM ColorCalibrationViewVM
+        {
+            get { return _colorCalibrationViewVM; }
+            set { _colorCalibrationViewVM = value; RaisePropertyChangedAuto(); }
+        }
+
         protected MachineModel _selectedMachine;
         /// <summary>
         /// Gets or sets the selected machine.
@@ -294,20 +301,20 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
 
         }
 
-        private MachineTestResultsTabs PreviosSelectedTab { get; set; }
+        //private MachineTestResultsTabs PreviosSelectedTab { get; set; }
 
-        private MachineTestResultsTabs _selectedTab;
+        //private MachineTestResultsTabs _selectedTab;
 
-        public MachineTestResultsTabs SelectedTab
-        {
-            get { return _selectedTab; }
-            set {
-                PreviosSelectedTab = _selectedTab;
-                _selectedTab = value;
-                OnSelectedMachineTestResultsTabChanged();
-                RaisePropertyChangedAuto();
-            }
-        }
+        //public MachineTestResultsTabs SelectedTab
+        //{
+        //    get { return _selectedTab; }
+        //    set {
+        //        PreviosSelectedTab = _selectedTab;
+        //        _selectedTab = value;
+        //        OnSelectedMachineTestResultsTabChanged();
+        //        RaisePropertyChangedAuto();
+        //    }
+        //}
 
         #endregion
 
@@ -922,7 +929,8 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             {
                 Guid = x.Guid,
                 Name = x.Name,
-                SerialNumber = x.SerialNumber
+                SerialNumber = x.SerialNumber,
+                IdsPacks = x.Configuration.IdsPacks.Where(z => !z.IsEmpty)
             }).ToObservableCollection();
 
         }
@@ -994,9 +1002,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                                             .WithUser()
                                             .BuildAsync();
 
-                    ActiveRML = new RmlBuilder(_active_context)
-                        .Set(SelectedRMLExtension.RMLGuid)
-                        .Build();
+                    ActiveRML = new RmlBuilder(_active_context).Set(SelectedRMLExtension.RMLGuid).WithLiquidFactors().Build();
 
                     if (!String.IsNullOrEmpty(ActiveRML.Manufacturer) && false == Manufacturers.Any(x => x == ActiveRML.Manufacturer))
                     {
@@ -1040,12 +1046,23 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                     TestResultsViewVM.SelectedMachineGUID = SelectedMachine != null ? SelectedMachine.Guid : null;
                     TestResultsViewVM.ThreadName = ActiveRML.Manufacturer;
 
+                    ColorCalibrationViewVM = new ColorCalibrationViewVM(_notification, _actionLogManager);
+                    ColorCalibrationViewVM.RMLExtemtionGUID = guid;
+                    ColorCalibrationViewVM.ActiveRML = ActiveRML;
+                    ColorCalibrationViewVM.RMLGUID = ActiveRML.Guid;
+                    ColorCalibrationViewVM.Machine = SelectedMachine;
+                  
+
+
+
                     if (ActiveRMLExtension.RMLStatus == RMLExtensionStatus.New)
                     {
                         ColorParametersVewVM.SaveColorParameters -= UpdateStatus;
                         ColorParametersVewVM.SaveColorParameters += UpdateStatus;
                         TestResultsViewVM.SaveTestResults -= UpdateStatus;
                         TestResultsViewVM.SaveTestResults += UpdateStatus;
+                        ColorCalibrationViewVM.SaveColorCalibration -= UpdateStatus;
+                        ColorCalibrationViewVM.SaveColorCalibration += UpdateStatus;
                     }
 
                     View.NavigateTo(RMLExtensionNavigationView.RMLExtentionView);
@@ -1108,6 +1125,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             {
                 ColorParametersVewVM.SaveColorParameters -= UpdateStatus;
                 TestResultsViewVM.SaveTestResults -= UpdateStatus;
+                ColorCalibrationViewVM.SaveColorCalibration -= UpdateStatus;
                 ActiveRMLExtension.RMLStatus = RMLExtensionStatus.InProgress;
                 ActiveRMLExtension.LastUpdated = DateTime.UtcNow;
 
@@ -1134,6 +1152,10 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             {
                 TestResultsViewVM.SelectedMachineGUID = SelectedMachine.Guid;
             }
+            if(ColorCalibrationViewVM != null)
+            {
+                ColorCalibrationViewVM.Machine = SelectedMachine;
+            }
         }
 
         #endregion
@@ -1183,10 +1205,10 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
 
         #region selections
 
-        private void OnSelectedMachineTestResultsTabChanged()
-        {
-            if(SelectedTab == MachineTestResultsTabs.ColorParameters)
-            {
+        //private void OnSelectedMachineTestResultsTabChanged()
+       // {
+            //if(SelectedTab == MachineTestResultsTabs.ColorParameters)
+           // {
                 //if(PreviosSelectedTab == MachineTestResultsTabs.TestResults && TestResultsViewVM != null)
                 //{
                 //    TestResultsViewVM.Save();
@@ -1194,15 +1216,15 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                 //save
                 //if (_notification.ShowQuestion("Are you sure you want to exit this page without saving changes?"))
                 
-            }
-            else if(SelectedTab == MachineTestResultsTabs.TestResults)
-            {
+           // }
+           // else if(SelectedTab == MachineTestResultsTabs.TestResults)
+           // {
                 //if (PreviosSelectedTab == MachineTestResultsTabs.ColorParameters && ColorParametersVewVM != null)
                 //{
                 //    ColorParametersVewVM.Save();
                 //}
-            }
-        }
+            //}
+       // }
 
         #endregion
 
@@ -1304,6 +1326,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                                     colorParametrsExcelList.Add(colorParametrsExcelModel);
 
                                     TestResultsViewVM.LoadTestResultsExcel(testResultsExcelModelList, machine.Guid, machine.SerialNumber);
+                                    //ColorCalibrationViewVM.WritetoExcel
                                 }
                             }