From abf52afef935a03ce9a1b447791b8fca4a6c1e5a Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Wed, 10 May 2023 08:58:32 -0700 Subject: [PATCH] Added SineBevelAngle and XStep --- .../FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs | 4 ++++ Adaptation/FileHandlers/json/Description.cs | 9 +++++++++ Adaptation/FileHandlers/json/ProcessData.cs | 7 ++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs index 986a071..72a2eee 100644 --- a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs +++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs @@ -27,6 +27,8 @@ public class WSRequest public string Title { get; set; } public string UniqueId { get; set; } public string Zone { get; set; } + public string SineBevelAngle { get; set; } + public string XStep { get; set; } public List Details { get; protected set; } [Obsolete("For json")] public WSRequest() { } @@ -52,6 +54,8 @@ public class WSRequest Recipe = x.Recipe; UniqueId = x.UniqueId; Zone = x.Zone; + SineBevelAngle = x.SineBevelAngle; + XStep = x.XStep; } json.Detail detail; foreach (json.Description description in descriptions) diff --git a/Adaptation/FileHandlers/json/Description.cs b/Adaptation/FileHandlers/json/Description.cs index c7f3da0..fb5d38c 100644 --- a/Adaptation/FileHandlers/json/Description.cs +++ b/Adaptation/FileHandlers/json/Description.cs @@ -34,6 +34,9 @@ public class Description : IDescription, Shared.Properties.IDescription public string UniqueId { get; set; } public string Zone { get; set; } // + public string SineBevelAngle { get; set; } + public string XStep { get; set; } + // public string Number { get; set; } public string Depth { get; set; } public string Raw { get; set; } @@ -182,6 +185,9 @@ public class Description : IDescription, Shared.Properties.IDescription Recipe = processData.Recipe, Zone = processData.Zone, // + SineBevelAngle = processData.SineBevelAngle, + XStep = processData.XStep, + // UniqueId = detail.UniqueId, HeaderUniqueId = detail.HeaderUniqueId, Depth = detail.Depth, @@ -230,6 +236,9 @@ public class Description : IDescription, Shared.Properties.IDescription UniqueId = nameof(UniqueId), Zone = nameof(Zone), // + SineBevelAngle = nameof(SineBevelAngle), + XStep = nameof(XStep), + // Number = nameof(Number), Depth = nameof(Depth), Raw = nameof(Raw), diff --git a/Adaptation/FileHandlers/json/ProcessData.cs b/Adaptation/FileHandlers/json/ProcessData.cs index 820b6bf..e70b888 100644 --- a/Adaptation/FileHandlers/json/ProcessData.cs +++ b/Adaptation/FileHandlers/json/ProcessData.cs @@ -27,6 +27,9 @@ public partial class ProcessData : IProcessData public string Reactor { get; set; } public string Recipe { get; set; } public string Zone { get; set; } + // + public string SineBevelAngle { get; set; } + public string XStep { get; set; } List Shared.Properties.IProcessData.Details => _Details; @@ -255,13 +258,15 @@ public partial class ProcessData : IProcessData employee = descriptor.Employee; PSN = psn; RDS = rds; - Date = dateTime; Zone = zone; Layer = layer; + Date = dateTime; Recipe = recipe; Reactor = reactor; Employee = employee; JobID = logistics.JobID; + SineBevelAngle = csv.Setup.SineBevelAngle.ToString(); + XStep = !csv.Setup.Steps.Any() ? string.Empty : csv.Setup.Steps.First().X.ToString(); foreach (ProfilePoint profilePoint in csv.ProfileHeader.ProfilePoints) { detail = new()