Updated SysML Import

TrakHound · Oct 25, 2023 · 9ac0af0 · 9ac0af0
1 parent ef7fe74
commit 9ac0af0
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 67 deletions.
diff --git a/src/MTConnect.NET-Common/Devices/CellDefinition.g.cs b/src/MTConnect.NET-Common/Devices/CellDefinition.g.cs
@@ -26,17 +26,17 @@ public class CellDefinition : ICellDefinition
         /// <summary>
         /// Dataitem type that defines the meaning of the key.
         /// </summary>
-        public DataItemType KeyType { get; set; }
+        public string KeyType { get; set; }
 
         /// <summary>
         /// Same as DataItem DataItem::subType. See DataItem.
         /// </summary>
-        public DataItemSubType SubType { get; set; }
+        public string SubType { get; set; }
 
         /// <summary>
         /// Same as DataItem DataItem::type. See DataItem Types.
         /// </summary>
-        public DataItemType Type { get; set; }
+        public string Type { get; set; }
 
         /// <summary>
         /// Same as DataItem DataItem::units. See Value Properties of DataItem.

diff --git a/src/MTConnect.NET-Common/Devices/Configurations/ISpecification.g.cs b/src/MTConnect.NET-Common/Devices/Configurations/ISpecification.g.cs
@@ -66,12 +66,12 @@ public interface ISpecification
         /// <summary>
         /// Same as DataItem DataItem::subType. See DataItem.
         /// </summary>
-        DataItemSubType SubType { get; }
+        string SubType { get; }
 
         /// <summary>
         /// Same as DataItem type. See DataItem Types.
         /// </summary>
-        DataItemType Type { get; }
+        string Type { get; }
 
         /// <summary>
         /// Same as DataItem DataItem::units. See DataItem.

diff --git a/src/MTConnect.NET-Common/Devices/Configurations/Specification.g.cs b/src/MTConnect.NET-Common/Devices/Configurations/Specification.g.cs
@@ -71,12 +71,12 @@ public class Specification : ISpecification
         /// <summary>
         /// Same as DataItem DataItem::subType. See DataItem.
         /// </summary>
-        public DataItemSubType SubType { get; set; }
+        public string SubType { get; set; }
 
         /// <summary>
         /// Same as DataItem type. See DataItem Types.
         /// </summary>
-        public DataItemType Type { get; set; }
+        public string Type { get; set; }
 
         /// <summary>
         /// Same as DataItem DataItem::units. See DataItem.

diff --git a/src/MTConnect.NET-Common/Devices/EntryDefinition.g.cs b/src/MTConnect.NET-Common/Devices/EntryDefinition.g.cs
@@ -31,17 +31,17 @@ public class EntryDefinition : IEntryDefinition
         /// <summary>
         /// Dataitem type that defines the meaning of the key.
         /// </summary>
-        public DataItemType KeyType { get; set; }
+        public string KeyType { get; set; }
 
         /// <summary>
         /// Same as DataItem DataItem::subType. See DataItem.
         /// </summary>
-        public DataItemSubType SubType { get; set; }
+        public string SubType { get; set; }
 
         /// <summary>
         /// Same as DataItem DataItem::type. See DataItem Types.
         /// </summary>
-        public DataItemType Type { get; set; }
+        public string Type { get; set; }
 
         /// <summary>
         /// Same as DataItem DataItem::units. See Value Properties of DataItem.

diff --git a/src/MTConnect.NET-Common/Devices/ICellDefinition.g.cs b/src/MTConnect.NET-Common/Devices/ICellDefinition.g.cs
@@ -21,17 +21,17 @@ public interface ICellDefinition
         /// <summary>
         /// Dataitem type that defines the meaning of the key.
         /// </summary>
-        DataItemType KeyType { get; }
+        string KeyType { get; }
 
         /// <summary>
         /// Same as DataItem DataItem::subType. See DataItem.
         /// </summary>
-        DataItemSubType SubType { get; }
+        string SubType { get; }
 
         /// <summary>
         /// Same as DataItem DataItem::type. See DataItem Types.
         /// </summary>
-        DataItemType Type { get; }
+        string Type { get; }
 
         /// <summary>
         /// Same as DataItem DataItem::units. See Value Properties of DataItem.

diff --git a/src/MTConnect.NET-Common/Devices/IEntryDefinition.g.cs b/src/MTConnect.NET-Common/Devices/IEntryDefinition.g.cs
@@ -26,17 +26,17 @@ public interface IEntryDefinition
         /// <summary>
         /// Dataitem type that defines the meaning of the key.
         /// </summary>
-        DataItemType KeyType { get; }
+        string KeyType { get; }
 
         /// <summary>
         /// Same as DataItem DataItem::subType. See DataItem.
         /// </summary>
-        DataItemSubType SubType { get; }
+        string SubType { get; }
 
         /// <summary>
         /// Same as DataItem DataItem::type. See DataItem Types.
         /// </summary>
-        DataItemType Type { get; }
+        string Type { get; }
 
         /// <summary>
         /// Same as DataItem DataItem::units. See Value Properties of DataItem.

diff --git a/src/MTConnect.NET-Common/Devices/References/IReference.cs b/src/MTConnect.NET-Common/Devices/References/IReference.cs
diff --git a/src/MTConnect.NET-Common/Devices/References/Reference.cs b/src/MTConnect.NET-Common/Devices/References/Reference.cs
diff --git a/src/MTConnect.NET-SysML/MTConnectPropertyModel.cs b/src/MTConnect.NET-SysML/MTConnectPropertyModel.cs
@@ -75,6 +75,12 @@ internal static string ParseType(XmiDocument xmiDocument, string typeId)
                     // ID
                     case "_19_0_3_91b028d_1579272245466_691733_672": return "string";
 
+                    // DataItemTypeEnum
+                    case "_19_0_3_45f01b9_1579563576485_587701_22033": return "string";
+
+                    // DataItemSubTypeEnum
+                    case "_19_0_3_45f01b9_1579563592155_977172_22064": return "string";
+
                     default:
 
                         string dataType = null;