Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 39 insertions, 2 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index aa84fb137..361608ef6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -13,13 +13,13 @@ using Tango.BL.Builders;
 using Tango.BL.Calibration;
 using Tango.BL.Entities;
 using Tango.Core.Commands;
-using Tango.MachineStudio.ColorLab.ViewModels;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.RML.Contracts;
 using Tango.MachineStudio.RML.Models;
 using Tango.MachineStudio.RML.Views;
 using Tango.PMR.ColorLab;
+using System.Data.Entity;
 
 namespace Tango.MachineStudio.RML.ViewModels
 {
@@ -132,7 +132,14 @@ namespace Tango.MachineStudio.RML.ViewModels
         public CctModel SelectedCCT
         {
             get { return _selectedCCT; }
-            set { _selectedCCT = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+            set { _selectedCCT = value; RaisePropertyChangedAuto(); OnSelectedCCTChanged(); InvalidateRelayCommands(); }
+        }
+
+        private ColorConversionViewVM _colorConversionViewVM;
+        public ColorConversionViewVM ColorConversionViewVM
+        {
+            get { return _colorConversionViewVM; }
+            set { _colorConversionViewVM = value; RaisePropertyChangedAuto(); }
         }
 
         /// <summary>
@@ -287,6 +294,13 @@ namespace Tango.MachineStudio.RML.ViewModels
                     CalibrationDataViewVM.LiquidsCalibrationData.Add(catVM);
                 }
 
+                ColorConversionViewVM = new ColorConversionViewVM(_notification)
+                {
+                    RML = ActiveRML,
+                    CCT = SelectedCCT,
+                    LiquidsCalibrationData = CalibrationDataViewVM.LiquidsCalibrationData,
+                    LiquidTypesRmls = LiquidTypesRmls,
+                };
 
                 View.NavigateTo(RmlNavigationView.RmlView);
 
@@ -296,6 +310,27 @@ namespace Tango.MachineStudio.RML.ViewModels
             }
         }
 
+        private async void OnSelectedCCTChanged()
+        {
+            if (SelectedCCT != null && !SelectedCCT.IsNew)
+            {
+                using (_notification.PushTaskItem("Loading CCT data..."))
+                {
+                    IsFree = false;
+
+                    var cct = await _active_context.Ccts.SingleOrDefaultAsync(x => x.Guid == SelectedCCT.Guid);
+
+                    if (cct != null)
+                    {
+                        SelectedCCT.Data = cct.Data;
+                        ColorConversionViewVM.CCT = SelectedCCT;
+                    }
+
+                    IsFree = true;
+                }
+            }
+        }
+
         private void LoadRmlProperties()
         {
             Materials = _active_context.MediaMaterials.ToObservableCollection();
@@ -566,6 +601,8 @@ namespace Tango.MachineStudio.RML.ViewModels
 
                 CCTS.Insert(0, cctModel);
                 SelectedCCT = cctModel;
+
+                ColorConversionViewVM.CCT = SelectedCCT;
             }
         }