diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-03-06 13:27:36 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-03-06 13:27:36 +0200 |
| commit | d95329065734fec34e0e3763cf4b6dee428499d2 (patch) | |
| tree | bfdb162ff3d9126e0223ba3c8df6057559569a0f /Software/Visual_Studio/MachineStudio/Modules | |
| parent | b3cfecea7d2493776db2f03ee48b06436029d438 (diff) | |
| parent | e779c5128f45ccf3e45fbe304da496d4b2f89cb4 (diff) | |
| download | Tango-d95329065734fec34e0e3763cf4b6dee428499d2.tar.gz Tango-d95329065734fec34e0e3763cf4b6dee428499d2.zip | |
merge
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs index 6a89955d6..ae023201c 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs @@ -383,6 +383,15 @@ namespace Tango.MachineStudio.ColorLab.ViewModels input.InputCoordinates.InputLiquids.Add(inputLiquid); } + foreach (var process in SelectedRML.ProcessParametersTablesGroups.Single().ProcessParametersTables) + { + input.ProcessRanges.Add(new ProcessRange() + { + MinInkUptake = process.MinInkUptake, + MaxInkUptake = process.MaxInkUptake, + }); + } + var output = TangoColorConverter.GetSuggestions(input); IsOutOfGamut = output.OutOfGamut; @@ -538,7 +547,7 @@ namespace Tango.MachineStudio.ColorLab.ViewModels if (LiquidsCalibrationData == null || _prevent_inverse_conversion) return; //TODO: This is temporary because of out of range volumes. - if (LiquidVolumes.Where(x => x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor.ToInt32()).Sum(x => x.Volume) > 100) + if (LiquidVolumes.Where(x => x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor.ToInt32()).Sum(x => x.Volume) > 200) { IsVolumesOutOfRange = true; return; @@ -576,6 +585,15 @@ namespace Tango.MachineStudio.ColorLab.ViewModels input.InputCoordinates.InputLiquids.Add(inputLiquid); } + foreach (var process in SelectedRML.ProcessParametersTablesGroups.Single().ProcessParametersTables) + { + input.ProcessRanges.Add(new ProcessRange() + { + MinInkUptake = process.MinInkUptake, + MaxInkUptake = process.MaxInkUptake, + }); + } + var output = TangoColorConverter.GetSuggestions(input); TargetColor = new RgbVM() @@ -612,6 +630,7 @@ namespace Tango.MachineStudio.ColorLab.ViewModels _selectedRML = new RmlBuilder(_dbContext) .Set(_selectedRML) + .WithActiveParametersGroup() .WithCAT(SelectedMachine.Guid) .WithCCT() .WithLiquidFactors().Build(); |