diff --git a/SCADA/TagConfig/TagConfig/bin/Release/TagConfig.vshost.exe.manifest b/SCADA/Program/CoreTest/bin/Debug/CoreTest.vshost.exe.manifest similarity index 100% rename from SCADA/TagConfig/TagConfig/bin/Release/TagConfig.vshost.exe.manifest rename to SCADA/Program/CoreTest/bin/Debug/CoreTest.vshost.exe.manifest diff --git a/SCADA/TagConfig/TagConfig.exe b/SCADA/TagConfig/TagConfig.exe index 0c9b982..9edae2c 100644 Binary files a/SCADA/TagConfig/TagConfig.exe and b/SCADA/TagConfig/TagConfig.exe differ diff --git a/SCADA/TagConfig/TagConfig/Condition.cs b/SCADA/TagConfig/TagConfig/Condition.cs index ae93b0e..c5c31e4 100644 --- a/SCADA/TagConfig/TagConfig/Condition.cs +++ b/SCADA/TagConfig/TagConfig/Condition.cs @@ -265,7 +265,7 @@ namespace TagConfig public class SubCondition : IComparable { bool _enabled; - int _id,_severity, _condId, _subType; + int _severity, _condId, _subType; float _threshold; string _message; @@ -284,18 +284,6 @@ namespace TagConfig _condId = condId; } - public int ID - { - get - { - return _id; - } - set - { - _id = value; - } - } - public int ConditionId { get diff --git a/SCADA/TagConfig/TagConfig/TagData.cs b/SCADA/TagConfig/TagConfig/TagData.cs index 9dd0333..e456373 100644 --- a/SCADA/TagConfig/TagConfig/TagData.cs +++ b/SCADA/TagConfig/TagConfig/TagData.cs @@ -1295,7 +1295,7 @@ namespace TagConfig public DataTable GetSchemaTable() { DataTable table = new DataTable("Meta_SubCondition"); - table.Columns.Add("ID", typeof(int)); + //table.Columns.Add("ID", typeof(int)); table.Columns.Add("ConditionID", typeof(int)); table.Columns.Add("SubAlarmType", typeof(int)); table.Columns.Add("Threshold", typeof(float)); @@ -1338,7 +1338,7 @@ namespace TagConfig public int FieldCount { - get { return 7; } + get { return 6; } } public bool GetBoolean(int i) @@ -1400,14 +1400,12 @@ namespace TagConfig case 1: return typeof(int); case 2: - return typeof(int); - case 3: return typeof(float); - case 4: + case 3: return typeof(byte); - case 5: + case 4: return typeof(string); - case 6: + case 5: return typeof(bool); default: return typeof(int); @@ -1443,18 +1441,16 @@ namespace TagConfig switch (i) { case 0: - return "ID"; - case 1: return "ConditionID"; - case 2: + case 1: return "SubAlarmType"; - case 3: + case 2: return "Threshold"; - case 4: + case 3: return "Severity"; - case 5: + case 4: return "Message"; - case 6: + case 5: return "IsEnable"; default: return string.Empty; @@ -1465,20 +1461,18 @@ namespace TagConfig { switch (name) { - case "ID": - return 0; case "ConditionID": - return 1; + return 0; case "SubAlarmType": - return 2; + return 1; case "Threshold": - return 3; + return 2; case "Severity": - return 4; + return 3; case "Message": - return 5; + return 4; case "IsEnable": - return 6; + return 5; default: return -1; } @@ -1494,18 +1488,16 @@ namespace TagConfig switch (i) { case 0: - return _enumer.Current.ID; - case 1: return _enumer.Current.ConditionId; - case 2: + case 1: return _enumer.Current.SubAlarmType; - case 3: + case 2: return _enumer.Current.Threshold; - case 4: + case 3: return _enumer.Current.Severity; - case 5: + case 4: return _enumer.Current.Message; - case 6: + case 5: return _enumer.Current.IsEnabled; default: return null; diff --git a/SCADA/TagConfig/TagConfig/bin/Debug/TagConfig.exe b/SCADA/TagConfig/TagConfig/bin/Debug/TagConfig.exe index 3f17190..3bed2ac 100644 Binary files a/SCADA/TagConfig/TagConfig/bin/Debug/TagConfig.exe and b/SCADA/TagConfig/TagConfig/bin/Debug/TagConfig.exe differ diff --git a/SCADA/TagConfig/TagConfig/bin/Release/TagConfig.exe b/SCADA/TagConfig/TagConfig/bin/Release/TagConfig.exe index 0c9b982..9edae2c 100644 Binary files a/SCADA/TagConfig/TagConfig/bin/Release/TagConfig.exe and b/SCADA/TagConfig/TagConfig/bin/Release/TagConfig.exe differ diff --git a/SCADA/TagConfig/TagConfig/obj/x86/Debug/TagConfig.csproj.FileListAbsolute.txt b/SCADA/TagConfig/TagConfig/obj/x86/Debug/TagConfig.csproj.FileListAbsolute.txt index 4906143..973d2ee 100644 --- a/SCADA/TagConfig/TagConfig/obj/x86/Debug/TagConfig.csproj.FileListAbsolute.txt +++ b/SCADA/TagConfig/TagConfig/obj/x86/Debug/TagConfig.csproj.FileListAbsolute.txt @@ -95,3 +95,18 @@ E:\SCADA\TagConfig\TagConfig\obj\x86\Debug\TagConfig.DriverSet.resources E:\SCADA\TagConfig\TagConfig\obj\x86\Debug\TagConfig.GroupParam.resources E:\SCADA\TagConfig\TagConfig\obj\x86\Debug\TagConfig.Properties.Resources.resources E:\SCADA\TagConfig\TagConfig\obj\x86\Debug\TagConfig.csproj.GenerateResource.Cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\bin\Debug\TagConfig.exe.config +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Debug\TagConfig.exe +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Debug\TagConfig.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\bin\Debug\TagConfig.exe +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\bin\Debug\TagConfig.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Debug\TagConfig.AlarmForm.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Debug\TagConfig.AlarmParam.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Debug\TagConfig.Form1.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Debug\TagConfig.RegisterSet.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Debug\TagConfig.ScaleParam.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Debug\TagConfig.TagParam.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Debug\TagConfig.DriverSet.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Debug\TagConfig.GroupParam.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Debug\TagConfig.Properties.Resources.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Debug\TagConfig.csproj.GenerateResource.Cache diff --git a/SCADA/TagConfig/TagConfig/obj/x86/Debug/TagConfig.exe b/SCADA/TagConfig/TagConfig/obj/x86/Debug/TagConfig.exe index 3f17190..3bed2ac 100644 Binary files a/SCADA/TagConfig/TagConfig/obj/x86/Debug/TagConfig.exe and b/SCADA/TagConfig/TagConfig/obj/x86/Debug/TagConfig.exe differ diff --git a/SCADA/TagConfig/TagConfig/obj/x86/Release/TagConfig.csproj.FileListAbsolute.txt b/SCADA/TagConfig/TagConfig/obj/x86/Release/TagConfig.csproj.FileListAbsolute.txt index 001c2c4..fc29f56 100644 --- a/SCADA/TagConfig/TagConfig/obj/x86/Release/TagConfig.csproj.FileListAbsolute.txt +++ b/SCADA/TagConfig/TagConfig/obj/x86/Release/TagConfig.csproj.FileListAbsolute.txt @@ -184,3 +184,18 @@ E:\SCADA\TagConfig\TagConfig\obj\x86\Release\TagConfig.DriverSet.resources E:\SCADA\TagConfig\TagConfig\obj\x86\Release\TagConfig.GroupParam.resources E:\SCADA\TagConfig\TagConfig\obj\x86\Release\TagConfig.Properties.Resources.resources E:\SCADA\TagConfig\TagConfig\obj\x86\Release\TagConfig.csproj.GenerateResource.Cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\bin\Release\TagConfig.exe.config +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Release\TagConfig.exe +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Release\TagConfig.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\bin\Release\TagConfig.exe +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\bin\Release\TagConfig.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Release\TagConfig.AlarmForm.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Release\TagConfig.AlarmParam.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Release\TagConfig.Form1.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Release\TagConfig.RegisterSet.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Release\TagConfig.ScaleParam.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Release\TagConfig.TagParam.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Release\TagConfig.DriverSet.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Release\TagConfig.GroupParam.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Release\TagConfig.Properties.Resources.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\obj\x86\Release\TagConfig.csproj.GenerateResource.Cache diff --git a/SCADA/TagConfig/TagConfig/obj/x86/Release/TagConfig.exe b/SCADA/TagConfig/TagConfig/obj/x86/Release/TagConfig.exe index 0c9b982..9edae2c 100644 Binary files a/SCADA/TagConfig/TagConfig/obj/x86/Release/TagConfig.exe and b/SCADA/TagConfig/TagConfig/obj/x86/Release/TagConfig.exe differ