RYTEC
/
libiec61850
mirror of https://github.com/mz-automation/libiec61850.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean code

Browse Source
v1.6
Maxson Ramon dos Anjos Medeiros 3 months ago
parent 1cda600ea1
commit 7a0070ac6b
5 changed files with 41 additions and 47 deletions
Show Stats Download Patch File Download Diff File

5
tools/model_generator_dotnet/DynamicModelGenerator/DynamicModel.cs
Unescape Escape View File

@ -3,7 +3,6 @@ using IEC61850.SCL.DataModel;
using System;
using System.IO;
using System.Linq;
using System.Xml;
namespace DynamicModel
{
@ -50,10 +49,10 @@ namespace DynamicModel
}
}
catch (Exception ex)
{
{
Console.Write(ex.ToString());
}
}
}
}

60
tools/model_generator_dotnet/SCLParser/src/DynamicModelGenerator.cs
Unescape Escape View File

@ -9,8 +9,6 @@
using IEC61850.SCL.DataModel;
using System;
using System.IO;
using System.Runtime.InteropServices.ComTypes;
using System.Xml.Linq;
namespace IEC61850.SCL
{
@ -228,7 +226,7 @@ namespace IEC61850.SCL
else
output.Write("0 ");
if(smv.SclSMVControl.SmpRate != -1)
if (smv.SclSMVControl.SmpRate != -1)
output.Write(smv.SclSMVControl.SmpRate + " ");
else
output.Write("0 ");
@ -295,8 +293,8 @@ namespace IEC61850.SCL
output.Write(lcb.SclLogControl.TrgOps.GetIntValue() + " ");
}
if(lcb.SclLogControl.IntgPd is null)
if (lcb.SclLogControl.IntgPd is null)
output.Write("0 ");
else
output.Write(lcb.SclLogControl.IntgPd + " ");
@ -422,7 +420,7 @@ namespace IEC61850.SCL
}
}
SclDAI getDAI(object parent, string name)
{
if (parent == null)
@ -439,8 +437,8 @@ namespace IEC61850.SCL
DataObject findDOParent(DataAttribute dataAttribute)
{
DataObject parentObject = null;
while(!(dataAttribute.Parent is DataObject))
while (!(dataAttribute.Parent is DataObject))
{
dataAttribute = dataAttribute.Parent as DataAttribute;
}
@ -448,8 +446,8 @@ namespace IEC61850.SCL
return parentObject;
}
LogicalNode findLNParent(DataObject dataObject)
@ -482,9 +480,9 @@ namespace IEC61850.SCL
SclDAI getDAIInternal(SclSDI sclSDI, DataAttribute dataAttribute)
{
SclDAI returnValue = null;
foreach(SclDAI sclDAI1 in sclSDI.SclDAIs)
foreach (SclDAI sclDAI1 in sclSDI.SclDAIs)
{
if(sclDAI1.Name == dataAttribute.Name)
if (sclDAI1.Name == dataAttribute.Name)
{
if (dataAttribute.ObjRef.EndsWith("." + sclSDI.Name + "." + sclDAI1.Name))
{
@ -520,10 +518,10 @@ namespace IEC61850.SCL
else
{
foreach (SclSDI sclSDI in sclSDI1.SclSDIs)
{
{
string fValue = getSDIValue(dataAttribute, sclSDI);
if (fValue != null)
{
{
value = fValue;
break;
}
@ -547,7 +545,7 @@ namespace IEC61850.SCL
value = sclDAI.Val;
}
else
{
{
foreach (SclSDI sclSDI in sclDOI.SclSDIs)
{
string fValue = getSDIValue(dataAttribute, sclSDI);
@ -557,9 +555,9 @@ namespace IEC61850.SCL
break;
}
}
}
return value;
}
@ -567,7 +565,7 @@ namespace IEC61850.SCL
string getObjRef(string initialString, SclSDI sclSDI)
{
object parent = sclSDI.Parent;
while(!(parent is SclDOI))
while (!(parent is SclDOI))
{
SclSDI sclSDI1 = parent as SclSDI;
parent = sclSDI1.Parent;
@ -639,10 +637,10 @@ namespace IEC61850.SCL
SclSDI sclSDI2 = getSDI(logicalNode, dataObject, sclSDI);
if (sclSDI2 != null)
{
returnValue = sclSDI2;
returnValue = sclSDI2;
break;
}
}
}
@ -655,19 +653,19 @@ namespace IEC61850.SCL
{
SclSDI returnSDI = null;
foreach (SclDOI sclDOI1 in logicalNode.SclElement.DOIs)
{
foreach(SclSDI sclSDI in sclDOI1.SclSDIs)
foreach (SclSDI sclSDI in sclDOI1.SclSDIs)
{
returnSDI = getSDI(logicalNode, dataObject, sclSDI);
if(returnSDI != null)
if (returnSDI != null)
{
break;
}
}
}
if(returnSDI != null)
if (returnSDI != null)
{
break;
}
@ -688,13 +686,13 @@ namespace IEC61850.SCL
if (dataAttribute.AttributeType != AttributeType.CONSTRUCTED)
{
DataObject dataObject = findDOParent(dataAttribute);
LogicalNode logicalNode = findLNParent(dataObject);
SclDOI sclDOI = logicalNode.SclElement.DOIs.Find(x => x.Name == dataObject.Name);
if(sclDOI == null)
if (sclDOI == null)
{
sclDOI = getSDO(logicalNode, dataObject);
}
@ -809,7 +807,7 @@ namespace IEC61850.SCL
if (dataAttribute.Definition.TriggerOptions != null)
{
int trgOpsVal = dataAttribute.Definition.TriggerOptions.GetIntValue();
if (isTransient)
trgOpsVal += 128;
@ -887,7 +885,7 @@ namespace IEC61850.SCL
string arrayIndexStr = mmsVariableName.Substring(arrayStart + 1, arrayEnd);
arrayIndex = int.Parse(arrayIndexStr);
string componentNamePart = mmsVariableName.Substring(arrayEnd + 1);
if ((componentNamePart != null) && (componentNamePart.Length > 0))

12
tools/model_generator_dotnet/StaticModelGenerator/src/C_Structures.cs
Unescape Escape View File

@ -312,7 +312,7 @@ namespace StaticModelGenerator.C_Structures
public override string ToString()
{
string cText = "";
if(arrayIndex == -1)
if (arrayIndex == -1)
cText = "DataObject " + parent + "_" + name + " = {\n";
else
cText = "DataObject " + parent + "_" + name + "_" + arrayIndex + " = {\n";
@ -320,7 +320,7 @@ namespace StaticModelGenerator.C_Structures
cText += " " + ModelNodeType + ",\n";
cText += " \"" + name + "\",\n";
if(arrayIndex != -1)
if (arrayIndex != -1)
cText += " (ModelNode*) &" + parent + "_" + name + ",\n";
else
cText += " (ModelNode*) &" + parent + ",\n";
@ -337,7 +337,7 @@ namespace StaticModelGenerator.C_Structures
cText += " " + elementCount + ",\n";
if(elementCount == 0)
if (elementCount == 0)
cText += " " + arrayIndex + "\n";
else
cText += " 0" + arrayIndex + "\n";
@ -768,7 +768,7 @@ namespace StaticModelGenerator.C_Structures
cText += "SVControlBlock " + externName + " = {\n";
cText += " &" + parent + ",\n";
if(SMVControl.SclSMVControl.Name != null)
if (SMVControl.SclSMVControl.Name != null)
cText += " \"" + SMVControl.Name + index + "\",\n";
else
cText += " NULL,\n";
@ -813,9 +813,9 @@ namespace StaticModelGenerator.C_Structures
cText += " " + SMVControl.SclSMVControl.Multicast.ToString().ToLower() + ",\n";
cText += " " + SMVControl.SclSMVControl.NofASDU + ",\n";
//if(SMVControl.SclSMVControl.SecurityEnabled != null)
// cText += " " + SMVControl.SclSMVControl.SecurityEnabled + ",\n";

3
tools/model_generator_dotnet/StaticModelGenerator/src/StaticModelGenerator.cs
Unescape Escape View File

@ -14,7 +14,6 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Runtime.InteropServices.ComTypes;
using DataSet = IEC61850.SCL.DataModel.DataSet;
namespace StaticModelGenerator
@ -329,7 +328,7 @@ namespace StaticModelGenerator
c_DataObjectStructure.parent = lnRef;
c_DataObjectStructure.name = dataObject.Name;
if(c_DataObjectStructure.arrayIndex != -1)
if (c_DataObjectStructure.arrayIndex != -1)
c_DataObjectStructure.name = dataObject.Name + "_" + c_DataObjectStructure.arrayIndex;
else
c_DataObjectStructure.objRef = lnRef + "_" + dataObject.Name;

8
tools/model_generator_dotnet/Tools/Program.cs
Unescape Escape View File

@ -6,8 +6,6 @@
* All rights reserved.
*/
using StaticModelGenerator;
namespace modeGenerator_example
{
@ -122,11 +120,11 @@ namespace modeGenerator_example
Console.WriteLine("Wrong option, parse 1 or 2 \n" +
"Usage: Static Model (1) \n Dynamic Model (2) \n <generator option> <ICD file> [-ied <ied-name>] [-ap <access-point-name>] [-out <output-name>] [-modelprefix <model-prefix>]");
}
}
}
}
}
Write Preview
Loading…
Cancel
Save