Skip to content

Commit f110a8c

Browse files
Import MTConnect v2.5 SysML models
1 parent cb48e67 commit f110a8c

49 files changed

Lines changed: 1154 additions & 395 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build/MTConnect.NET-SysML-Import/Program.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
using System.Text.Json;
66

77
//var xmlPath = @"D:\TrakHound\MTConnect\MTConnectSysMLModel.xml";
8-
var xmlPath = @"D:\TrakHound\MTConnect\Standard\v2.4\MTConnectSysMLModel.xml";
8+
//var xmlPath = @"D:\TrakHound\MTConnect\Standard\v2.4\MTConnectSysMLModel.xml";
9+
var xmlPath = @"D:\TrakHound\MTConnect\Standard\v2.5\MTConnectSysMLModel.xml";
910

1011
var mtconnectModel = MTConnectModel.Parse(xmlPath);
1112

libraries/MTConnect.NET-Common/Assets/Asset.g.cs

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ public partial class Asset : IAsset
2424
public MTConnect.Devices.Configurations.IConfiguration Configuration { get; set; }
2525

2626
/// <summary>
27-
/// Description can contain any descriptive content about the Asset.
27+
/// Textual description for Asset.
2828
/// </summary>
29-
public MTConnect.Devices.IDescription Description { get; set; }
29+
public string Description { get; set; }
3030

3131
/// <summary>
3232
/// Associated piece of equipment's UUID that supplied the Asset's data.uuid defined in Device Information Model.
@@ -38,11 +38,31 @@ public partial class Asset : IAsset
3838
/// </summary>
3939
public string Hash { get; set; }
4040

41+
/// <summary>
42+
///
43+
/// </summary>
44+
public string Manufacturers { get; set; }
45+
46+
/// <summary>
47+
///
48+
/// </summary>
49+
public string Model { get; set; }
50+
4151
/// <summary>
4252
/// Indicator that the Asset has been removed from the piece of equipment.
4353
/// </summary>
4454
public bool Removed { get; set; }
4555

56+
/// <summary>
57+
///
58+
/// </summary>
59+
public string SerialNumber { get; set; }
60+
61+
/// <summary>
62+
///
63+
/// </summary>
64+
public string Station { get; set; }
65+
4666
/// <summary>
4767
/// Time the Asset data was last modified.
4868
/// </summary>

libraries/MTConnect.NET-Common/Assets/AssetDescriptions.g.cs

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ public static class AssetDescriptions
1616
public const string Configuration = "Technical information about an entity describing its physical layout, functional characteristics, and relationships with other entities.";
1717

1818
/// <summary>
19-
/// Description can contain any descriptive content about the Asset.
19+
/// Textual description for Asset.
2020
/// </summary>
21-
public const string Description = "Description can contain any descriptive content about the Asset.";
21+
public const string Description = "Textual description for Asset.";
2222

2323
/// <summary>
2424
/// Associated piece of equipment's UUID that supplied the Asset's data.uuid defined in Device Information Model.
@@ -30,11 +30,31 @@ public static class AssetDescriptions
3030
/// </summary>
3131
public const string Hash = "Condensed message digest from a secure one-way hash function. FIPS PUB 180-4";
3232

33+
/// <summary>
34+
///
35+
/// </summary>
36+
public const string Manufacturers = "";
37+
38+
/// <summary>
39+
///
40+
/// </summary>
41+
public const string Model = "";
42+
3343
/// <summary>
3444
/// Indicator that the Asset has been removed from the piece of equipment.
3545
/// </summary>
3646
public const string Removed = "Indicator that the Asset has been removed from the piece of equipment.";
3747

48+
/// <summary>
49+
///
50+
/// </summary>
51+
public const string SerialNumber = "";
52+
53+
/// <summary>
54+
///
55+
/// </summary>
56+
public const string Station = "";
57+
3858
/// <summary>
3959
/// Time the Asset data was last modified.
4060
/// </summary>

libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingItem.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public partial class CuttingItem : ICuttingItem
5656
/// <summary>
5757
/// A collection of measurements relating to this cutting item.
5858
/// </summary>
59-
public System.Collections.Generic.IEnumerable<MTConnect.Assets.CuttingTools.IMeasurement> Measurements { get; set; }
59+
public System.Collections.Generic.IEnumerable<MTConnect.Assets.CuttingTools.IToolingMeasurement> Measurements { get; set; }
6060

6161
/// <summary>
6262
/// Tool group this item is assigned in the part program.

libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeAsset.g.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ public partial class CuttingToolArchetypeAsset : Asset, ICuttingToolArchetypeAss
2323
/// </summary>
2424
public MTConnect.Assets.CuttingTools.ICuttingToolLifeCycle CuttingToolLifeCycle { get; set; }
2525

26-
/// <summary>
27-
/// Manufacturers of the cutting tool.This will reference the tool item and adaptive items specifically. The cutting itemsmanufacturers’ will be a property of CuttingItem.> Note: In XML, the representation will be a comma(,) delimited list of manufacturer names. See CuttingTool Schema Diagrams.
28-
/// </summary>
29-
public System.Collections.Generic.IEnumerable<string> Manufacturers { get; set; }
30-
3126
/// <summary>
3227
/// Unique identifier for this assembly.
3328
/// </summary>

libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolArchetypeAssetDescriptions.g.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ public static class CuttingToolArchetypeAssetDescriptions
1515
/// </summary>
1616
public const string CuttingToolLifeCycle = "Data regarding the application or use of the tool.This data is provided by various pieces of equipment (i.e. machine tool, presetter) and statistical process control applications. Life cycle data will not remain static, but will change periodically when a tool is used or measured.";
1717

18-
/// <summary>
19-
/// Manufacturers of the cutting tool.This will reference the tool item and adaptive items specifically. The cutting itemsmanufacturers’ will be a property of CuttingItem.> Note: In XML, the representation will be a comma(,) delimited list of manufacturer names. See CuttingTool Schema Diagrams.
20-
/// </summary>
21-
public const string Manufacturers = "Manufacturers of the cutting tool.This will reference the tool item and adaptive items specifically. The cutting itemsmanufacturers’ will be a property of CuttingItem.> Note: In XML, the representation will be a comma(,) delimited list of manufacturer names. See CuttingTool Schema Diagrams.";
22-
2318
/// <summary>
2419
/// Unique identifier for this assembly.
2520
/// </summary>

libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolAsset.g.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ public partial class CuttingToolAsset : Asset, ICuttingToolAsset
2828
/// </summary>
2929
public MTConnect.Assets.CuttingTools.ICuttingToolLifeCycle CuttingToolLifeCycle { get; set; }
3030

31-
/// <summary>
32-
/// Manufacturers of the cutting tool.This will reference the tool item and adaptive items specifically. The cutting itemsmanufacturers’ will be a property of CuttingItem.> Note: In XML, the representation **MUST** be a comma(,) delimited list of manufacturer names. See CuttingTool Schema Diagrams.
33-
/// </summary>
34-
public System.Collections.Generic.IEnumerable<string> Manufacturers { get; set; }
35-
3631
/// <summary>
3732
/// Unique identifier for this assembly.
3833
/// </summary>

libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolAssetDescriptions.g.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ public static class CuttingToolAssetDescriptions
2020
/// </summary>
2121
public const string CuttingToolLifeCycle = "Data regarding the application or use of the tool.This data is provided by various pieces of equipment (i.e. machine tool, presetter) and statistical process control applications. Life cycle data will not remain static, but will change periodically when a tool is used or measured.";
2222

23-
/// <summary>
24-
/// Manufacturers of the cutting tool.This will reference the tool item and adaptive items specifically. The cutting itemsmanufacturers’ will be a property of CuttingItem.> Note: In XML, the representation **MUST** be a comma(,) delimited list of manufacturer names. See CuttingTool Schema Diagrams.
25-
/// </summary>
26-
public const string Manufacturers = "Manufacturers of the cutting tool.This will reference the tool item and adaptive items specifically. The cutting itemsmanufacturers’ will be a property of CuttingItem.> Note: In XML, the representation **MUST** be a comma(,) delimited list of manufacturer names. See CuttingTool Schema Diagrams.";
27-
2823
/// <summary>
2924
/// Unique identifier for this assembly.
3025
/// </summary>

libraries/MTConnect.NET-Common/Assets/CuttingTools/CuttingToolLifeCycle.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public partial class CuttingToolLifeCycle : ICuttingToolLifeCycle
3636
/// <summary>
3737
/// Constrained scalar value associated with a cutting tool.
3838
/// </summary>
39-
public System.Collections.Generic.IEnumerable<MTConnect.Assets.CuttingTools.IMeasurement> Measurements { get; set; }
39+
public System.Collections.Generic.IEnumerable<MTConnect.Assets.CuttingTools.IToolingMeasurement> Measurements { get; set; }
4040

4141
/// <summary>
4242
/// Constrained process feed rate for the tool in mm/s.minimum **MUST** be specified.

libraries/MTConnect.NET-Common/Assets/CuttingTools/ICuttingItem.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public partial interface ICuttingItem
5151
/// <summary>
5252
/// A collection of measurements relating to this cutting item.
5353
/// </summary>
54-
System.Collections.Generic.IEnumerable<MTConnect.Assets.CuttingTools.IMeasurement> Measurements { get; }
54+
System.Collections.Generic.IEnumerable<MTConnect.Assets.CuttingTools.IToolingMeasurement> Measurements { get; }
5555

5656
/// <summary>
5757
/// Tool group this item is assigned in the part program.

0 commit comments

Comments
 (0)