diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-01-13 12:10:05 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-01-13 12:10:05 +0200 |
| commit | ea7915f6b55454725a053e420006b13884346a0a (patch) | |
| tree | 2dafe19cbfb732bf0da4f6eda6a75db3a2d89e87 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs | |
| parent | 38d2b46c7ca963a31ee43ae5bb1623dca2bc3e7c (diff) | |
| download | Tango-ea7915f6b55454725a053e420006b13884346a0a.tar.gz Tango-ea7915f6b55454725a053e420006b13884346a0a.zip | |
Fixed bug with machine creation and color calibration db context.k
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs | 7 |
1 files changed, 4 insertions, 3 deletions
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) |