Browse Source

update code

pull/8/head
Tony Shou 7 years ago
parent
commit
05ec999d9a
  1. 26
      .gitignore
  2. BIN
      SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.csprojAssemblyReference.cache
  3. BIN
      SCADA/Program/ClientDriver/obj/Debug/ClientDriver.csprojAssemblyReference.cache
  4. 2
      SCADA/Program/CoreTest/obj/x86/Debug/Example.csproj.CoreCompileInputs.cache
  5. BIN
      SCADA/Program/CoreTest/obj/x86/Debug/Example.csprojAssemblyReference.cache
  6. 62
      SCADA/Program/CoreTest/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs
  7. 2
      SCADA/Program/CoreTest/obj/x86/Debug/Login.g.cs
  8. 2
      SCADA/Program/CoreTest/obj/x86/Debug/Login.g.i.cs
  9. 2
      SCADA/Program/CoreTest/obj/x86/Debug/RuntimeChart.g.cs
  10. 2
      SCADA/Program/CoreTest/obj/x86/Debug/RuntimeChart.g.i.cs
  11. 1
      SCADA/Program/CoreTest/obj/x86/Debug/StartDevice.g.cs
  12. 1
      SCADA/Program/CoreTest/obj/x86/Debug/StartDevice.g.i.cs
  13. BIN
      SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.csprojAssemblyReference.cache
  14. BIN
      SCADA/Program/FileDriver/obj/Debug/FileDriver.csprojAssemblyReference.cache
  15. BIN
      SCADA/Program/HMIControl/bin/Debug/DataHelper.dll
  16. BIN
      SCADA/Program/HMIControl/bin/Debug/DataHelper.pdb
  17. BIN
      SCADA/Program/HMIControl/bin/Debug/DataService.dll
  18. BIN
      SCADA/Program/HMIControl/bin/Debug/DataService.pdb
  19. BIN
      SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.dll
  20. BIN
      SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.pdb
  21. BIN
      SCADA/Program/HMIControl/bin/Debug/HMIControl.dll
  22. BIN
      SCADA/Program/HMIControl/bin/Debug/HMIControl.pdb
  23. 0
      SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.CopyComplete
  24. 2
      SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.CoreCompileInputs.cache
  25. 14
      SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt
  26. BIN
      SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.GenerateResource.cache
  27. BIN
      SCADA/Program/HMIControl/obj/Debug/HMIControl.dll
  28. BIN
      SCADA/Program/HMIControl/obj/Debug/HMIControl.pdb
  29. 4
      SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.cache
  30. 2
      SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.lref
  31. BIN
      SCADA/Program/HMIControl/obj/Debug/Themes/Generic.baml
  32. BIN
      SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.dll
  33. BIN
      SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.pdb
  34. 0
      SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csproj.CopyComplete
  35. 13
      SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csproj.FileListAbsolute.txt
  36. BIN
      SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csproj.GenerateResource.cache
  37. BIN
      SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csprojAssemblyReference.cache
  38. BIN
      SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csprojAssemblyReference.cache
  39. BIN
      SCADA/Program/OPCDriver/obj/Debug/OPCDriver.csprojAssemblyReference.cache
  40. BIN
      SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.csprojAssemblyReference.cache
  41. BIN
      SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.csprojAssemblyReference.cache

26
.gitignore

@ -9,3 +9,29 @@ Desktop.ini
!*.bak
/SCADA/Program/.vs/DataExchange/v15/Server/sqlite3
/SCADA/Program/.vs/DataExchange/v15
/SCADA/Program/BatchCoreService/bin/Debug
*.resources
/SCADA/Program/BatchCoreService/obj
/SCADA/Program/BatchCoreService/bin
/SCADA/Program/BatchCoreTest/obj
/SCADA/Program/BatchCoreTest/bin
/SCADA/Program/ClientDriver/bin
/SCADA/Program/ClientDriver/obj
/SCADA/Program/CoreTest/bin
/SCADA/Program/CoreTest/obj
/SCADA/Program/DataHelper/bin
/SCADA/Program/DataHelper/obj
/SCADA/Program/DataService/bin
/SCADA/Program/DataService/obj
/SCADA/Program/FileDriver/bin
/SCADA/Program/FileDriver/obj
/SCADA/Program/ModbusDriver/bin
/SCADA/Program/ModbusDriver/obj
/SCADA/Program/OPCDriver/bin/
/SCADA/Program/OPCDriver/obj
/SCADA/Program/OPCLib/bin
/SCADA/Program/OPCLib/obj
/SCADA/Program/SiemensPLCDriver/bin
/SCADA/Program/SiemensPLCDriver/obj
/SCADA/Program/TagConfig/TagConfig/bin
/SCADA/Program/TagConfig/TagConfig/obj

BIN
SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.csprojAssemblyReference.cache

Binary file not shown.

BIN
SCADA/Program/ClientDriver/obj/Debug/ClientDriver.csprojAssemblyReference.cache

Binary file not shown.

2
SCADA/Program/CoreTest/obj/x86/Debug/Example.csproj.CoreCompileInputs.cache

@ -1 +1 @@
7592adb3937209dbd1d50f6592cc6f6b115e8eea
987b73e57c98f48ad56983e86fa221d9fdb71b36

BIN
SCADA/Program/CoreTest/obj/x86/Debug/Example.csprojAssemblyReference.cache

Binary file not shown.

62
SCADA/Program/CoreTest/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs

@ -1,62 +1,2 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace XamlGeneratedNamespace {
/// <summary>
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
/// <summary>
/// CreateInstance
/// </summary>
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
}
/// <summary>
/// GetPropertyValue
/// </summary>
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// SetPropertyValue
/// </summary>
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// CreateDelegate
/// </summary>
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
delegateType,
handler}, null)));
}
/// <summary>
/// AddEventHandler
/// </summary>
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
eventInfo.AddEventHandler(target, handler);
}
}
}


2
SCADA/Program/CoreTest/obj/x86/Debug/Login.g.cs

@ -9,8 +9,6 @@
// </auto-generated>
//------------------------------------------------------------------------------
using CoreTest;
using HMIControl;
using System;
using System.Diagnostics;
using System.Windows;

2
SCADA/Program/CoreTest/obj/x86/Debug/Login.g.i.cs

@ -9,8 +9,6 @@
// </auto-generated>
//------------------------------------------------------------------------------
using CoreTest;
using HMIControl;
using System;
using System.Diagnostics;
using System.Windows;

2
SCADA/Program/CoreTest/obj/x86/Debug/RuntimeChart.g.cs

@ -9,8 +9,6 @@
// </auto-generated>
//------------------------------------------------------------------------------
using CoreTest;
using HMIControl;
using Microsoft.Research.DynamicDataDisplay;
using Microsoft.Research.DynamicDataDisplay.Charts;
using Microsoft.Research.DynamicDataDisplay.Charts.Axes;

2
SCADA/Program/CoreTest/obj/x86/Debug/RuntimeChart.g.i.cs

@ -9,8 +9,6 @@
// </auto-generated>
//------------------------------------------------------------------------------
using CoreTest;
using HMIControl;
using Microsoft.Research.DynamicDataDisplay;
using Microsoft.Research.DynamicDataDisplay.Charts;
using Microsoft.Research.DynamicDataDisplay.Charts.Axes;

1
SCADA/Program/CoreTest/obj/x86/Debug/StartDevice.g.cs

@ -9,7 +9,6 @@
// </auto-generated>
//------------------------------------------------------------------------------
using HMIControl;
using System;
using System.Diagnostics;
using System.Windows;

1
SCADA/Program/CoreTest/obj/x86/Debug/StartDevice.g.i.cs

@ -9,7 +9,6 @@
// </auto-generated>
//------------------------------------------------------------------------------
using HMIControl;
using System;
using System.Diagnostics;
using System.Windows;

BIN
SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.csprojAssemblyReference.cache

Binary file not shown.

BIN
SCADA/Program/FileDriver/obj/Debug/FileDriver.csprojAssemblyReference.cache

Binary file not shown.

BIN
SCADA/Program/HMIControl/bin/Debug/DataHelper.dll

Binary file not shown.

BIN
SCADA/Program/HMIControl/bin/Debug/DataHelper.pdb

Binary file not shown.

BIN
SCADA/Program/HMIControl/bin/Debug/DataService.dll

Binary file not shown.

BIN
SCADA/Program/HMIControl/bin/Debug/DataService.pdb

Binary file not shown.

BIN
SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.dll

Binary file not shown.

BIN
SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.pdb

Binary file not shown.

BIN
SCADA/Program/HMIControl/bin/Debug/HMIControl.dll

Binary file not shown.

BIN
SCADA/Program/HMIControl/bin/Debug/HMIControl.pdb

Binary file not shown.

0
SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.CopyComplete

2
SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.CoreCompileInputs.cache

@ -1 +1 @@
7dc184ea8ed938d2f972714de4ddd83f7c0e9079
002da3eb8d040244d69e4e33adcaf448625f3d73

14
SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt

@ -0,0 +1,14 @@
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\HMIControl.dll
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\HMIControl.pdb
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csprojAssemblyReference.cache
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\GeneratedInternalTypeHelper.g.cs
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl_MarkupCompile.cache
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl_MarkupCompile.lref
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\Themes\Generic.baml
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.g.resources
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.Properties.Resources.resources
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csproj.GenerateResource.cache
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csproj.CoreCompileInputs.cache
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csproj.CopyComplete
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.dll
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.pdb

BIN
SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.GenerateResource.cache

Binary file not shown.

BIN
SCADA/Program/HMIControl/obj/Debug/HMIControl.dll

Binary file not shown.

BIN
SCADA/Program/HMIControl/obj/Debug/HMIControl.pdb

Binary file not shown.

4
SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.cache

@ -12,9 +12,9 @@ DEBUG;TRACE
1-731644535
91-867097488
90-512523173
11603472470
Themes\Generic.xaml;
True
False

2
SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.lref

@ -1,4 +1,4 @@
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\GeneratedInternalTypeHelper.g.cs

FD:\Codes\SharpSCADA\SCADA\Program\HMIControl\Themes\Generic.xaml;;

BIN
SCADA/Program/HMIControl/obj/Debug/Themes/Generic.baml

Binary file not shown.

BIN
SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.dll

Binary file not shown.

BIN
SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.pdb

Binary file not shown.

0
SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csproj.CopyComplete

13
SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csproj.FileListAbsolute.txt

@ -0,0 +1,13 @@
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\HMIControl.VisualStudio.Design.dll
D:\Codes\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\HMIControl.VisualStudio.Design.pdb
D:\Codes\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\LinkableControlDesign.csprojAssemblyReference.cache
D:\Codes\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl.VisualStudio.Design.Properties.Resources.resources
D:\Codes\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl.VisualStudio.Design.TagComplexEditor.resources
D:\Codes\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl.VisualStudio.Design.TagList.resources
D:\Codes\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl.VisualStudio.Design.TagWindowEditor.resources
D:\Codes\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl.VisualStudio.Design.TagWriteEditor.resources
D:\Codes\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\LinkableControlDesign.csproj.GenerateResource.cache
D:\Codes\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\LinkableControlDesign.csproj.CoreCompileInputs.cache
D:\Codes\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\LinkableControlDesign.csproj.CopyComplete
D:\Codes\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl.VisualStudio.Design.dll
D:\Codes\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl.VisualStudio.Design.pdb

BIN
SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csproj.GenerateResource.cache

Binary file not shown.

BIN
SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csprojAssemblyReference.cache

Binary file not shown.

BIN
SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csprojAssemblyReference.cache

Binary file not shown.

BIN
SCADA/Program/OPCDriver/obj/Debug/OPCDriver.csprojAssemblyReference.cache

Binary file not shown.

BIN
SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.csprojAssemblyReference.cache

Binary file not shown.

BIN
SCADA/Program/TagConfig/TagConfig/obj/x86/Debug/TagConfig.csprojAssemblyReference.cache

Binary file not shown.
Loading…
Cancel
Save