From ea7915f6b55454725a053e420006b13884346a0a Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Wed, 13 Jan 2021 12:10:05 +0200 Subject: Fixed bug with machine creation and color calibration db context.k --- .../Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs') 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