diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2021-01-13 13:44:21 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2021-01-13 13:44:21 +0200 |
| commit | 626251b432517f9c1dd82997f061763e86bbe8df (patch) | |
| tree | cc4b9776dccd505e2ae57c6a423c1c56fb047ded /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner | |
| parent | 38d2b46c7ca963a31ee43ae5bb1623dca2bc3e7c (diff) | |
| parent | cba294511ce2d7a3b2792632703b671e20263061 (diff) | |
| download | Tango-626251b432517f9c1dd82997f061763e86bbe8df.tar.gz Tango-626251b432517f9c1dd82997f061763e86bbe8df.zip | |
software merge.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner')
2 files changed, 8 insertions, 6 deletions
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) |