diff options
4 files changed, 16 insertions, 8 deletions
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp index a4f45ae19..c0b6029aa 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp @@ -3415,8 +3415,12 @@ void Tango::ColorLib::ColorConverter::LimitInks(VectorXd inInks, double *Bounded void Tango::ColorLib::ColorConverter::NLcmtoPercentage(VectorXd InVolume, VectorXd &OutVolume) { + int nInks = InVolume.size(); for (int i = 0; i < m_nInks; ++i) - OutVolume(i) =100* InVolume(i) / m_maxNlPerCM(i); + OutVolume(i) = 100 * InVolume(i) / m_maxNlPerCM(i); + if (nInks > m_nInks) + for (int igt = m_nInks; igt < m_TotalNumberofInks; ++igt) + OutVolume(igt) = 100 * InVolume(igt) / m_maxNlPerCM(igt - m_nInks); } void Tango::ColorLib::ColorConverter::LimitLowVolume(VectorXd InVolume, int &GamutRegion, VectorXd &OutVolume) @@ -3936,8 +3940,10 @@ void Tango::ColorLib::ColorConverter::SplitVolume(VectorXd Volume, VectorXd &Vol double lim1 = 0; double lim2 = m_ProcessRangesMinP[0]; double lim3 = m_ProcessRangesMaxP[0]; - for (int iReg = 0; iReg<m_nProcessRanges-1; ++iReg) + int ProcessRangeInd = 0; + for (int iReg = 1; iReg<m_nProcessRanges-1; ++iReg) { + ProcessRangeInd = iReg; if ((TotalVolume >= lim1) & (TotalVolume <= lim2)) { //Calculate Ink Split Based on m_ProcessRangesMinP[iReg] @@ -3957,8 +3963,8 @@ void Tango::ColorLib::ColorConverter::SplitVolume(VectorXd Volume, VectorXd &Vol if ((TotalVolume >= lim1) & (TotalVolume <= lim2)) { //Calculate Ink Split Based on m_ProcessRangesMinP[iReg] - low = LowVolumeThreshold * m_ProcessRangesMinP[m_nProcessRanges-1] / 100.0; - high = LightInksThr * m_ProcessRangesMinP[m_nProcessRanges-1] / 100.0; + low = LowVolumeThreshold * m_ProcessRangesMinP[ProcessRangeInd] / 100.0; + high = LightInksThr * m_ProcessRangesMinP[ProcessRangeInd] / 100.0; } else if ((TotalVolume <= lim3) & (TotalVolume > lim2)) { @@ -4009,4 +4015,4 @@ void Tango::ColorLib::ColorConverter::SplitVolume(VectorXd Volume, VectorXd &Vol GamutRegion = i; } } -} +}
\ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs index 594698c4c..f8226f6c5 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/ProcedureContext.cs @@ -164,6 +164,7 @@ namespace Tango.FSE.Procedures return MachineProvider.MachineOperator.SendRequest(message, new Transport.TransportRequestConfig() { Timeout = timespan, + ThreadingMode = Transport.TransportThreadingMode.ThreadPool }).Result; } @@ -186,7 +187,8 @@ namespace Tango.FSE.Procedures MachineProvider.MachineOperator.SendContinuousRequest(message, new Transport.TransportContinuousRequestConfig() { Timeout = timespan, - ContinuousTimeout = timespan + ContinuousTimeout = timespan, + ThreadingMode = Transport.TransportThreadingMode.ThreadPool }).ObserveOn(new NewThreadScheduler()).Subscribe((msg) => { try diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index d72e75011..efc5f8179 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> + <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />--> </requestedPrivileges> </security> </trustInfo> diff --git a/Software/Visual_Studio/Tango.BL/Helpers/SegmentsCsvHelper.cs b/Software/Visual_Studio/Tango.BL/Helpers/SegmentsCsvHelper.cs index f99f9c97a..e77085945 100644 --- a/Software/Visual_Studio/Tango.BL/Helpers/SegmentsCsvHelper.cs +++ b/Software/Visual_Studio/Tango.BL/Helpers/SegmentsCsvHelper.cs @@ -153,7 +153,7 @@ namespace Tango.BL.Helpers double length; if (!double.TryParse(row.Length, out length)) { - throw new InvalidOperationException($"Value Length '{row.Length}' should be a number on line'{lineCount}'."); + continue; //Ignore none indexed rows. Maybe there are many empty rows at the end to the document... } int segmentIndex; |