Skip to content

Commit 88f4c16

Browse files
committed
WIP: Testing
1 parent 7f09eee commit 88f4c16

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

Opc.Ua.ModelCompiler/ModelDesign.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
* http://opcfoundation.org/License/MIT/1.00/
2828
* ======================================================================*/
2929

30+
using Opc.Ua;
3031
using System.Xml;
3132
using System.Xml.Serialization;
32-
using Opc.Ua;
3333
using Export = Opc.Ua.Export;
3434

3535
namespace ModelCompiler
@@ -49,7 +49,7 @@ public partial class ModelDesign
4949
public bool IsSourceNodeSet;
5050

5151
[XmlIgnore()]
52-
public Dictionary<string,Export.ModelTableEntry> Dependencies;
52+
public Dictionary<string, Export.ModelTableEntry> Dependencies;
5353
}
5454

5555
public partial class LocalizedText
@@ -61,8 +61,8 @@ public partial class LocalizedText
6161
public class HierarchyNode : IFormattable
6262
{
6363
public string RelativePath;
64-
public NodeDesign Instance;
65-
public List<NodeDesign> OverriddenNodes;
64+
public NodeDesign Instance { get; set; }
65+
public List<NodeDesign> OverriddenNodes { get; set; }
6666
public bool ExplicitlyDefined;
6767
public bool AdHocInstance;
6868
public bool StaticValue;
@@ -102,7 +102,7 @@ public class HierarchyReference : IFormattable
102102
public XmlQualifiedName ReferenceType;
103103
public bool IsInverse;
104104
public string TargetPath;
105-
public XmlQualifiedName TargetId;
105+
public XmlQualifiedName TargetId { get; set; }
106106
public bool DefinedOnType;
107107

108108
/// <summary>
@@ -155,7 +155,7 @@ public partial class NodeDesign : IFormattable
155155
public bool HasReferences;
156156

157157
[XmlIgnore()]
158-
public NodeState State;
158+
public NodeState State { get; set; }
159159

160160
[XmlIgnore()]
161161
public NodeState InstanceState;

Opc.Ua.ModelCompiler/Program.cs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using ModelCompiler;
2-
using McMaster.Extensions.CommandLineUtils;
3-
using System.Reflection;
1+
using McMaster.Extensions.CommandLineUtils;
2+
using ModelCompiler;
43
using System.Diagnostics;
4+
using System.Reflection;
55

66
try
77
{
@@ -33,29 +33,29 @@
3333
// "UAModel.DI"
3434
//};
3535

36-
string[] args2 = {
37-
"compile",
38-
"-version",
39-
"v105",
40-
"-d2",
41-
@"D:\Work\OPC\UA-ModelCompiler\Opc.Ua.ModelCompiler\Design.v105\DemoModel.xml",
42-
"-d2",
43-
@"D:\Work\OPC\nodesets\public\UAFX\opc.ua.fx.ac.nodeset2.xml,Opc.UAFX.AC,Opc.UAFX.AC",
44-
"-d2",
45-
@"D:\Work\OPC\nodesets\public\UAFX\opc.ua.fx.cm.nodeset2.xml,Opc.UAFX.CM,Opc.UAFX.CM",
46-
"-d2",
47-
@"D:\Work\OPC\nodesets\public\UAFX\opc.ua.fx.data.nodeset2.xml,Opc.UAFX.Data,Opc.UAFX.Data",
48-
"-d2",
49-
@"D:\Work\OPC\nodesets\public\DI\Opc.Ua.Di.NodeSet2.xml,Opc.Ua.Di,Opc.Ua.Di",
50-
"-cg",
51-
@"D:\Work\OPC\UA-ModelCompiler\Opc.Ua.ModelCompiler\CSVs\DemoModel.csv",
52-
"-o2",
53-
@"D:\Work\OPC\UA-ModelCompiler\Tests\DemoModel\Models\"
54-
};
36+
//string[] args2 = {
37+
// "compile",
38+
// "-version",
39+
// "v105",
40+
// "-d2",
41+
// @"D:\Work\OPC\UA-ModelCompiler\Opc.Ua.ModelCompiler\Design.v105\DemoModel.xml",
42+
// "-d2",
43+
// @"D:\Work\OPC\nodesets\public\UAFX\opc.ua.fx.ac.nodeset2.xml,Opc.UAFX.AC,Opc.UAFX.AC",
44+
// "-d2",
45+
// @"D:\Work\OPC\nodesets\public\UAFX\opc.ua.fx.cm.nodeset2.xml,Opc.UAFX.CM,Opc.UAFX.CM",
46+
// "-d2",
47+
// @"D:\Work\OPC\nodesets\public\UAFX\opc.ua.fx.data.nodeset2.xml,Opc.UAFX.Data,Opc.UAFX.Data",
48+
// "-d2",
49+
// @"D:\Work\OPC\nodesets\public\DI\Opc.Ua.Di.NodeSet2.xml,Opc.Ua.Di,Opc.Ua.Di",
50+
// "-cg",
51+
// @"D:\Work\OPC\UA-ModelCompiler\Opc.Ua.ModelCompiler\CSVs\DemoModel.csv",
52+
// "-o2",
53+
// @"D:\Work\OPC\UA-ModelCompiler\Tests\DemoModel\Models\"
54+
//};
5555

56-
ModelCompilerApplication.Run(args2);
56+
//ModelCompilerApplication.Run(args2);
5757

58-
return;
58+
//return;
5959
}
6060

6161
for (int ii = 0; ii < args.Length; ii++)

0 commit comments

Comments
 (0)