diff options
| author | Mirta <mirta@twine-s.com> | 2023-01-15 07:27:55 +0200 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2023-01-15 07:27:55 +0200 |
| commit | 6336e42d8a6753cdfef3612e4cb53e1e4bacf2ff (patch) | |
| tree | c3fbf00004c3858db1eca8b2ff00261e834fc997 /Software | |
| parent | 32900a191b53c652c5c967188608a84ce71350b8 (diff) | |
| download | Tango-6336e42d8a6753cdfef3612e4cb53e1e4bacf2ff.tar.gz Tango-6336e42d8a6753cdfef3612e4cb53e1e4bacf2ff.zip | |
Added GetGamutRegion to ConvertVolume to RGB, eventhough it is not necessary, since it is given in the Lab/RGB calculation
Diffstat (limited to 'Software')
| -rw-r--r-- | Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ColorConverter.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ColorConverter.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ColorConverter.cpp index 47f0fcfff..70db11e2e 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ColorConverter.cpp +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/ColorConverter.cpp @@ -1632,7 +1632,7 @@ void Tango::ColorLib::ColorConverter::ConvertVolumeToRGBDisplay(InputCoordinates for (int i = 0; i < m_nInks; ++i) FinalVolumeNoLI(i) = VolumeNoLI(i); //VolumeNoLi is in Color Table Units PercentagetoNLcm(VolumeNoLI, VolumeNoLI); //in [nl/cm] converted in Color Table Space - GamutRegion = GetGamutRegion(VolumeNoLI, m_GamutRegionMaxLim); //Volume is in Color Table Units + GamutRegion = GetGamutRegion(Volume, m_GamutRegionMaxLim); //Volume is in Color Table Units NLcmtoPercentage(VolumeNoLI, VolumeNoLI); // in [%] VolumeToNLInkP(VolumeNoLI, NLInkP); //NLInkP is in % VectorToDouble(NLInkP, InkOutP); @@ -1657,12 +1657,14 @@ void Tango::ColorLib::ColorConverter::ConvertVolumeToRGBDisplay(InputCoordinates //Volume is in Thread Space, need to convert to Color Table space to get RGB for (int i = 0; i < m_nInks; ++i) // % to nl/cm in Thread Space VolumeNoLI(i) *= (m_maxNlPerCM(i) / 100); + m_currentMaxNLPerCM = m_maxNlPerCM; //Thread space for (int i = 0; i < m_nProcessRanges; ++i) { m_CurrentProcessRangesMax[i] = m_ProcessRangesMaxP[i]; m_CurrentProcessRangesMin[i] = m_ProcessRangesMinP[i]; } + GamutRegion = GetGamutRegion(Volume, m_GamutRegionMaxLim); int CTUnits = 0; //to convert to Color Table space // GetClosestInk(VolumeNoLI, GamutRegion, VolumeNoLI, CTUnits); //VolumenoLi Input is in [nl/cm], VolumeNoLI Output is in [%] in thread space |