diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2025-01-07 15:56:03 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2025-01-07 15:56:03 +0200 |
| commit | 96734066c3aa895ff5ab02268b93f04a962308a2 (patch) | |
| tree | bfb729b3dbffc4aaad043d9b64518baac76cf02b | |
| parent | 33c8cda2d92785c7c194f4572d2ec881ecee4d2c (diff) | |
| download | Tango-96734066c3aa895ff5ab02268b93f04a962308a2.tar.gz Tango-96734066c3aa895ff5ab02268b93f04a962308a2.zip | |
Bug fix.
3 files changed, 8 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs index 35569d74f..ca24f4bcf 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/JobModel.cs @@ -24,6 +24,9 @@ namespace Tango.PPC.Jobs.Models public int ID { get; set; } + [JsonIgnore] + public Job Job { get; set; } + protected String _name; public String Name @@ -805,13 +808,14 @@ namespace Tango.PPC.Jobs.Models /// </summary> /// <param name="length">The length.</param> /// <returns></returns> - public static SegmentModel CreateInterSegment(double length) + public SegmentModel CreateInterSegment(double length) { SegmentModel segment = new SegmentModel() { IsInterSegment = true, Length = length, - Name = "Inter Segment" + Name = "Inter Segment", + Job = this, }; segment.BrushStops.Add(new BrushStopModel(segment) { diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs index 499d2c08c..ee3cece33 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs @@ -625,6 +625,7 @@ namespace Tango.PPC.Jobs.ViewModels NumberOfUnits = Job.NumberOfUnits, IsAllSegmentsPerSpool = Job.IsAllSegmentsPerSpool, Rml = Job.Rml, + Job = Job, ColorSpace = Job.ColorSpace, SpoolType = Job.SpoolType, SpoolTypeName = PPCSpoolType.Name, 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> |