Update SysML Import

TrakHound · Oct 31, 2023 · efa14cc · efa14cc
1 parent 57ecd35
commit efa14cc
Show file tree

Hide file tree

Showing 7 changed files with 131 additions and 134 deletions.
diff --git a/build/MTConnect.NET-SysML-Import/Json-cppagent/Templates/Components.scriban b/build/MTConnect.NET-SysML-Import/Json-cppagent/Templates/Components.scriban
@@ -50,7 +50,7 @@ namespace MTConnect.Devices.Json
             var components = new List<IComponent>();
 
 {{- for type in types }}{{ i = i + 1 }}
-            if (!{{type.type}}.IsNullOrEmpty()) foreach (var component in {{type.type}}) components.Add(component.ToComponent());
+            if (!{{type.type}}.IsNullOrEmpty()) foreach (var component in {{type.type}}) components.Add(component.ToComponent({{type.name}}.TypeId));
 {{ end }}
 
             return components;

diff --git a/src/MTConnect.NET-JSON-cppagent/Devices/JsonCellDefinition.cs b/src/MTConnect.NET-JSON-cppagent/Devices/JsonCellDefinition.cs
@@ -22,7 +22,7 @@ public class JsonCellDefinition
         [JsonPropertyName("subType")]
         public string SubType { get; set; }
 
-        [JsonPropertyName("description")]
+        [JsonPropertyName("Description")]
         public JsonDescription Description { get; set; }
 
 

diff --git a/src/MTConnect.NET-JSON-cppagent/Devices/JsonChannel.cs b/src/MTConnect.NET-JSON-cppagent/Devices/JsonChannel.cs
@@ -24,7 +24,7 @@ public class JsonChannel
         [JsonPropertyName("calibrationInitials")]
         public string CalibrationInitials { get; set; }
 
-        [JsonPropertyName("description")]
+        [JsonPropertyName("Description")]
         public JsonDescription Description { get; set; }
 
 

diff --git a/src/MTConnect.NET-JSON-cppagent/Devices/JsonComponent.cs b/src/MTConnect.NET-JSON-cppagent/Devices/JsonComponent.cs
@@ -10,9 +10,6 @@ public class JsonComponent
         [JsonPropertyName("id")]
         public string Id { get; set; }
 
-        [JsonPropertyName("type")]
-        public string Type { get; set; }
-
         [JsonPropertyName("name")]
         public string Name { get; set; }
 
@@ -60,7 +57,7 @@ public JsonComponent(IComponent component)
                 Uuid = component.Uuid;
                 Name = component.Name;
                 NativeName = component.NativeName;
-                Type = component.Type;
+                //Type = component.Type;
                 if (component.Description != null) Description = new JsonDescription(component.Description);
                 if (component.SampleRate > 0) SampleRate = component.SampleRate;
                 if (component.SampleInterval > 0) SampleInterval = component.SampleInterval;
@@ -95,15 +92,15 @@ public JsonComponent(IComponent component)
 
         public override string ToString() => JsonFunctions.Convert(this);
 
-        public Component ToComponent()
+        public Component ToComponent(string componentType)
         {
             var component = new Component();
 
             component.Id = Id;
             component.Uuid = Uuid;
             component.Name = Name;
             component.NativeName = NativeName;
-            component.Type = Type;
+            component.Type = componentType;
             if (Description != null) component.Description = Description.ToDescription();
             component.SampleRate = SampleRate.HasValue ? SampleRate.Value : 0;
             component.SampleInterval = SampleInterval.HasValue ? SampleInterval.Value : 0;

diff --git a/src/MTConnect.NET-JSON-cppagent/Devices/JsonComponents.g.cs b/src/MTConnect.NET-JSON-cppagent/Devices/JsonComponents.g.cs
diff --git a/src/MTConnect.NET-JSON-cppagent/Devices/JsonSensorConfiguration.cs b/src/MTConnect.NET-JSON-cppagent/Devices/JsonSensorConfiguration.cs
@@ -10,19 +10,19 @@ namespace MTConnect.Devices.Json
 {
     public class JsonSensorConfiguration
     {
-        [JsonPropertyName("firmwareVersion")]
+        [JsonPropertyName("FirmwareVersion")]
         public string FirmwareVersion { get; set; }
 
-        [JsonPropertyName("calibrationDate")]
+        [JsonPropertyName("CalibrationDate")]
         public DateTime CalibrationDate { get; set; }
 
-        [JsonPropertyName("nextCalibrationDate")]
+        [JsonPropertyName("NextCalibrationDate")]
         public DateTime NextCalibrationDate { get; set; }
 
-        [JsonPropertyName("calibrationInitials")]
+        [JsonPropertyName("CalibrationInitials")]
         public string CalibrationInitials { get; set; }
 
-        [JsonPropertyName("channels")]
+        [JsonPropertyName("Channels")]
         public List<JsonChannel> Channels { get; set; }
 
 

diff --git a/src/MTConnect.NET-JSON/Assets/QIF/JsonQIFDocumentWrapperAsset.cs b/src/MTConnect.NET-JSON/Assets/QIF/JsonQIFDocumentWrapperAsset.cs
@@ -33,10 +33,10 @@ public class JsonQIFDocumentWrapperAsset
 
 
         [JsonPropertyName("qifDocumentType")]
-        public string QifDocumentType { get; set; }
+        public string QIFDocumentType { get; set; }
 
         [JsonPropertyName("qifDocument")]
-        public string QifDocument { get; set; }
+        public string QIFDocument { get; set; }
 
 
         public JsonQIFDocumentWrapperAsset() { }
@@ -54,8 +54,8 @@ public JsonQIFDocumentWrapperAsset(IQIFDocumentWrapperAsset asset)
 
                 if (asset.Description != null) Description = new JsonDescription(asset.Description);
 
-                QifDocumentType = asset.QifDocumentType.ToString();
-                //QifDocument = asset.QIFDocument; ??
+                QIFDocumentType = asset.QifDocumentType.ToString();
+                QIFDocument = asset.QIFDocument;
             }
         }
 
@@ -72,8 +72,8 @@ public IQIFDocumentWrapperAsset ToQIFDocumentWrapperAsset()
 
             if (Description != null) asset.Description = Description.ToDescription();
 
-            asset.QifDocumentType = QifDocumentType.ConvertEnum<QIFDocumentType>();
-            //asset.QifDocument = QifDocument; ??
+            asset.QifDocumentType = QIFDocumentType.ConvertEnum<QIFDocumentType>();
+            asset.QIFDocument = QIFDocument;
             return asset;
         }
     }