From ea7915f6b55454725a053e420006b13884346a0a Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Wed, 13 Jan 2021 12:10:05 +0200
Subject: Fixed bug with machine creation and color calibration db context.k

---
 .../ViewModels/ColorCalibrationViewVM.cs                           | 7 ++++---
 .../Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs   | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/ColorCalibrationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/ColorCalibrationViewVM.cs
index d37fe1aaa..30e17d6db 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/ColorCalibrationViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/ColorCalibrationViewVM.cs
@@ -87,11 +87,12 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
         #endregion
 
-        public ColorCalibrationViewVM(INotificationProvider notification, Machine machine, ObservablesContext context)
+        public ColorCalibrationViewVM(INotificationProvider notification, Machine machine, ObservablesContext context, Rml rml)
         {
             _notification = notification;
             _machine = machine;
             _dbContext = context;
+            _selectedRML = rml;
         }
 
         private void OnChangeCalibrationDataViewVM()
@@ -106,7 +107,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
         #region RML
 
-        public async void Invalidate()
+        public async Task Invalidate()
         {
             if (SelectedRML != null && Machine != null)
             {
@@ -173,7 +174,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                 };
             }
         }
-        
+
         #endregion
 
         #region Save
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 0f439c83d..e3547c568 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
@@ -623,13 +623,14 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
                     SelectedSite = Sites.SingleOrDefault(x => x.Guid == ActiveMachine.SiteGuid);
 
-                    ColorCalibrationViewVM = new ColorCalibrationViewVM(_notification, ActiveMachine, _activeMachineAdapter.Context)
+                    ColorCalibrationViewVM = new ColorCalibrationViewVM(_notification, ActiveMachine, _activeMachineAdapter.Context, ActiveMachineAdapter.Rmls.FirstOrDefault())
                     {
                         Rmls = ActiveMachineAdapter.Rmls,
                         LiquidTypesRmls = ActiveMachineAdapter.Rmls.FirstOrDefault().LiquidTypesRmls,
-                        SelectedRML = ActiveMachineAdapter.Rmls.FirstOrDefault(),
                     };
 
+                    await ColorCalibrationViewVM.Invalidate();
+
                     if (initHwConfig)
                     {
                         HardwareConfigurationViewVM = new HardwareConfigurationViewVM(_notification);
@@ -844,7 +845,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                         await SelectedMachine.Reload(MachinesAdapter.Context);
                     }
 
-                    ColorCalibrationViewVM.Invalidate();
+                    await ColorCalibrationViewVM.Invalidate();
                 }
             }
             catch (Exception ex)
-- 
cgit v1.3.1