diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2022-10-03 17:08:11 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2022-10-03 17:08:11 +0300 |
| commit | 6d54b8da0fefd5dbb2f40f3ccc268497dd0bbe09 (patch) | |
| tree | 963a6ee7ea16da4bc934faf40953e990eabc2222 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner | |
| parent | 70c1f3243b51be8ba70f806453ea2ee0881d3084 (diff) | |
| parent | 6577b5da46b2f6aaa5724f43334fa7eedd99b05d (diff) | |
| download | Tango-6d54b8da0fefd5dbb2f40f3ccc268497dd0bbe09.tar.gz Tango-6d54b8da0fefd5dbb2f40f3ccc268497dd0bbe09.zip | |
Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/ColorCalibrationViewVM.cs | 3 |
1 files changed, 2 insertions, 1 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 feee2637a..edfc77274 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 @@ -122,6 +122,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels .WithActiveParametersGroup() .WithCAT(Machine.Guid) .WithCCT() + .WithGbdAndLub() .WithLiquidFactors().Build(); LiquidTypesRmls = SelectedRML.LiquidTypesRmls; @@ -165,7 +166,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels ColorConversionViewVM = new ColorConversionViewVM(_notification) { RML = SelectedRML, - CCT = new CctModel() + CCT = new DataFileModel() { Data = SelectedRML.Cct?.Data, }, |