Skip to content

Commit 10faacc

Browse files
PatrickRitchiePatrickRitchie
committed
Updated to be compatible with ToolingMeasurements, Manufacturers, and Description changes in v2.5
1 parent f110a8c commit 10faacc

83 files changed

Lines changed: 432 additions & 242 deletions

File tree

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/CSharp/TemplateRenderer.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,10 @@ public static void Render(MTConnectModel mtconnectModel, string outputPath)
150150
((ClassModel)template).IsPartial = true;
151151
((ClassModel)template).IsAbstract = false;
152152
break;
153+
case "Assets.CuttingTools.ToolingMeasurement":
154+
((ClassModel)template).IsPartial = true;
155+
((ClassModel)template).IsAbstract = false;
156+
break;
153157
case "Assets.Files.File":
154158
((ClassModel)template).IsPartial = true;
155159
((ClassModel)template).Id += "Asset";

‎build/MTConnect.NET-SysML-Import/CSharp/Templates/Assets.CuttingToolMeasurement.scriban‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace MTConnect.Assets.CuttingTools.Measurements
66
/// <summary>
77
/// {{description}}
88
/// </summary>
9-
public class {{name}} : Measurement
9+
public class {{name}} : ToolingMeasurement
1010
{
1111
public const string TypeId = "{{type_id}}";
1212
public const string CodeId = "{{code_id}}";
@@ -27,7 +27,7 @@ namespace MTConnect.Assets.CuttingTools.Measurements
2727
{{ if (units_enum) }}Units = {{units_enum}};{{ end }}
2828
}
2929

30-
public {{name}}(IMeasurement measurement) : base(measurement)
30+
public {{name}}(IToolingMeasurement measurement) : base(measurement)
3131
{
3232
Type = TypeId;
3333
Code = CodeId;

‎build/MTConnect.NET-SysML-Import/Json-cppagent/Templates/Measurements.scriban‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace MTConnect.Assets.Json.CuttingTools
1818

1919
public JsonMeasurements() { }
2020

21-
public JsonMeasurements(IEnumerable<IMeasurement> measurements)
21+
public JsonMeasurements(IEnumerable<IToolingMeasurement> measurements)
2222
{
2323
if (!measurements.IsNullOrEmpty())
2424
{
@@ -39,9 +39,9 @@ namespace MTConnect.Assets.Json.CuttingTools
3939
}
4040

4141

42-
public IEnumerable<IMeasurement> ToMeasurements()
42+
public IEnumerable<IToolingMeasurement> ToMeasurements()
4343
{
44-
var measurements = new List<IMeasurement>();
44+
var measurements = new List<IToolingMeasurement>();
4545

4646
{{ for type in types }}
4747
if (!{{type.name}}s.IsNullOrEmpty()) foreach (var measurement in {{type.name}}s) measurements.Add(measurement.ToMeasurement({{type.name}}.TypeId));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public partial class Asset : IAsset
4141
/// <summary>
4242
///
4343
/// </summary>
44-
public string Manufacturers { get; set; }
44+
public System.Collections.Generic.IEnumerable<string> Manufacturers { get; set; }
4545

4646
/// <summary>
4747
///

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public partial class CuttingItem
1010
public CuttingItem()
1111
{
1212
CutterStatus = new List<CutterStatusType>();
13-
Measurements = new List<Measurement>();
13+
Measurements = new List<ToolingMeasurement>();
1414
}
1515

1616

@@ -29,10 +29,10 @@ public ICuttingItem Process()
2929

3030
if (!Measurements.IsNullOrEmpty())
3131
{
32-
var measurements = new List<Measurement>();
32+
var measurements = new List<ToolingMeasurement>();
3333
foreach (var measurement in Measurements)
3434
{
35-
var typeMeasurement = Measurement.Create(measurement.Type, measurement);
35+
var typeMeasurement = ToolingMeasurement.Create(measurement.Type, measurement);
3636
if (typeMeasurement != null) measurements.Add(typeMeasurement);
3737
}
3838
cuttingItem.Measurements = measurements;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public partial class CuttingToolLifeCycle
1111
public CuttingToolLifeCycle()
1212
{
1313
CutterStatus = new List<CutterStatusType>();
14-
Measurements = new List<Measurement>();
14+
Measurements = new List<ToolingMeasurement>();
1515
CuttingItems = new List<ICuttingItem>();
1616
}
1717

@@ -45,10 +45,10 @@ public ICuttingToolLifeCycle Process()
4545
// Process Measurements
4646
if (!Measurements.IsNullOrEmpty())
4747
{
48-
var measurements = new List<Measurement>();
48+
var measurements = new List<ToolingMeasurement>();
4949
foreach (var measurement in Measurements)
5050
{
51-
var typeMeasurement = Measurement.Create(measurement.Type, measurement);
51+
var typeMeasurement = ToolingMeasurement.Create(measurement.Type, measurement);
5252
if (typeMeasurement != null) measurements.Add(typeMeasurement);
5353
}
5454
lifeCycle.Measurements = measurements;

‎libraries/MTConnect.NET-Common/Assets/CuttingTools/IMeasurement.g.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ namespace MTConnect.Assets.CuttingTools
88
/// </summary>
99
public partial interface IMeasurement
1010
{
11-
/// <summary>
12-
/// Shop specific code for the measurement. ISO 13399 codes **MAY** be used for these codes as well. code values.
13-
/// </summary>
14-
string Code { get; }
11+
///// <summary>
12+
///// Shop specific code for the measurement. ISO 13399 codes **MAY** be used for these codes as well. code values.
13+
///// </summary>
14+
//string Code { get; }
1515

1616
/// <summary>
1717
/// Maximum value for the measurement.

‎libraries/MTConnect.NET-Common/Assets/CuttingTools/IToolingMeasurement.g.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace MTConnect.Assets.CuttingTools
66
/// <summary>
77
/// Constrained scalar value associated with a cutting tool.
88
/// </summary>
9-
public interface IToolingMeasurement : IMeasurement
9+
public partial interface IToolingMeasurement : IMeasurement
1010
{
1111
/// <summary>
1212
/// Shop specific code for the measurement. ISO 13399 codes **MAY** be used for these codes as well. code values.

‎libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurement.cs‎

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
// Copyright (c) 2023 TrakHound Inc., All Rights Reserved.
1+
// Copyright (c) 2025 TrakHound Inc., All Rights Reserved.
22
// TrakHound Inc. licenses this file to you under the MIT license.
33

4-
// MTConnect SysML v2.2 : UML ID = EAID_C09F377D_8946_421b_B746_E23C01D97EAC
5-
6-
using MTConnect.Assets.CuttingTools.Measurements;
4+
//using MTConnect.Assets.CuttingTools.Measurements;
75

86
namespace MTConnect.Assets.CuttingTools
97
{
@@ -27,53 +25,53 @@ public Measurement(IMeasurement measurement)
2725
}
2826
}
2927

30-
public static Measurement Create(string type, IMeasurement measurement)
31-
{
32-
if (!string.IsNullOrEmpty(type))
33-
{
34-
switch (type)
35-
{
36-
// Common
37-
case FunctionalLengthMeasurement.TypeId: return new FunctionalLengthMeasurement(measurement);
38-
case WeightMeasurement.TypeId: return new WeightMeasurement(measurement);
28+
//public static Measurement Create(string type, IMeasurement measurement)
29+
//{
30+
// if (!string.IsNullOrEmpty(type))
31+
// {
32+
// switch (type)
33+
// {
34+
// // Common
35+
// case FunctionalLengthMeasurement.TypeId: return new FunctionalLengthMeasurement(measurement);
36+
// case WeightMeasurement.TypeId: return new WeightMeasurement(measurement);
3937

40-
// Assembly
41-
case BodyDiameterMaxMeasurement.TypeId: return new BodyDiameterMaxMeasurement(measurement);
42-
case BodyLengthMaxMeasurement.TypeId: return new BodyLengthMaxMeasurement(measurement);
43-
case DepthOfCutMaxMeasurement.TypeId: return new DepthOfCutMaxMeasurement(measurement);
44-
case CuttingDiameterMaxMeasurement.TypeId: return new CuttingDiameterMaxMeasurement(measurement);
45-
case FlangeDiameterMaxMeasurement.TypeId: return new FlangeDiameterMaxMeasurement(measurement);
46-
case OverallToolLengthMeasurement.TypeId: return new OverallToolLengthMeasurement(measurement);
47-
case ShankDiameterMeasurement.TypeId: return new ShankDiameterMeasurement(measurement);
48-
case ShankHeightMeasurement.TypeId: return new ShankHeightMeasurement(measurement);
49-
case ShankLengthMeasurement.TypeId: return new ShankLengthMeasurement(measurement);
50-
case UsableLengthMaxMeasurement.TypeId: return new UsableLengthMaxMeasurement(measurement);
51-
case ProtrudingLengthMeasurement.TypeId: return new ProtrudingLengthMeasurement(measurement);
38+
// // Assembly
39+
// case BodyDiameterMaxMeasurement.TypeId: return new BodyDiameterMaxMeasurement(measurement);
40+
// case BodyLengthMaxMeasurement.TypeId: return new BodyLengthMaxMeasurement(measurement);
41+
// case DepthOfCutMaxMeasurement.TypeId: return new DepthOfCutMaxMeasurement(measurement);
42+
// case CuttingDiameterMaxMeasurement.TypeId: return new CuttingDiameterMaxMeasurement(measurement);
43+
// case FlangeDiameterMaxMeasurement.TypeId: return new FlangeDiameterMaxMeasurement(measurement);
44+
// case OverallToolLengthMeasurement.TypeId: return new OverallToolLengthMeasurement(measurement);
45+
// case ShankDiameterMeasurement.TypeId: return new ShankDiameterMeasurement(measurement);
46+
// case ShankHeightMeasurement.TypeId: return new ShankHeightMeasurement(measurement);
47+
// case ShankLengthMeasurement.TypeId: return new ShankLengthMeasurement(measurement);
48+
// case UsableLengthMaxMeasurement.TypeId: return new UsableLengthMaxMeasurement(measurement);
49+
// case ProtrudingLengthMeasurement.TypeId: return new ProtrudingLengthMeasurement(measurement);
5250

53-
// Cutting Item
54-
case ChamferFlatLengthMeasurement.TypeId: return new ChamferFlatLengthMeasurement(measurement);
55-
case ChamferWidthMeasurement.TypeId: return new ChamferWidthMeasurement(measurement);
56-
case CornerRadiusMeasurement.TypeId: return new CornerRadiusMeasurement(measurement);
57-
case CuttingDiameterMeasurement.TypeId: return new CuttingDiameterMeasurement(measurement);
58-
case CuttingEdgeLengthMeasurement.TypeId: return new CuttingEdgeLengthMeasurement(measurement);
59-
case CuttingHeightMeasurement.TypeId: return new CuttingHeightMeasurement(measurement);
60-
case CuttingReferencePointMeasurement.TypeId: return new CuttingReferencePointMeasurement(measurement);
61-
case DriveAngleMeasurement.TypeId: return new DriveAngleMeasurement(measurement);
62-
case FlangeDiameterMeasurement.TypeId: return new FlangeDiameterMeasurement(measurement);
63-
case FunctionalWidthMeasurement.TypeId: return new FunctionalWidthMeasurement(measurement);
64-
case IncribedCircleDiameterMeasurement.TypeId: return new IncribedCircleDiameterMeasurement(measurement);
65-
case InsertWidthMeasurement.TypeId: return new InsertWidthMeasurement(measurement);
66-
case PointAngleMeasurement.TypeId: return new PointAngleMeasurement(measurement);
67-
case StepDiameterLengthMeasurement.TypeId: return new StepDiameterLengthMeasurement(measurement);
68-
case StepIncludedAngleMeasurement.TypeId: return new StepIncludedAngleMeasurement(measurement);
69-
case ToolCuttingEdgeAngleMeasurement.TypeId: return new ToolCuttingEdgeAngleMeasurement(measurement);
70-
case ToolLeadAngleMeasurement.TypeId: return new ToolLeadAngleMeasurement(measurement);
71-
case ToolOrientationMeasurement.TypeId: return new ToolOrientationMeasurement(measurement);
72-
case WiperEdgeLengthMeasurement.TypeId: return new WiperEdgeLengthMeasurement(measurement);
73-
}
74-
}
51+
// // Cutting Item
52+
// case ChamferFlatLengthMeasurement.TypeId: return new ChamferFlatLengthMeasurement(measurement);
53+
// case ChamferWidthMeasurement.TypeId: return new ChamferWidthMeasurement(measurement);
54+
// case CornerRadiusMeasurement.TypeId: return new CornerRadiusMeasurement(measurement);
55+
// case CuttingDiameterMeasurement.TypeId: return new CuttingDiameterMeasurement(measurement);
56+
// case CuttingEdgeLengthMeasurement.TypeId: return new CuttingEdgeLengthMeasurement(measurement);
57+
// case CuttingHeightMeasurement.TypeId: return new CuttingHeightMeasurement(measurement);
58+
// case CuttingReferencePointMeasurement.TypeId: return new CuttingReferencePointMeasurement(measurement);
59+
// case DriveAngleMeasurement.TypeId: return new DriveAngleMeasurement(measurement);
60+
// case FlangeDiameterMeasurement.TypeId: return new FlangeDiameterMeasurement(measurement);
61+
// case FunctionalWidthMeasurement.TypeId: return new FunctionalWidthMeasurement(measurement);
62+
// case IncribedCircleDiameterMeasurement.TypeId: return new IncribedCircleDiameterMeasurement(measurement);
63+
// case InsertWidthMeasurement.TypeId: return new InsertWidthMeasurement(measurement);
64+
// case PointAngleMeasurement.TypeId: return new PointAngleMeasurement(measurement);
65+
// case StepDiameterLengthMeasurement.TypeId: return new StepDiameterLengthMeasurement(measurement);
66+
// case StepIncludedAngleMeasurement.TypeId: return new StepIncludedAngleMeasurement(measurement);
67+
// case ToolCuttingEdgeAngleMeasurement.TypeId: return new ToolCuttingEdgeAngleMeasurement(measurement);
68+
// case ToolLeadAngleMeasurement.TypeId: return new ToolLeadAngleMeasurement(measurement);
69+
// case ToolOrientationMeasurement.TypeId: return new ToolOrientationMeasurement(measurement);
70+
// case WiperEdgeLengthMeasurement.TypeId: return new WiperEdgeLengthMeasurement(measurement);
71+
// }
72+
// }
7573

76-
return new Measurement(measurement);
77-
}
74+
// return new Measurement(measurement);
75+
//}
7876
}
7977
}

‎libraries/MTConnect.NET-Common/Assets/CuttingTools/Measurements/BodyDiameterMaxMeasurement.g.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace MTConnect.Assets.CuttingTools.Measurements
66
/// <summary>
77
/// Largest diameter of the body of a tool item.
88
/// </summary>
9-
public class BodyDiameterMaxMeasurement : Measurement
9+
public class BodyDiameterMaxMeasurement : ToolingMeasurement
1010
{
1111
public const string TypeId = "BodyDiameterMax";
1212
public const string CodeId = "BDX";
@@ -27,7 +27,7 @@ public BodyDiameterMaxMeasurement(double value)
2727

2828
}
2929

30-
public BodyDiameterMaxMeasurement(IMeasurement measurement) : base(measurement)
30+
public BodyDiameterMaxMeasurement(IToolingMeasurement measurement) : base(measurement)
3131
{
3232
Type = TypeId;
3333
Code = CodeId;

0 commit comments

Comments
 (0)