diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-12-13 17:16:43 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-12-13 17:16:43 +0200 |
| commit | 97ea085d1fac43aedc5258486ef355eb13abc195 (patch) | |
| tree | 56926888c8d35fcafd8d4b4e8db2aed9be52feba /Software/Visual_Studio/PPC | |
| parent | d9a89773f2f283fbf5596799dd4d50d231817203 (diff) | |
| download | Tango-97ea085d1fac43aedc5258486ef355eb13abc195.tar.gz Tango-97ea085d1fac43aedc5258486ef355eb13abc195.zip | |
Fixed issues in segment indices !!!
Fixed issue with PPC fine tuning.
Added support to Twine & Panton in color conversion.
Diffstat (limited to 'Software/Visual_Studio/PPC')
3 files changed, 7 insertions, 2 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs index b009762b4..98f429889 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs @@ -888,6 +888,11 @@ namespace Tango.PPC.Jobs.ViewModels /// </summary> private void ResetFineTuning() { + if (Job != null && _jobs_fine_tune_items.ContainsKey(Job.Guid)) + { + _jobs_fine_tune_items.Remove(Job.Guid); + } + SyncFineTuneItemsToBrushStops(); } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs index 1a509f78b..347701c6e 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs @@ -121,7 +121,7 @@ namespace Tango.PPC.UI.Printing { sampleDyeJob.NumberOfUnits = 1; - foreach (var segment in sampleDyeJob.Segments) + foreach (var segment in sampleDyeJob.OrderedSegments) { segment.Length = job.SampleUnitsOrMeters; } 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> |