diff --git a/SCADA/Example/CoreTest.exe b/SCADA/Example/CoreTest.exe index 849a0d2..413a9ae 100644 Binary files a/SCADA/Example/CoreTest.exe and b/SCADA/Example/CoreTest.exe differ diff --git a/SCADA/Program/BatchCoreService/DAService.cs b/SCADA/Program/BatchCoreService/DAService.cs index 6cb401b..cbdc38f 100644 --- a/SCADA/Program/BatchCoreService/DAService.cs +++ b/SCADA/Program/BatchCoreService/DAService.cs @@ -1485,7 +1485,9 @@ namespace BatchCoreService byte[] dt = BitConverter.GetBytes(id); sendBuffer[j++] = dt[0]; sendBuffer[j++] = dt[1]; - switch (_list[GetItemProperties(id)].DataType) + var index = GetItemProperties(id); + if (index < 0 || index >= _list.Count) continue; + switch (_list[index].DataType) { case DataType.BOOL: sendBuffer[j++] = 1; diff --git a/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.dll b/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.dll index 9597c45..ec707a0 100644 Binary files a/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.dll and b/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.dll differ diff --git a/SCADA/Program/ClientDriver/bin/Debug/DataService.dll b/SCADA/Program/ClientDriver/bin/Debug/DataService.dll index e6b1419..5448fee 100644 Binary files a/SCADA/Program/ClientDriver/bin/Debug/DataService.dll and b/SCADA/Program/ClientDriver/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/ClientDriver/bin/Release/ClientDriver.dll b/SCADA/Program/ClientDriver/bin/Release/ClientDriver.dll index cfc4d0b..89e3660 100644 Binary files a/SCADA/Program/ClientDriver/bin/Release/ClientDriver.dll and b/SCADA/Program/ClientDriver/bin/Release/ClientDriver.dll differ diff --git a/SCADA/Program/ClientDriver/bin/Release/DataService.dll b/SCADA/Program/ClientDriver/bin/Release/DataService.dll index 92a15c1..4b7753f 100644 Binary files a/SCADA/Program/ClientDriver/bin/Release/DataService.dll and b/SCADA/Program/ClientDriver/bin/Release/DataService.dll differ diff --git a/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.dll b/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.dll index 9597c45..ec707a0 100644 Binary files a/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.dll and b/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.dll differ diff --git a/SCADA/Program/CoreTest/obj/x86/Release/build.force b/SCADA/Program/ClientDriver/obj/Debug/build.force similarity index 100% rename from SCADA/Program/CoreTest/obj/x86/Release/build.force rename to SCADA/Program/ClientDriver/obj/Debug/build.force diff --git a/SCADA/Program/ClientDriver/obj/Release/ClientDriver.dll b/SCADA/Program/ClientDriver/obj/Release/ClientDriver.dll index cfc4d0b..89e3660 100644 Binary files a/SCADA/Program/ClientDriver/obj/Release/ClientDriver.dll and b/SCADA/Program/ClientDriver/obj/Release/ClientDriver.dll differ diff --git a/SCADA/Program/CoreTest/MainWindow.xaml.cs b/SCADA/Program/CoreTest/MainWindow.xaml.cs index 600dfa0..5b942a8 100644 --- a/SCADA/Program/CoreTest/MainWindow.xaml.cs +++ b/SCADA/Program/CoreTest/MainWindow.xaml.cs @@ -163,10 +163,11 @@ namespace CoreTest ContentControl ctrl = Activator.CreateInstance(Type.GetType(txt)) as ContentControl; if (ctrl != null) { - ScaleControl(ctrl); + var win = ctrl as Window; + if (win == null) + ScaleControl(ctrl); ctrl.Loaded += new RoutedEventHandler(ctrl_Loaded); ctrl.Unloaded += new RoutedEventHandler(ctrl_Unloaded); - var win = ctrl as Window; if (win != null) { win.Owner = this; diff --git a/SCADA/Program/CoreTest/bin/Debug/ClientDriver.dll b/SCADA/Program/CoreTest/bin/Debug/ClientDriver.dll index fb79ea2..ec707a0 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/ClientDriver.dll and b/SCADA/Program/CoreTest/bin/Debug/ClientDriver.dll differ diff --git a/SCADA/Program/CoreTest/bin/Debug/CoreTest.exe b/SCADA/Program/CoreTest/bin/Debug/CoreTest.exe index 34446ce..6dabecd 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/CoreTest.exe and b/SCADA/Program/CoreTest/bin/Debug/CoreTest.exe differ diff --git a/SCADA/Program/CoreTest/bin/Debug/DataHelper.dll b/SCADA/Program/CoreTest/bin/Debug/DataHelper.dll index c1a5905..a3209be 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/DataHelper.dll and b/SCADA/Program/CoreTest/bin/Debug/DataHelper.dll differ diff --git a/SCADA/Program/CoreTest/bin/Debug/DataService.dll b/SCADA/Program/CoreTest/bin/Debug/DataService.dll index 1408689..5448fee 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/DataService.dll and b/SCADA/Program/CoreTest/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/CoreTest/bin/Debug/HMIControl.dll b/SCADA/Program/CoreTest/bin/Debug/HMIControl.dll index 638a805..925f724 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/HMIControl.dll and b/SCADA/Program/CoreTest/bin/Debug/HMIControl.dll differ diff --git a/SCADA/Program/CoreTest/bin/Release/ClientDriver.dll b/SCADA/Program/CoreTest/bin/Release/ClientDriver.dll index 4b62ae8..89e3660 100644 Binary files a/SCADA/Program/CoreTest/bin/Release/ClientDriver.dll and b/SCADA/Program/CoreTest/bin/Release/ClientDriver.dll differ diff --git a/SCADA/Program/CoreTest/bin/Release/CoreTest.exe b/SCADA/Program/CoreTest/bin/Release/CoreTest.exe index 849a0d2..413a9ae 100644 Binary files a/SCADA/Program/CoreTest/bin/Release/CoreTest.exe and b/SCADA/Program/CoreTest/bin/Release/CoreTest.exe differ diff --git a/SCADA/Program/CoreTest/bin/Release/CoreTest.vshost.exe b/SCADA/Program/CoreTest/bin/Release/CoreTest.vshost.exe new file mode 100644 index 0000000..681ab77 Binary files /dev/null and b/SCADA/Program/CoreTest/bin/Release/CoreTest.vshost.exe differ diff --git a/SCADA/Program/CoreTest/bin/Debug/CoreTest.vshost.exe.manifest b/SCADA/Program/CoreTest/bin/Release/CoreTest.vshost.exe.manifest similarity index 100% rename from SCADA/Program/CoreTest/bin/Debug/CoreTest.vshost.exe.manifest rename to SCADA/Program/CoreTest/bin/Release/CoreTest.vshost.exe.manifest diff --git a/SCADA/Program/CoreTest/bin/Release/DataHelper.dll b/SCADA/Program/CoreTest/bin/Release/DataHelper.dll index 4d6a26a..b4fba23 100644 Binary files a/SCADA/Program/CoreTest/bin/Release/DataHelper.dll and b/SCADA/Program/CoreTest/bin/Release/DataHelper.dll differ diff --git a/SCADA/Program/CoreTest/bin/Release/DataService.dll b/SCADA/Program/CoreTest/bin/Release/DataService.dll index 9b150f2..4b7753f 100644 Binary files a/SCADA/Program/CoreTest/bin/Release/DataService.dll and b/SCADA/Program/CoreTest/bin/Release/DataService.dll differ diff --git a/SCADA/Program/CoreTest/bin/Release/HMIControl.dll b/SCADA/Program/CoreTest/bin/Release/HMIControl.dll index be6ff9d..50438a3 100644 Binary files a/SCADA/Program/CoreTest/bin/Release/HMIControl.dll and b/SCADA/Program/CoreTest/bin/Release/HMIControl.dll differ diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.exe b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.exe index 34446ce..6dabecd 100644 Binary files a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.exe and b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.exe differ diff --git a/SCADA/Program/CoreTest/obj/x86/Release/CoreTest.exe b/SCADA/Program/CoreTest/obj/x86/Release/CoreTest.exe index 849a0d2..413a9ae 100644 Binary files a/SCADA/Program/CoreTest/obj/x86/Release/CoreTest.exe and b/SCADA/Program/CoreTest/obj/x86/Release/CoreTest.exe differ diff --git a/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll b/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll index 93aaf89..a3209be 100644 Binary files a/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll and b/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll differ diff --git a/SCADA/Program/DataHelper/bin/Debug/DataService.dll b/SCADA/Program/DataHelper/bin/Debug/DataService.dll index e6b1419..5448fee 100644 Binary files a/SCADA/Program/DataHelper/bin/Debug/DataService.dll and b/SCADA/Program/DataHelper/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/DataHelper/bin/Release/DataHelper.dll b/SCADA/Program/DataHelper/bin/Release/DataHelper.dll index 39f7d88..b4fba23 100644 Binary files a/SCADA/Program/DataHelper/bin/Release/DataHelper.dll and b/SCADA/Program/DataHelper/bin/Release/DataHelper.dll differ diff --git a/SCADA/Program/DataHelper/bin/Release/DataService.dll b/SCADA/Program/DataHelper/bin/Release/DataService.dll index 92a15c1..4b7753f 100644 Binary files a/SCADA/Program/DataHelper/bin/Release/DataService.dll and b/SCADA/Program/DataHelper/bin/Release/DataService.dll differ diff --git a/SCADA/Program/DataHelper/obj/Debug/DataHelper.dll b/SCADA/Program/DataHelper/obj/Debug/DataHelper.dll index 93aaf89..a3209be 100644 Binary files a/SCADA/Program/DataHelper/obj/Debug/DataHelper.dll and b/SCADA/Program/DataHelper/obj/Debug/DataHelper.dll differ diff --git a/SCADA/Program/DataHelper/obj/Debug/build.force b/SCADA/Program/DataHelper/obj/Debug/build.force new file mode 100644 index 0000000..e69de29 diff --git a/SCADA/Program/DataHelper/obj/Release/DataHelper.dll b/SCADA/Program/DataHelper/obj/Release/DataHelper.dll index 39f7d88..b4fba23 100644 Binary files a/SCADA/Program/DataHelper/obj/Release/DataHelper.dll and b/SCADA/Program/DataHelper/obj/Release/DataHelper.dll differ diff --git a/SCADA/Program/DataService/bin/Debug/DataService.dll b/SCADA/Program/DataService/bin/Debug/DataService.dll index e6b1419..5448fee 100644 Binary files a/SCADA/Program/DataService/bin/Debug/DataService.dll and b/SCADA/Program/DataService/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/DataService/bin/Release/DataService.dll b/SCADA/Program/DataService/bin/Release/DataService.dll index 92a15c1..4b7753f 100644 Binary files a/SCADA/Program/DataService/bin/Release/DataService.dll and b/SCADA/Program/DataService/bin/Release/DataService.dll differ diff --git a/SCADA/Program/DataService/obj/Debug/DataService.csproj.FileListAbsolute.txt b/SCADA/Program/DataService/obj/Debug/DataService.csproj.FileListAbsolute.txt index b9907a5..b499287 100644 --- a/SCADA/Program/DataService/obj/Debug/DataService.csproj.FileListAbsolute.txt +++ b/SCADA/Program/DataService/obj/Debug/DataService.csproj.FileListAbsolute.txt @@ -20,6 +20,6 @@ E:\Project\牧羊上位机\WpfApplication1\obj\Debug\DataService.dll E:\Project\牧羊上位机\WpfApplication1\obj\Debug\DataService.pdb C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Debug\DataService.dll C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Debug\DataService.pdb -C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Debug\DataService.csprojResolveAssemblyReference.cache C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Debug\DataService.dll C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Debug\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Debug\DataService.csprojResolveAssemblyReference.cache diff --git a/SCADA/Program/DataService/obj/Debug/DataService.dll b/SCADA/Program/DataService/obj/Debug/DataService.dll index e6b1419..5448fee 100644 Binary files a/SCADA/Program/DataService/obj/Debug/DataService.dll and b/SCADA/Program/DataService/obj/Debug/DataService.dll differ diff --git a/SCADA/Program/DataService/obj/Release/DataService.csproj.FileListAbsolute.txt b/SCADA/Program/DataService/obj/Release/DataService.csproj.FileListAbsolute.txt index c9dd33d..6b4b653 100644 --- a/SCADA/Program/DataService/obj/Release/DataService.csproj.FileListAbsolute.txt +++ b/SCADA/Program/DataService/obj/Release/DataService.csproj.FileListAbsolute.txt @@ -98,6 +98,5 @@ F:\牧羊上位机\WpfApplication1\obj\Release\DataService.dll F:\牧羊上位机\WpfApplication1\obj\Release\DataService.pdb C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Release\DataService.dll C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Release\DataService.pdb -C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Release\DataService.csprojResolveAssemblyReference.cache C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Release\DataService.dll C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Release\DataService.pdb diff --git a/SCADA/Program/DataService/obj/Release/DataService.dll b/SCADA/Program/DataService/obj/Release/DataService.dll index 92a15c1..4b7753f 100644 Binary files a/SCADA/Program/DataService/obj/Release/DataService.dll and b/SCADA/Program/DataService/obj/Release/DataService.dll differ diff --git a/SCADA/Program/FileDriver/obj/Debug/build.force b/SCADA/Program/FileDriver/obj/Debug/build.force new file mode 100644 index 0000000..e69de29 diff --git a/SCADA/Program/FileDriver/obj/Release/build.force b/SCADA/Program/FileDriver/obj/Release/build.force new file mode 100644 index 0000000..e69de29 diff --git a/SCADA/Program/HMIControl/bin/Debug/HMIControl.dll b/SCADA/Program/HMIControl/bin/Debug/HMIControl.dll index 6a2e443..925f724 100644 Binary files a/SCADA/Program/HMIControl/bin/Debug/HMIControl.dll and b/SCADA/Program/HMIControl/bin/Debug/HMIControl.dll differ diff --git a/SCADA/Program/HMIControl/bin/Release/HMIControl.dll b/SCADA/Program/HMIControl/bin/Release/HMIControl.dll index 9120fe9..50438a3 100644 Binary files a/SCADA/Program/HMIControl/bin/Release/HMIControl.dll and b/SCADA/Program/HMIControl/bin/Release/HMIControl.dll differ diff --git a/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt b/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt index 0ef08ea..c00a3a0 100644 --- a/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt +++ b/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt @@ -331,7 +331,6 @@ C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\Mi C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\Microsoft.Expression.Drawing.dll C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\Microsoft.Expression.Controls.xml C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\Microsoft.Expression.Drawing.xml -C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csprojResolveAssemblyReference.cache C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\GeneratedInternalTypeHelper.g.cs C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl_MarkupCompile.cache C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl_MarkupCompile.lref @@ -341,3 +340,4 @@ C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HM C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csproj.GenerateResource.Cache C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.dll C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csprojResolveAssemblyReference.cache diff --git a/SCADA/Program/HMIControl/obj/Debug/HMIControl.dll b/SCADA/Program/HMIControl/obj/Debug/HMIControl.dll index 6a2e443..925f724 100644 Binary files a/SCADA/Program/HMIControl/obj/Debug/HMIControl.dll and b/SCADA/Program/HMIControl/obj/Debug/HMIControl.dll differ diff --git a/SCADA/Program/HMIControl/obj/Release/HMIControl.csproj.FileListAbsolute.txt b/SCADA/Program/HMIControl/obj/Release/HMIControl.csproj.FileListAbsolute.txt index fbbd4d1..5aa6ae8 100644 --- a/SCADA/Program/HMIControl/obj/Release/HMIControl.csproj.FileListAbsolute.txt +++ b/SCADA/Program/HMIControl/obj/Release/HMIControl.csproj.FileListAbsolute.txt @@ -443,4 +443,3 @@ C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\ C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.csproj.GenerateResource.Cache C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.dll C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.pdb -C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.csprojResolveAssemblyReference.cache diff --git a/SCADA/Program/HMIControl/obj/Release/HMIControl.dll b/SCADA/Program/HMIControl/obj/Release/HMIControl.dll index 9120fe9..50438a3 100644 Binary files a/SCADA/Program/HMIControl/obj/Release/HMIControl.dll and b/SCADA/Program/HMIControl/obj/Release/HMIControl.dll differ diff --git a/SCADA/Program/LinkableControlDesignTime/obj/Debug/build.force b/SCADA/Program/LinkableControlDesignTime/obj/Debug/build.force new file mode 100644 index 0000000..e69de29 diff --git a/SCADA/Program/LinkableControlDesignTime/obj/Release/build.force b/SCADA/Program/LinkableControlDesignTime/obj/Release/build.force new file mode 100644 index 0000000..e69de29 diff --git a/SCADA/Program/ModbusDriver/obj/Debug/build.force b/SCADA/Program/ModbusDriver/obj/Debug/build.force new file mode 100644 index 0000000..e69de29 diff --git a/SCADA/Program/ModbusDriver/obj/Release/build.force b/SCADA/Program/ModbusDriver/obj/Release/build.force new file mode 100644 index 0000000..e69de29 diff --git a/SCADA/Program/OPCDriver/obj/Debug/build.force b/SCADA/Program/OPCDriver/obj/Debug/build.force new file mode 100644 index 0000000..e69de29 diff --git a/SCADA/Program/OPCDriver/obj/Release/build.force b/SCADA/Program/OPCDriver/obj/Release/build.force new file mode 100644 index 0000000..e69de29 diff --git a/SCADA/Program/SiemensPLCDriver/obj/Debug/build.force b/SCADA/Program/SiemensPLCDriver/obj/Debug/build.force new file mode 100644 index 0000000..e69de29 diff --git a/SCADA/Program/SiemensPLCDriver/obj/Release/build.force b/SCADA/Program/SiemensPLCDriver/obj/Release/build.force new file mode 100644 index 0000000..e69de29