mysql support

SCADA/DataConfig/host.ini

@@ -4,3 +4,4 @@ SERVER=lochost
 [DATABASE]
 CONNSTRING=Data Source=.\SQLEXPRESS;Initial Catalog=SCADA;Integrated Security=True
 ARCHIVE=D:\HDA
+TYPE=MSSQL

SCADA/Database/mysql.sql

@@ -0,0 +1,22 @@
+DROP PROCEDURE IF EXISTS `scada`.`InitServer`;
+
+CREATE DEFINER=`root`@`localhost` PROCEDURE `InitServer`(IN pTYPE int)
+BEGIN
+	IF pTYPE<>1 THEN
+	 SELECT M.DRIVERID,DRIVERNAME,SERVER,TIMEOUT,R.AssemblyName,R.ClassFullName,Spare1,Spare2 FROM META_DRIVER M INNER JOIN RegisterModule R ON M.DRIVERTYPE=R.DriverID;
+	END IF;
+	SELECT COUNT(*) FROM META_TAG;
+	SELECT TAGID,GROUPID,RTRIM(TAGNAME),ADDRESS,DATATYPE,DATASIZE,ARCHIVE,MAXIMUM,MINIMUM,CYCLE FROM META_TAG WHERE ISACTIVE=1;
+	IF pTYPE<>1 THEN
+		SELECT DRIVERID,GROUPNAME,GROUPID,UPDATERATE,DEADBAND,ISACTIVE FROM META_GROUP ;
+	END IF;
+	IF pTYPE=0 THEN 
+		SELECT SOURCE FROM META_Condition WHERE EVENTTYPE=2;
+	END IF;
+	IF pTYPE<>2 THEN 
+		SELECT TYPEID,SOURCE,ALARMTYPE,A.ISENABLED,CONDITIONTYPE,PARA,IFNULL(COMMENT,''),DEADBAND,DELAY,SUBALARMTYPE,Threshold,SEVERITY,
+		IFNULL(MESSAGE,''),B.ISENABLE FROM META_Condition a LEFT OUTER JOIN META_SUBCONDITION b ON a.TypeID=b.ConditionID WHERE EVENTTYPE<>2;
+	END IF;
+	-- LEFT OUTER JOIN META_TAG c ON a.SOURCEID=c.TAGID 
+	SELECT SCALEID,SCALETYPE,EUHI,EULO,RAWHI,RAWLO FROM META_SCALE;
+END

SCADA/Program/BatchCoreService/DAService.cs

@@ -186,7 +186,7 @@ namespace BatchCoreService
                         if (list != null && list.Count() > 0)
                         {
                             string sql = "SELECT TAGID,DESCRIPTION FROM META_TAG WHERE TAGID IN(" + string.Join(",", list) + ");";
-                            using (var reader = DataHelper.ExecuteReader(sql))
+                            using (var reader = DataHelper.Instance.ExecuteReader(sql))
                             {
                                 if (reader != null)
                                 {
@@ -415,7 +415,7 @@ namespace BatchCoreService
 
         void InitServerByDatabase()
         {
-            using (var dataReader = DataHelper.ExecuteProcedureReader("InitServer", new SqlParameter("@TYPE", SqlDbType.Int) { Value = 0 }))
+            using (var dataReader = DataHelper.Instance.ExecuteProcedureReader("InitServer", new SqlParameter("@TYPE", SqlDbType.Int) { Value = 0 }))
             {
                 if (dataReader == null) return;// Stopwatch sw = Stopwatch.StartNew();
                 while (dataReader.Read())
@@ -1178,37 +1178,12 @@ namespace BatchCoreService
             lock (_hdaRoot)
             {
                 if (_hda.Count == 0) return;
-                //_array.CopyTo(data, 0);
-                SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString);
-                SqlTransaction sqlT = null;
-                try
+                if (DataHelper.Instance.BulkCopy(new HDASqlReader(_hda, this), "Log_HData",
+                      string.Format("DELETE FROM Log_HData WHERE [TIMESTAMP]>'{0}'", _hda[0].TimeStamp.ToString())))
                 {
-                    if (m_Conn.State == ConnectionState.Closed)
-                        m_Conn.Open();
-                    sqlT = m_Conn.BeginTransaction();
-                    SqlCommand cmd = new SqlCommand(string.Format("DELETE FROM Log_HData WHERE [TIMESTAMP]>'{0}'",
-                       _hda[0].TimeStamp.ToString()), m_Conn);
-                    cmd.Transaction = sqlT;
-                    cmd.ExecuteNonQuery();
-                    HDASqlReader reader = new HDASqlReader(_hda, this);
-                    SqlBulkCopy copy = new SqlBulkCopy(m_Conn, SqlBulkCopyOptions.Default, sqlT);
-                    copy.DestinationTableName = "Log_HData";
-                    copy.BulkCopyTimeout = 100000;
-                    //copy.BatchSize = _capacity;
-                    copy.WriteToServer(reader);
-                    //Clear();
-                    sqlT.Commit();
-                    m_Conn.Close();
                     _hda.Clear();
                     _hdastart = DateTime.Now;
                 }
-                catch (Exception e)
-                {
-                    if (sqlT != null)
-                        sqlT.Rollback();
-                    m_Conn.Close();
-                    DataHelper.AddErrorLog(e);
-                }
             }
         }
 
@@ -1216,35 +1191,8 @@ namespace BatchCoreService
         {
             var tempdata = _hda.ToArray();
             if (tempdata.Length == 0) return true;
-            SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString);
-            SqlTransaction sqlT = null;
-            try
-            {
-                if (m_Conn.State == ConnectionState.Closed)
-                    m_Conn.Open();
-                sqlT = m_Conn.BeginTransaction();
-                SqlCommand cmd = new SqlCommand(string.Format("DELETE FROM Log_HData WHERE [TIMESTAMP] BETWEEN '{0}' AND '{1}'",
-                   startTime, endTime), m_Conn);
-                cmd.Transaction = sqlT;
-                cmd.ExecuteNonQuery();
-                SqlBulkCopy copy = new SqlBulkCopy(m_Conn, SqlBulkCopyOptions.Default, sqlT);
-                copy.DestinationTableName = "Log_HData";
-                copy.BulkCopyTimeout = 100000;
-                //copy.BatchSize = _capacity;
-                copy.WriteToServer(new HDASqlReader(GetData(tempdata, startTime, endTime), this));
-                //Clear();
-                sqlT.Commit();
-                m_Conn.Close();
-                return true;
-            }
-            catch (Exception e)
-            {
-                if (sqlT != null)
-                    sqlT.Rollback();
-                m_Conn.Close();
-                DataHelper.AddErrorLog(e);
-                return false;
-            }
+            return DataHelper.Instance.BulkCopy(new HDASqlReader(GetData(tempdata, startTime, endTime), this), "Log_HData",
+                     string.Format("DELETE FROM Log_HData WHERE [TIMESTAMP] BETWEEN '{0}' AND '{1}'", startTime, endTime));
         }
 
         public void OnUpdate(object stateInfo)
@@ -1258,40 +1206,11 @@ namespace BatchCoreService
                     //Reverse(data);
                     DateTime start = _hda[0].TimeStamp;
                     //_array.CopyTo(data, 0);
-                    SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString);
-                    SqlTransaction sqlT = null;
-                    try
-                    {
-                        if (m_Conn.State == ConnectionState.Closed)
-                            m_Conn.Open();
-                        sqlT = m_Conn.BeginTransaction();
-                        SqlCommand cmd = new SqlCommand(string.Format("DELETE FROM Log_HData WHERE [TIMESTAMP]>'{0}'",
-                           start.ToString()), m_Conn);
-                        cmd.Transaction = sqlT;
-                        cmd.ExecuteNonQuery();
-                        HDASqlReader reader = new HDASqlReader(_hda, this);
-                        SqlBulkCopy copy = new SqlBulkCopy(m_Conn, SqlBulkCopyOptions.Default, sqlT);
-                        copy.DestinationTableName = "Log_HData";
-                        copy.BulkCopyTimeout = 100000;
-                        //copy.BatchSize = _capacity;
-                        copy.WriteToServer(reader);//如果写入失败，考虑不能无限增加线程数
-                        //Clear();
-                        sqlT.Commit();
-                        m_Conn.Close();
+                    if (DataHelper.Instance.BulkCopy(new HDASqlReader(_hda, this), "Log_HData",
+                    string.Format("DELETE FROM Log_HData WHERE [TIMESTAMP]>'{0}'", start.ToString())))
                         _hdastart = DateTime.Now;
-                    }
-                    catch (Exception e)
-                    {
-                        if (sqlT != null)
-                            sqlT.Rollback();
-                        m_Conn.Close();
-                        ThreadPool.UnsafeQueueUserWorkItem(new WaitCallback(this.SaveCachedData), _hda.ToArray());
-                        DataHelper.AddErrorLog(e);
-                    }
-                    finally
-                    {
-                        _hda.Clear();
-                    }
+                    else ThreadPool.UnsafeQueueUserWorkItem(new WaitCallback(this.SaveCachedData), _hda.ToArray());
+                    _hda.Clear();
                 }
             }
         }
@@ -1307,35 +1226,12 @@ namespace BatchCoreService
             while (true)
             {
                 if (count >= 5) return;
-                SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString);
-                SqlTransaction sqlT = null;
-                try
+                if (DataHelper.Instance.BulkCopy(new HDASqlReader(tempData, this), "Log_HData",
+                   string.Format("DELETE FROM Log_HData WHERE [TIMESTAMP] BETWEEN '{0}' AND '{1}'",
+                    startTime, endTime)))
                 {
-                    if (m_Conn.State == ConnectionState.Closed)
-                        m_Conn.Open();
-                    sqlT = m_Conn.BeginTransaction();
-                    SqlCommand cmd = new SqlCommand(string.Format("DELETE FROM Log_HData WHERE [TIMESTAMP] BETWEEN '{0}' AND '{1}'",
-                    startTime, endTime), m_Conn);
-                    cmd.Transaction = sqlT;
-                    cmd.ExecuteNonQuery();
-                    SqlBulkCopy copy = new SqlBulkCopy(m_Conn, SqlBulkCopyOptions.Default, sqlT);
-                    copy.DestinationTableName = "Log_HData";
-                    copy.BulkCopyTimeout = 100000;
-                    //copy.BatchSize = _capacity;
-                    copy.WriteToServer(new HDASqlReader(tempData, this));
-                    //Clear();
-                    sqlT.Commit();
-                    m_Conn.Close();
                     stateInfo = null;
                     _hdastart = DateTime.Now;
-                    return;
-                }
-                catch (Exception e)
-                {
-                    if (sqlT != null)
-                        sqlT.Rollback();
-                    m_Conn.Close();
-                    DataHelper.AddErrorLog(e);
                 }
                 count++;
                 Thread.Sleep(CYCLE2);
@@ -1361,10 +1257,10 @@ namespace BatchCoreService
         void OnValueChanged(object sender, ValueChangedEventArgs e)
         {
             var tag = sender as ITag;
-            DataHelper.ExecuteStoredProcedure("AddEventLog",
-                new SqlParameter("@StartTime", SqlDbType.DateTime) { SqlValue = tag.TimeStamp },
-                new SqlParameter("@Source", SqlDbType.NVarChar, 50) { SqlValue = tag.ID.ToString() },
-                new SqlParameter("@Comment", SqlDbType.NVarChar, 50) { SqlValue = tag.ToString() });
+            DataHelper.Instance.ExecuteStoredProcedure("AddEventLog",
+                DataHelper.CreateParam("@StartTime", SqlDbType.DateTime, tag.TimeStamp),
+                DataHelper.CreateParam("@Source", SqlDbType.NVarChar, tag.ID.ToString(), 50),
+                DataHelper.CreateParam("@StartTime", SqlDbType.NVarChar, tag.ToString(), 50));
         }
 
         public HistoryData[] BatchRead(DataSource source, bool sync, params ITag[] itemArray)
@@ -1485,9 +1381,7 @@ namespace BatchCoreService
                 byte[] dt = BitConverter.GetBytes(id);
                 sendBuffer[j++] = dt[0];
                 sendBuffer[j++] = dt[1];
-                var index = GetItemProperties(id);
-                if (index < 0 || index >= _list.Count) continue;
-                switch (_list[index].DataType)
+                switch (_list[GetItemProperties(id)].DataType)
                 {
                     case DataType.BOOL:
                         sendBuffer[j++] = 1;
@@ -1805,23 +1699,13 @@ namespace BatchCoreService
         private bool SaveAlarm()
         {
             if (_alarmList.Count == 0) return true;
-            try
+            if (DataHelper.Instance.BulkCopy(new AlarmDataReader(_alarmList), "Log_Alarm", null, SqlBulkCopyOptions.KeepIdentity))
             {
-                AlarmDataReader reader = new AlarmDataReader(_alarmList);
-                using (SqlBulkCopy bulk = new SqlBulkCopy(DataHelper.ConnectString, SqlBulkCopyOptions.KeepIdentity))
-                {
-                    bulk.DestinationTableName = "Log_Alarm";
-                    bulk.WriteToServer(reader);
-                }
                 _alarmList.Clear();
                 _alarmstart = DateTime.Now;
                 return true;
             }
-            catch (Exception e)
-            {
-                AddErrorLog(e);
-                return false;
-            }
+            return false;
         }
 
         public ICondition GetCondition(string tagName, AlarmType type)
@@ -2005,7 +1889,7 @@ namespace BatchCoreService
         public bool ReadExpression(string expression)
         {
             Func<bool> func;
-            if (_exprdict.TryGetValue(expression, out  func))
+            if (_exprdict.TryGetValue(expression, out func))
             {
                 return func();
             }

SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.exe.config

@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-  <configSections>
-  </configSections>
-  <connectionStrings/>
-  <system.serviceModel>
-    <services>
-      <!-- This section is optional with the new configuration model
-           introduced in .NET Framework 4. -->
-      <service name="BatchCoreService.DAService" behaviorConfiguration="DAServiceBehavior">
-        <host>
-          <baseAddresses>
-            <add baseAddress="http://localhost:8000/SCADA/service"/>
-          </baseAddresses>
-        </host>
-        <!-- this endpoint is exposed at the base address provided by host: http://localhost:8000/SCADA/service  -->
-        <endpoint address="" binding="basicHttpBinding" bindingConfiguration="Binding1" bindingNamespace="http://BatchCoreService" contract="BatchCoreService.IDataExchangeService"/>
-        <!-- the mex endpoint is exposed at http://localhost:8000/SCADA/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
-      </service>
-    </services>
-    <bindings>
-      <basicHttpBinding>
-        <binding name="Binding1" sendTimeout="00:10:00" transferMode="Streamed" messageEncoding="Text" textEncoding="utf-8" maxReceivedMessageSize="9223372036854775807">
-        </binding>
-      </basicHttpBinding>
-    </bindings>
-    <behaviors>
-      <serviceBehaviors>
-        <behavior name="DAServiceBehavior">
-          <serviceMetadata httpGetEnabled="true"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
-        </behavior>
-      </serviceBehaviors>
-    </behaviors>
-  </system.serviceModel>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
-  </startup>
-</configuration>

SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.vshost.exe.config

@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-  <configSections>
-  </configSections>
-  <connectionStrings/>
-  <system.serviceModel>
-    <services>
-      <!-- This section is optional with the new configuration model
-           introduced in .NET Framework 4. -->
-      <service name="BatchCoreService.DAService" behaviorConfiguration="DAServiceBehavior">
-        <host>
-          <baseAddresses>
-            <add baseAddress="http://localhost:8000/SCADA/service"/>
-          </baseAddresses>
-        </host>
-        <!-- this endpoint is exposed at the base address provided by host: http://localhost:8000/SCADA/service  -->
-        <endpoint address="" binding="basicHttpBinding" bindingConfiguration="Binding1" bindingNamespace="http://BatchCoreService" contract="BatchCoreService.IDataExchangeService"/>
-        <!-- the mex endpoint is exposed at http://localhost:8000/SCADA/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
-      </service>
-    </services>
-    <bindings>
-      <basicHttpBinding>
-        <binding name="Binding1" sendTimeout="00:10:00" transferMode="Streamed" messageEncoding="Text" textEncoding="utf-8" maxReceivedMessageSize="9223372036854775807">
-        </binding>
-      </basicHttpBinding>
-    </bindings>
-    <behaviors>
-      <serviceBehaviors>
-        <behavior name="DAServiceBehavior">
-          <serviceMetadata httpGetEnabled="true"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
-        </behavior>
-      </serviceBehaviors>
-    </behaviors>
-  </system.serviceModel>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
-  </startup>
-</configuration>

SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.vshost.exe.manifest

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>

SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csproj.FileListAbsolute.txt

@@ -1 +0,0 @@
-C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\bin\Debug\BatchCoreTest.exe.config

SCADA/Program/CoreTest/AlarmSet.xaml.cs

@@ -1,12 +1,12 @@
-using System;
+using DatabaseLib;
+using DataService;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Data.SqlClient;
+using System.Data;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
-using DatabaseLib;
-using DataService;
 
 namespace CoreTest
 {
@@ -66,7 +66,9 @@ namespace CoreTest
             this.CommandBindings.Add(new CommandBinding(MyCommands.Query, (sender, e) =>
             {
                 List<AlarmItem> alist = new List<AlarmItem>();
-                using (var reader = DataHelper.ExecuteProcedureReader("GetAlarm", new SqlParameter("@StartTime", dtstart.Value.Value), new SqlParameter("@EndTime", dtend.Value.Value)))
+                using (var reader = DataHelper.Instance.ExecuteProcedureReader("GetAlarm",
+                    DataHelper.CreateParam("@StartTime", SqlDbType.DateTime, dtstart.Value.Value),
+                    DataHelper.CreateParam("@EndTime", SqlDbType.DateTime, dtend.Value.Value)))
                 {
                     if (reader != null)
                     {

SCADA/Program/CoreTest/ClientService.cs

@@ -155,7 +155,7 @@ namespace CoreTest
         {
             try
             {
-                using (var dataReader = DataHelper.ExecuteProcedureReader("InitServer", new SqlParameter("@TYPE", 1)))
+                using (var dataReader = DataHelper.Instance.ExecuteProcedureReader("InitServer", DataHelper.CreateParam("@TYPE", System.Data.SqlDbType.Int, 1)))
                 {
                     if (dataReader == null) Environment.Exit(0);
                     //dataReader.Read();
@@ -784,7 +784,7 @@ namespace CoreTest
                     if (list != null && list.Count() > 0)
                     {
                         string sql = "SELECT TAGID,DESCRIPTION FROM META_TAG WHERE TAGID IN(" + string.Join(",", list) + ");";
-                        using (var reader = DataHelper.ExecuteReader(sql))
+                        using (var reader = DataHelper.Instance.ExecuteReader(sql))
                         {
                             if (reader != null)
                             {

SCADA/Program/CoreTest/MemberPrincipal.cs

@@ -35,7 +35,7 @@ namespace CoreTest
         public MemberPrincipal(MemberIdentity identity)
         {
             _identity = identity;
-            using (var reader = DataHelper.ExecuteReader("SELECT ROLE FROM Membership WHERE UserName='" +
+            using (var reader = DataHelper.Instance.ExecuteReader("SELECT ROLE FROM Membership WHERE UserName='" +
                 _identity.Name + "'"))
             {
                 if (reader != null)
@@ -92,7 +92,7 @@ namespace CoreTest
                 return -1;
             if (IsExceeded) return -4;
             string sql = "SELECT Password FROM dbo.Membership WHERE Username='" + _name + "'";
-            using (var reader = DataHelper.ExecuteReader(sql))
+            using (var reader = DataHelper.Instance.ExecuteReader(sql))
             {
                 if (reader != null)
                 {
@@ -143,7 +143,7 @@ namespace CoreTest
             string sql = string.Format("DELETE FROM dbo.Membership WHERE UserName='{0}';"
                + "INSERT INTO dbo.Membership(UserName,Password,ROLE) VALUES('{0}','{1}',{2})",
                name, EncodePassword(password), (int)role);
-            return DataHelper.ExecuteNonQuery(sql);
+            return DataHelper.Instance.ExecuteNonQuery(sql);
         }
 
         public void ChangeUser(string newName)
@@ -163,7 +163,7 @@ namespace CoreTest
             if (newPassword.Length > 10) return -7;
             int result = 0;
             string sql = "SELECT Password FROM dbo.Membership WHERE Username='" + _name + "'";
-            using (var reader = DataHelper.ExecuteReader(sql))
+            using (var reader = DataHelper.Instance.ExecuteReader(sql))
             {
                 if (reader != null)
                 {
@@ -176,7 +176,7 @@ namespace CoreTest
                             {
                                 sql = "UPDATE dbo.Membership SET Password='" + EncodePassword(newPassword) +
                                     "' WHERE Username='" + _name + "'";
-                                result = DataHelper.ExecuteNonQuery(sql);
+                                result = DataHelper.Instance.ExecuteNonQuery(sql);
                                 if (result >= 0) result = 0;
                             }
                             else

SCADA/Program/CoreTest/SystemLog.cs

@@ -76,7 +76,7 @@ namespace CoreTest
         {
             string sql = string.Format("INSERT INTO dbo.LOG_EVENT(EVENTTYPE,SEVERITY,ACTIVETIME,SOURCE,COMMENT) VALUES({0},{1},'{2}','{3}','{4}');",
                (int)log._eventtype, (int)log._severity, log._time, log._source, log._comment);
-            return DataHelper.ExecuteNonQuery(sql);
+            return DataHelper.Instance.ExecuteNonQuery(sql);
         }
 
         public static SystemLog FindFirstEvent(EventType eventtype, DateTime? firsttime = null, string source = null)
@@ -85,7 +85,7 @@ namespace CoreTest
             string cond2 = string.IsNullOrEmpty(source) ? "" : " AND SOURCE='" + source + "'";
             string sql = string.Format("SELECT TOP 1 SEVERITY,ACTIVETIME,COMMENT FROM dbo.LOG_EVENT WHERE EVENTTYPE={0} {1} {2} ORDER BY ACTIVETIME",
                (int)eventtype, cond1, cond2);
-            using (var reader = DataHelper.ExecuteReader(sql))
+            using (var reader = DataHelper.Instance.ExecuteReader(sql))
             {
                 while (reader.Read())
                 {
@@ -101,7 +101,7 @@ namespace CoreTest
             string cond2 = string.IsNullOrEmpty(source) ? "" : " AND SOURCE='" + source + "'";
             string sql = string.Format("SELECT TOP 1 SEVERITY,ACTIVETIME,COMMENT FROM dbo.LOG_EVENT WHERE EVENTTYPE={0} {1} {2} ORDER BY ACTIVETIME DESC",
                (int)eventtype, cond1, cond2);
-            using (var reader = DataHelper.ExecuteReader(sql))
+            using (var reader = DataHelper.Instance.ExecuteReader(sql))
             {
                 while (reader.Read())
                 {
@@ -119,7 +119,7 @@ namespace CoreTest
             string cond3 = endtime == null ? "" : " AND ACTIVETIME<='" + endtime + "'";
             string sql = string.Format("SELECT SEVERITY,ACTIVETIME,COMMENT FROM dbo.LOG_EVENT WHERE EVENTTYPE={0} {1} {2} {3} ORDER BY ACTIVETIME",
                (int)eventtype, cond1, cond2, cond3);
-            using (var reader = DataHelper.ExecuteReader(sql))
+            using (var reader = DataHelper.Instance.ExecuteReader(sql))
             {
                 while (reader.Read())
                 {
@@ -131,12 +131,12 @@ namespace CoreTest
 
         public static void GetEventTime(EventType eventtype, string source, string comment, out DateTime? startime, out DateTime? endtime)
         {
-            var parm1 = new SqlParameter("@STARTTIME", SqlDbType.DateTime) { Direction = ParameterDirection.Output };
-            var parm2 = new SqlParameter("@ENDTIME", SqlDbType.DateTime) { Direction = ParameterDirection.Output };
-            if (DataHelper.ExecuteStoredProcedure("GetEventTime",
-                 new SqlParameter("@EVENTTYPE", SqlDbType.Int) { SqlValue = (int)eventtype },
-                 new SqlParameter("@SOURCE", SqlDbType.NVarChar, 50) { SqlValue = source },
-                 new SqlParameter("@COMMENT", SqlDbType.NVarChar, 50) { SqlValue = comment },
+            var parm1 = DataHelper.CreateParam("@STARTTIME", SqlDbType.DateTime, null, 0, ParameterDirection.Output);
+            var parm2 = DataHelper.CreateParam("@ENDTIME", SqlDbType.DateTime, null, 0, ParameterDirection.Output);
+            if (DataHelper.Instance.ExecuteStoredProcedure("GetEventTime",
+                 DataHelper.CreateParam("@EVENTTYPE", SqlDbType.Int, (int)eventtype),
+                 DataHelper.CreateParam("@SOURCE", SqlDbType.NVarChar, source, 50),
+                 DataHelper.CreateParam("@COMMENT", SqlDbType.NVarChar, comment, 50),
                parm1, parm2) >= 0)
             {
                 if (parm1.Value == DBNull.Value)

SCADA/Program/CoreTest/obj/x86/Debug/AlarmSet.g.i.cs

@@ -1,199 +0,0 @@
-#pragma checksum "..\..\..\AlarmSet.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "59BFA4F8D2CBCFAA5AAF46E345571EEF"
-//------------------------------------------------------------------------------
-// <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>
-//------------------------------------------------------------------------------
-
-using CoreTest;
-using Microsoft.Windows.Controls;
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Forms.Integration;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace CoreTest {
-    
-    
-    /// <summary>
-    /// AlarmSet
-    /// </summary>
-    public partial class AlarmSet : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 20 "..\..\..\AlarmSet.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TabControl tab1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 22 "..\..\..\AlarmSet.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.DataGrid list0;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 45 "..\..\..\AlarmSet.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ListView list2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 65 "..\..\..\AlarmSet.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ToolBar toolBar1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 70 "..\..\..\AlarmSet.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Windows.Controls.DateTimePicker dtstart;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 72 "..\..\..\AlarmSet.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Windows.Controls.DateTimePicker dtend;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 75 "..\..\..\AlarmSet.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Windows.Controls.ColorPicker colorpicker;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 77 "..\..\..\AlarmSet.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ListView list1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 94 "..\..\..\AlarmSet.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ListBox list3;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/CoreTest;component/alarmset.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\AlarmSet.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 6 "..\..\..\AlarmSet.xaml"
-            ((CoreTest.AlarmSet)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded);
-            
-            #line default
-            #line hidden
-            
-            #line 6 "..\..\..\AlarmSet.xaml"
-            ((CoreTest.AlarmSet)(target)).Closed += new System.EventHandler(this.Window_Closed);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this.tab1 = ((System.Windows.Controls.TabControl)(target));
-            return;
-            case 3:
-            this.list0 = ((System.Windows.Controls.DataGrid)(target));
-            return;
-            case 4:
-            this.list2 = ((System.Windows.Controls.ListView)(target));
-            return;
-            case 5:
-            this.toolBar1 = ((System.Windows.Controls.ToolBar)(target));
-            return;
-            case 6:
-            this.dtstart = ((Microsoft.Windows.Controls.DateTimePicker)(target));
-            return;
-            case 7:
-            this.dtend = ((Microsoft.Windows.Controls.DateTimePicker)(target));
-            return;
-            case 8:
-            this.colorpicker = ((Microsoft.Windows.Controls.ColorPicker)(target));
-            
-            #line 75 "..\..\..\AlarmSet.xaml"
-            this.colorpicker.SelectedColorChanged += new System.Windows.RoutedPropertyChangedEventHandler<System.Windows.Media.Color>(this.ColorPicker_SelectedColorChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 9:
-            this.list1 = ((System.Windows.Controls.ListView)(target));
-            return;
-            case 10:
-            this.list3 = ((System.Windows.Controls.ListBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-

SCADA/Program/CoreTest/obj/x86/Debug/App.g.i.cs

@@ -1,78 +0,0 @@
-#pragma checksum "..\..\..\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "87C752EAB1D8111DD0461A1A34A553FD"
-//------------------------------------------------------------------------------
-// <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>
-//------------------------------------------------------------------------------
-
-using Microsoft.Windows.Controls;
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Forms.Integration;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace CoreTest {
-    
-    
-    /// <summary>
-    /// App
-    /// </summary>
-    public partial class App : System.Windows.Application {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/CoreTest;component/app.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\App.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        /// <summary>
-        /// Application Entry Point.
-        /// </summary>
-        [System.STAThreadAttribute()]
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public static void Main() {
-            CoreTest.App app = new CoreTest.App();
-            app.InitializeComponent();
-            app.Run();
-        }
-    }
-}
-

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

@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// <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);
-        }
-    }
-}
-

SCADA/Program/CoreTest/obj/x86/Debug/Guage.g.i.cs

@@ -1,113 +0,0 @@
-#pragma checksum "..\..\..\Guage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "5243A05AE807D390F1D9E6B6C6368646"
-//------------------------------------------------------------------------------
-// <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>
-//------------------------------------------------------------------------------
-
-using CoreTest;
-using HMIControl;
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Forms.Integration;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace CoreTest {
-    
-    
-    /// <summary>
-    /// Guage
-    /// </summary>
-    public partial class Guage : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 11 "..\..\..\Guage.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.HVScale hVScale1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 13 "..\..\..\Guage.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.HVValueIndicator hVValueIndicator1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 14 "..\..\..\Guage.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.Frame frame1;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/CoreTest;component/guage.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\Guage.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.hVScale1 = ((HMIControl.HVScale)(target));
-            return;
-            case 2:
-            this.hVValueIndicator1 = ((HMIControl.HVValueIndicator)(target));
-            return;
-            case 3:
-            this.frame1 = ((HMIControl.Frame)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-

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

@@ -1,203 +0,0 @@
-#pragma checksum "..\..\..\Login.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "375A0423B4D66B38B66903C58FC0AA60"
-//------------------------------------------------------------------------------
-// <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>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Forms.Integration;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace CoreTest {
-    
-    
-    /// <summary>
-    /// Login
-    /// </summary>
-    public partial class Login : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 10 "..\..\..\Login.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button button1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 11 "..\..\..\Login.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button button2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 12 "..\..\..\Login.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock textBlock2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 13 "..\..\..\Login.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock textBlock3;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 14 "..\..\..\Login.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox txtUser;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 15 "..\..\..\Login.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock textBlock4;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 16 "..\..\..\Login.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.PasswordBox txtPassword;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 17 "..\..\..\Login.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock txterr;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 18 "..\..\..\Login.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button button3;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/CoreTest;component/login.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\Login.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 4 "..\..\..\Login.xaml"
-            ((CoreTest.Login)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this.button1 = ((System.Windows.Controls.Button)(target));
-            
-            #line 10 "..\..\..\Login.xaml"
-            this.button1.Click += new System.Windows.RoutedEventHandler(this.button1_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this.button2 = ((System.Windows.Controls.Button)(target));
-            
-            #line 11 "..\..\..\Login.xaml"
-            this.button2.Click += new System.Windows.RoutedEventHandler(this.button2_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            this.textBlock2 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 5:
-            this.textBlock3 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 6:
-            this.txtUser = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 7:
-            this.textBlock4 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 8:
-            this.txtPassword = ((System.Windows.Controls.PasswordBox)(target));
-            return;
-            case 9:
-            this.txterr = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 10:
-            this.button3 = ((System.Windows.Controls.Button)(target));
-            
-            #line 19 "..\..\..\Login.xaml"
-            this.button3.Click += new System.Windows.RoutedEventHandler(this.button3_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-

SCADA/Program/CoreTest/obj/x86/Debug/MainWindow.g.i.cs

@@ -1,320 +0,0 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "43579B96290DBB82B39AB2820CBC1A0C"
-//------------------------------------------------------------------------------
-// <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>
-//------------------------------------------------------------------------------
-
-using CoreTest;
-using HMIControl;
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Forms.Integration;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace CoreTest {
-    
-    
-    /// <summary>
-    /// MainWindow
-    /// </summary>
-    public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 73 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid grd1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 79 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Label label1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 80 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Label label2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 82 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Border cvs1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 84 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ToolBarTray toolBarTray;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 106 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.HMIButton btngrind1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 107 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.HMIButton btngrind2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 111 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ToolBarTray cvs3;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 113 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.HMIButton btnRT;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 114 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.HMIButton btnTrend;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 115 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.HMIButton btnTag;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 116 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.HMIButton hMIButton2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 117 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.HMIButton hMIButton7;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 120 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Canvas statusbar;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 121 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.HMILable txtuser;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 122 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.HMILable txttime;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 123 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnStart;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 125 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Canvas cvsAlarm;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 126 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock txtAlarm;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 129 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Shapes.Ellipse p1_lamp1;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/CoreTest;component/mainwindow.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\MainWindow.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 7 "..\..\..\MainWindow.xaml"
-            ((CoreTest.MainWindow)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this.grd1 = ((System.Windows.Controls.Grid)(target));
-            return;
-            case 3:
-            this.label1 = ((System.Windows.Controls.Label)(target));
-            return;
-            case 4:
-            this.label2 = ((System.Windows.Controls.Label)(target));
-            return;
-            case 5:
-            this.cvs1 = ((System.Windows.Controls.Border)(target));
-            return;
-            case 6:
-            this.toolBarTray = ((System.Windows.Controls.ToolBarTray)(target));
-            return;
-            case 7:
-            this.btngrind1 = ((HMIControl.HMIButton)(target));
-            return;
-            case 8:
-            this.btngrind2 = ((HMIControl.HMIButton)(target));
-            return;
-            case 9:
-            this.cvs3 = ((System.Windows.Controls.ToolBarTray)(target));
-            return;
-            case 10:
-            this.btnRT = ((HMIControl.HMIButton)(target));
-            return;
-            case 11:
-            this.btnTrend = ((HMIControl.HMIButton)(target));
-            return;
-            case 12:
-            this.btnTag = ((HMIControl.HMIButton)(target));
-            return;
-            case 13:
-            this.hMIButton2 = ((HMIControl.HMIButton)(target));
-            return;
-            case 14:
-            this.hMIButton7 = ((HMIControl.HMIButton)(target));
-            
-            #line 117 "..\..\..\MainWindow.xaml"
-            this.hMIButton7.Click += new System.Windows.RoutedEventHandler(this.hMIButton7_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 15:
-            this.statusbar = ((System.Windows.Controls.Canvas)(target));
-            return;
-            case 16:
-            this.txtuser = ((HMIControl.HMILable)(target));
-            return;
-            case 17:
-            this.txttime = ((HMIControl.HMILable)(target));
-            return;
-            case 18:
-            this.btnStart = ((System.Windows.Controls.Button)(target));
-            
-            #line 123 "..\..\..\MainWindow.xaml"
-            this.btnStart.Click += new System.Windows.RoutedEventHandler(this.btnStart_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 19:
-            this.cvsAlarm = ((System.Windows.Controls.Canvas)(target));
-            return;
-            case 20:
-            this.txtAlarm = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 21:
-            this.p1_lamp1 = ((System.Windows.Shapes.Ellipse)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-

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

@@ -1,186 +0,0 @@
-#pragma checksum "..\..\..\RuntimeChart.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "DC1BFB7524CCB66F5D58735A70216F0A"
-//------------------------------------------------------------------------------
-// <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>
-//------------------------------------------------------------------------------
-
-using Microsoft.Research.DynamicDataDisplay;
-using Microsoft.Research.DynamicDataDisplay.Charts;
-using Microsoft.Research.DynamicDataDisplay.Charts.Axes;
-using Microsoft.Research.DynamicDataDisplay.Charts.Axes.Numeric;
-using Microsoft.Research.DynamicDataDisplay.Charts.Isolines;
-using Microsoft.Research.DynamicDataDisplay.Charts.Markers;
-using Microsoft.Research.DynamicDataDisplay.Charts.Navigation;
-using Microsoft.Research.DynamicDataDisplay.Charts.Shapes;
-using Microsoft.Research.DynamicDataDisplay.Common.Palettes;
-using Microsoft.Research.DynamicDataDisplay.Converters;
-using Microsoft.Research.DynamicDataDisplay.DataSources;
-using Microsoft.Research.DynamicDataDisplay.MarkupExtensions;
-using Microsoft.Research.DynamicDataDisplay.Navigation;
-using Microsoft.Research.DynamicDataDisplay.PointMarkers;
-using Microsoft.Research.DynamicDataDisplay.ViewportRestrictions;
-using Microsoft.Windows.Controls;
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Forms.Integration;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace CoreTest {
-    
-    
-    /// <summary>
-    /// RuntimeChart
-    /// </summary>
-    public partial class RuntimeChart : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 16 "..\..\..\RuntimeChart.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox comb1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 18 "..\..\..\RuntimeChart.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Windows.Controls.ColorPicker colorpicker;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 20 "..\..\..\RuntimeChart.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Research.DynamicDataDisplay.ChartPlotter chartPlotter1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 22 "..\..\..\RuntimeChart.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Research.DynamicDataDisplay.Charts.HorizontalDateTimeAxis hTimeSpanAxis;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 24 "..\..\..\RuntimeChart.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Research.DynamicDataDisplay.Charts.HorizontalLine hilevel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 25 "..\..\..\RuntimeChart.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Research.DynamicDataDisplay.Charts.HorizontalLine lolevel;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/CoreTest;component/runtimechart.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\RuntimeChart.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 8 "..\..\..\RuntimeChart.xaml"
-            ((CoreTest.RuntimeChart)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded);
-            
-            #line default
-            #line hidden
-            
-            #line 8 "..\..\..\RuntimeChart.xaml"
-            ((CoreTest.RuntimeChart)(target)).Closed += new System.EventHandler(this.Window_Closed);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this.comb1 = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 16 "..\..\..\RuntimeChart.xaml"
-            this.comb1.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comb1_SelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this.colorpicker = ((Microsoft.Windows.Controls.ColorPicker)(target));
-            
-            #line 18 "..\..\..\RuntimeChart.xaml"
-            this.colorpicker.SelectedColorChanged += new System.Windows.RoutedPropertyChangedEventHandler<System.Windows.Media.Color>(this.ColorPicker_SelectedColorChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            this.chartPlotter1 = ((Microsoft.Research.DynamicDataDisplay.ChartPlotter)(target));
-            return;
-            case 5:
-            this.hTimeSpanAxis = ((Microsoft.Research.DynamicDataDisplay.Charts.HorizontalDateTimeAxis)(target));
-            return;
-            case 6:
-            this.hilevel = ((Microsoft.Research.DynamicDataDisplay.Charts.HorizontalLine)(target));
-            return;
-            case 7:
-            this.lolevel = ((Microsoft.Research.DynamicDataDisplay.Charts.HorizontalLine)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-

SCADA/Program/CoreTest/obj/x86/Debug/SiloProductLine.g.i.cs

@@ -1,410 +0,0 @@
-#pragma checksum "..\..\..\SiloProductLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "A5AB0964D726C00F3D396892042986D6"
-//------------------------------------------------------------------------------
-// <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>
-//------------------------------------------------------------------------------
-
-using HMIControl;
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Forms.Integration;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace CoreTest {
-    
-    
-    /// <summary>
-    /// SiloProductLine
-    /// </summary>
-    public partial class SiloProductLine : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 7 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal CoreTest.SiloProductLine SiloProductLine1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 9 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Canvas cvs1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 10 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.Silo silo1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 11 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.Silo silo2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 12 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.Elevator elevator1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 13 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.Elevator elevator2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 14 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.PreCleaner preCleaner1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 15 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.Bucket bucket1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 16 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.Truck truck1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 17 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.ChainConveyor chainConveyor1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 18 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.MagnetCleaner magnetCleaner1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 19 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.ChainConveyor chainConveyor2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 20 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.ChainConveyor chainConveyor3;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 21 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.ChainConveyor chainConveyor4;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 22 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.Cyclone cyclone1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 30 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock productline;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 31 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.FromTo fromTo12;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 33 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.SelectSwitch selectSwitch1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 34 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.SelectSwitch selectSwitch3;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 35 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.FromTo fromTo1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 36 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.FromTo fromTo2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 38 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.FromTo fromTo3;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 41 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.SlideGate slideGate1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 42 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.SlideGate slideGate2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 43 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.FromTo fromTo4;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 45 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.FromTo fromTo5;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 47 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.SlideGate slideGate3;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 48 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.Cyclone cyclone2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 50 "..\..\..\SiloProductLine.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal HMIControl.FromTo fromTo6;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/CoreTest;component/siloproductline.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\SiloProductLine.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.SiloProductLine1 = ((CoreTest.SiloProductLine)(target));
-            
-            #line 8 "..\..\..\SiloProductLine.xaml"
-            this.SiloProductLine1.Loaded += new System.Windows.RoutedEventHandler(this.HMI_Loaded);
-            
-            #line default
-            #line hidden
-            
-            #line 8 "..\..\..\SiloProductLine.xaml"
-            this.SiloProductLine1.Unloaded += new System.Windows.RoutedEventHandler(this.HMI_Unloaded);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this.cvs1 = ((System.Windows.Controls.Canvas)(target));
-            return;
-            case 3:
-            this.silo1 = ((HMIControl.Silo)(target));
-            return;
-            case 4:
-            this.silo2 = ((HMIControl.Silo)(target));
-            return;
-            case 5:
-            this.elevator1 = ((HMIControl.Elevator)(target));
-            return;
-            case 6:
-            this.elevator2 = ((HMIControl.Elevator)(target));
-            return;
-            case 7:
-            this.preCleaner1 = ((HMIControl.PreCleaner)(target));
-            return;
-            case 8:
-            this.bucket1 = ((HMIControl.Bucket)(target));
-            return;
-            case 9:
-            this.truck1 = ((HMIControl.Truck)(target));
-            return;
-            case 10:
-            this.chainConveyor1 = ((HMIControl.ChainConveyor)(target));
-            return;
-            case 11:
-            this.magnetCleaner1 = ((HMIControl.MagnetCleaner)(target));
-            return;
-            case 12:
-            this.chainConveyor2 = ((HMIControl.ChainConveyor)(target));
-            return;
-            case 13:
-            this.chainConveyor3 = ((HMIControl.ChainConveyor)(target));
-            return;
-            case 14:
-            this.chainConveyor4 = ((HMIControl.ChainConveyor)(target));
-            return;
-            case 15:
-            this.cyclone1 = ((HMIControl.Cyclone)(target));
-            return;
-            case 16:
-            this.productline = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 17:
-            this.fromTo12 = ((HMIControl.FromTo)(target));
-            return;
-            case 18:
-            this.selectSwitch1 = ((HMIControl.SelectSwitch)(target));
-            return;
-            case 19:
-            this.selectSwitch3 = ((HMIControl.SelectSwitch)(target));
-            return;
-            case 20:
-            this.fromTo1 = ((HMIControl.FromTo)(target));
-            return;
-            case 21:
-            this.fromTo2 = ((HMIControl.FromTo)(target));
-            return;
-            case 22:
-            this.fromTo3 = ((HMIControl.FromTo)(target));
-            return;
-            case 23:
-            this.slideGate1 = ((HMIControl.SlideGate)(target));
-            return;
-            case 24:
-            this.slideGate2 = ((HMIControl.SlideGate)(target));
-            return;
-            case 25:
-            this.fromTo4 = ((HMIControl.FromTo)(target));
-            return;
-            case 26:
-            this.fromTo5 = ((HMIControl.FromTo)(target));
-            return;
-            case 27:
-            this.slideGate3 = ((HMIControl.SlideGate)(target));
-            return;
-            case 28:
-            this.cyclone2 = ((HMIControl.Cyclone)(target));
-            return;
-            case 29:
-            this.fromTo6 = ((HMIControl.FromTo)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-

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

@@ -1,150 +0,0 @@
-#pragma checksum "..\..\..\StartDevice.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "14206CA5E5BB144386A3AAAB0A6BD5A5"
-//------------------------------------------------------------------------------
-// <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>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Forms.Integration;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace CoreTest {
-    
-    
-    /// <summary>
-    /// StartDevice
-    /// </summary>
-    public partial class StartDevice : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 8 "..\..\..\StartDevice.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid grd;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 20 "..\..\..\StartDevice.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Border border1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 21 "..\..\..\StartDevice.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock devicename;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 22 "..\..\..\StartDevice.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnStop;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 23 "..\..\..\StartDevice.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnExit;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 24 "..\..\..\StartDevice.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button btnStart;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/CoreTest;component/startdevice.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\StartDevice.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.grd = ((System.Windows.Controls.Grid)(target));
-            return;
-            case 2:
-            this.border1 = ((System.Windows.Controls.Border)(target));
-            return;
-            case 3:
-            this.devicename = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 4:
-            this.btnStop = ((System.Windows.Controls.Button)(target));
-            return;
-            case 5:
-            this.btnExit = ((System.Windows.Controls.Button)(target));
-            
-            #line 23 "..\..\..\StartDevice.xaml"
-            this.btnExit.Click += new System.Windows.RoutedEventHandler(this.btnExit_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 6:
-            this.btnStart = ((System.Windows.Controls.Button)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-

SCADA/Program/CoreTest/obj/x86/Debug/TagMonitor.g.i.cs

@@ -1,136 +0,0 @@
-#pragma checksum "..\..\..\TagMonitor.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "0A98A6F201A7031A640A21A10F8B84E7"
-//------------------------------------------------------------------------------
-// <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>
-//------------------------------------------------------------------------------
-
-using CoreTest;
-using Microsoft.Windows.Controls;
-using Microsoft.Windows.Controls.PropertyGrid;
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Forms.Integration;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace CoreTest {
-    
-    
-    /// <summary>
-    /// TagMonitor
-    /// </summary>
-    public partial class TagMonitor : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 16 "..\..\..\TagMonitor.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.DataGrid list1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 24 "..\..\..\TagMonitor.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Windows.Controls.ChildWindow childWindow1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 26 "..\..\..\TagMonitor.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox textBox1;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/CoreTest;component/tagmonitor.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\TagMonitor.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 7 "..\..\..\TagMonitor.xaml"
-            ((CoreTest.TagMonitor)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Window_Loaded);
-            
-            #line default
-            #line hidden
-            
-            #line 7 "..\..\..\TagMonitor.xaml"
-            ((CoreTest.TagMonitor)(target)).Closed += new System.EventHandler(this.Window_Closed);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this.list1 = ((System.Windows.Controls.DataGrid)(target));
-            return;
-            case 3:
-            this.childWindow1 = ((Microsoft.Windows.Controls.ChildWindow)(target));
-            return;
-            case 4:
-            this.textBox1 = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 5:
-            
-            #line 27 "..\..\..\TagMonitor.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-

SCADA/Program/CoreTest/obj/x86/Debug/Trend.g.i.cs

@@ -1,264 +0,0 @@
-#pragma checksum "..\..\..\Trend.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "1B342724173D1F60676E7E203DB0077B"
-//------------------------------------------------------------------------------
-// <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>
-//------------------------------------------------------------------------------
-
-using CoreTest;
-using Microsoft.Research.DynamicDataDisplay;
-using Microsoft.Research.DynamicDataDisplay.Charts;
-using Microsoft.Research.DynamicDataDisplay.Charts.Axes;
-using Microsoft.Research.DynamicDataDisplay.Charts.Axes.Numeric;
-using Microsoft.Research.DynamicDataDisplay.Charts.Isolines;
-using Microsoft.Research.DynamicDataDisplay.Charts.Markers;
-using Microsoft.Research.DynamicDataDisplay.Charts.Navigation;
-using Microsoft.Research.DynamicDataDisplay.Charts.Shapes;
-using Microsoft.Research.DynamicDataDisplay.Common.Palettes;
-using Microsoft.Research.DynamicDataDisplay.Converters;
-using Microsoft.Research.DynamicDataDisplay.DataSources;
-using Microsoft.Research.DynamicDataDisplay.MarkupExtensions;
-using Microsoft.Research.DynamicDataDisplay.Navigation;
-using Microsoft.Research.DynamicDataDisplay.PointMarkers;
-using Microsoft.Research.DynamicDataDisplay.ViewportRestrictions;
-using Microsoft.Windows.Controls;
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Forms.Integration;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace CoreTest {
-    
-    
-    /// <summary>
-    /// Trend
-    /// </summary>
-    public partial class Trend : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 15 "..\..\..\Trend.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ToolBar toolBar1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 23 "..\..\..\Trend.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Windows.Controls.DateTimePicker dtstart;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 25 "..\..\..\Trend.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Windows.Controls.DateTimePicker dtend;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 27 "..\..\..\Trend.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox PCheckBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 28 "..\..\..\Trend.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Primitives.Popup popusBottom;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 34 "..\..\..\Trend.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Windows.Controls.CheckListBox chklist;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 40 "..\..\..\Trend.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox comodel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 45 "..\..\..\Trend.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox chkshow;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 46 "..\..\..\Trend.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Windows.Controls.ColorPicker colorpicker;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 48 "..\..\..\Trend.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Research.DynamicDataDisplay.ChartPlotter chartPlotter1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 50 "..\..\..\Trend.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Research.DynamicDataDisplay.Charts.HorizontalDateTimeAxis hTimeSpanAxis;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 52 "..\..\..\Trend.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Research.DynamicDataDisplay.Charts.Navigation.CursorCoordinateGraph cursor;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 53 "..\..\..\Trend.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Microsoft.Research.DynamicDataDisplay.Charts.Navigation.AxisCursorGraph axiscuror;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/CoreTest;component/trend.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\Trend.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 9 "..\..\..\Trend.xaml"
-            ((CoreTest.Trend)(target)).Closed += new System.EventHandler(this.Window_Closed);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this.toolBar1 = ((System.Windows.Controls.ToolBar)(target));
-            return;
-            case 3:
-            this.dtstart = ((Microsoft.Windows.Controls.DateTimePicker)(target));
-            return;
-            case 4:
-            this.dtend = ((Microsoft.Windows.Controls.DateTimePicker)(target));
-            return;
-            case 5:
-            this.PCheckBox = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 6:
-            this.popusBottom = ((System.Windows.Controls.Primitives.Popup)(target));
-            return;
-            case 7:
-            this.chklist = ((Microsoft.Windows.Controls.CheckListBox)(target));
-            return;
-            case 8:
-            this.comodel = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 40 "..\..\..\Trend.xaml"
-            this.comodel.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comodel_SelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 9:
-            this.chkshow = ((System.Windows.Controls.CheckBox)(target));
-            
-            #line 45 "..\..\..\Trend.xaml"
-            this.chkshow.Click += new System.Windows.RoutedEventHandler(this.chkshow_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 10:
-            this.colorpicker = ((Microsoft.Windows.Controls.ColorPicker)(target));
-            
-            #line 46 "..\..\..\Trend.xaml"
-            this.colorpicker.SelectedColorChanged += new System.Windows.RoutedPropertyChangedEventHandler<System.Windows.Media.Color>(this.ColorPicker_SelectedColorChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 11:
-            this.chartPlotter1 = ((Microsoft.Research.DynamicDataDisplay.ChartPlotter)(target));
-            return;
-            case 12:
-            this.hTimeSpanAxis = ((Microsoft.Research.DynamicDataDisplay.Charts.HorizontalDateTimeAxis)(target));
-            return;
-            case 13:
-            this.cursor = ((Microsoft.Research.DynamicDataDisplay.Charts.Navigation.CursorCoordinateGraph)(target));
-            return;
-            case 14:
-            this.axiscuror = ((Microsoft.Research.DynamicDataDisplay.Charts.Navigation.AxisCursorGraph)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-

SCADA/Program/DataHelper/DataHelper.cs

@@ -1,5 +1,7 @@
-using System;
+using MySql.Data.MySqlClient;
+using System;
 using System.Data;
+using System.Data.Common;
 using System.Data.SqlClient;
 using System.Diagnostics;
 using System.IO;
@@ -9,12 +11,30 @@ using System.Text;
 
 namespace DatabaseLib
 {
-
-    public class DataHelper //:MarshalByRefObject
+    public static class DataHelper
     {
         static string m_ConnStr = @"Data Source=.\SQLEXPRESS;Initial Catalog=SharpSCADA;Integrated Security=True";
         static string m_Path = @"D:\HDA";
         static string m_host = Environment.MachineName;
+        static string m_type = "MSSQL";
+        //数据库工厂接口  
+        const string CFGPATH = @"C:\DataConfig\host.cfg";
+        const string INIPATH = @"C:\DataConfig\host.ini";
+        const string DATALOGSOURCE = "Data Operations";
+        const string DATALOGNAME = "Data Log";
+        const int STRINGMAX = 255;
+
+        static EventLog Log;
+        #region GetInstance
+        private static IDataFactory _ins;
+
+        public static IDataFactory Instance
+        {
+            get
+            {
+                return _ins;
+            }
+        }
 
         public static string HostName
         {
@@ -30,15 +50,11 @@ namespace DatabaseLib
         {
             get { return m_Path; }
         }
-
-        const string CFGPATH = @"C:\DataConfig\host.cfg";
-        const string INIPATH = @"C:\DataConfig\host.ini";
-        const string DATALOGSOURCE = "Data Operations";
-        const string DATALOGNAME = "Data Log";
-        const int STRINGMAX = 255;
-
-        static EventLog Log;
-
+        #endregion
+        /// <summary>  
+        /// 数据库工厂构造函数  
+        /// </summary>  
+        /// <param name="dbtype">数据库枚举</param>  
         static DataHelper()
         {
             if (!EventLog.SourceExists(DATALOGSOURCE))
@@ -46,16 +62,7 @@ namespace DatabaseLib
             Log = new EventLog(DATALOGNAME);
             try
             {
-                if (File.Exists(CFGPATH))
-                {
-                    using (StreamReader objReader = new StreamReader(CFGPATH))
-                    {
-                        m_host = objReader.ReadLine();
-                        m_ConnStr = objReader.ReadLine();
-                        m_Path = objReader.ReadLine();
-                    }
-                }
-                else if (File.Exists(INIPATH))
+                if (File.Exists(INIPATH))
                 {
                     StringBuilder sb = new StringBuilder(STRINGMAX);
                     WinAPI.GetPrivateProfileString("HOST", "SERVER", m_host, sb, STRINGMAX, INIPATH);
@@ -64,691 +71,160 @@ namespace DatabaseLib
                     m_ConnStr = sb.ToString();
                     WinAPI.GetPrivateProfileString("DATABASE", "ARCHIVE", m_Path, sb, STRINGMAX, INIPATH);
                     m_Path = sb.ToString();
+                    WinAPI.GetPrivateProfileString("DATABASE", "TYPE", m_type, sb, STRINGMAX, INIPATH);
+                    m_type = sb.ToString();
                 }
-                IPAddress addr;
-                if (string.IsNullOrEmpty(m_host) || !IPAddress.TryParse(m_host, out addr))
-                {
-                    m_host = Environment.MachineName;
-                }
-            }
-            catch (Exception e)
-            {
-                AddErrorLog(e);
-            }
-        }
-
-        public static void AddErrorLog(Exception e)
-        {
-            string err = "";
-            Exception exp = e;
-            while (exp != null)
-            {
-                err += string.Format("\n {0}", exp.Message);
-                exp = exp.InnerException;
-            }
-            err += string.Format("\n {0}", e.StackTrace);
-            Log.Source = DATALOGSOURCE;
-            Log.WriteEntry(err, EventLogEntryType.Error);
-        }
-
-        public static void CallException(string message)
-        {
-            AddErrorLog(new Exception(message));
-        }
-
-        public static bool ConnectionTest()
-        {
-            //创建连接对象
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
-            {
-                //mySqlConnection.ConnectionTimeout = 1;//设置连接超时的时间
-                try
+                else if (File.Exists(CFGPATH))
                 {
-                    //Open DataBase
-                    //打开数据库
-                    m_Conn.Open();
-                    if (m_Conn.State == ConnectionState.Open)
-                    {
-                        return true;
-                    }
-                }
-                catch (Exception e)
-                {
-                    CallException(e.Message);
-                }
-            }
-            //mySqlConnection   is   a   SqlConnection   object 
-            return false;
-        }
-
-        public static SqlParameter CreateInputParam(string paramName, SqlDbType dbType, object objValue)
-        {
-            SqlParameter parameter = new SqlParameter(paramName, dbType);
-            if (objValue == null)
-            {
-                parameter.IsNullable = true;
-                parameter.Value = DBNull.Value;
-                return parameter;
-            }
-            parameter.Value = objValue;
-            return parameter;
-        }
-
-        #region ExecuteDataset  //执行查询语句，返回一个记录集
-
-        /// <summary>
-        /// 返回记录集
-        /// </summary>
-        /// <param name="SQL">用于返回记录集的SQL语句</param>
-        /// <returns>记录集</returns>
-        public static DataSet ExecuteDataset(string SQL)
-        {
-            DataSet ds = new DataSet();
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
-            {
-                try
-                {
-                    SqlDataAdapter da = new SqlDataAdapter();
-                    SqlCommand cmd = new SqlCommand(SQL, m_Conn);
-                    da.SelectCommand = cmd;
-                    da.Fill(ds);
-                }
-                catch (Exception e)
-                {
-                    CallException(SQL + "        " + e.Message);
-                }
-            }
-            return ds;
-        }
-
-
-        /// <summary>
-        /// 返回记录集
-        /// </summary>
-        /// <param name="SQL">用于返回记录集的SQL语句</param>
-        /// <param name="TableName">映射表名</param>
-        /// <returns>记录集</returns>
-        public static DataSet ExecuteDataset(string SQL, string TableName)
-        {
-            DataSet ds = new DataSet();
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
-            {
-                try
-                {
-                    SqlDataAdapter da = new SqlDataAdapter();
-                    SqlCommand cmd = new SqlCommand(SQL, m_Conn);
-                    da.SelectCommand = cmd;
-                    da.Fill(ds, TableName);
-                }
-                catch (Exception e)
-                {
-                    CallException(SQL + "        " + e.Message);
-                }
-            }
-            return ds;
-        }
-
-        /// <summary>
-        /// 返回包含多个表的记录集
-        /// </summary>
-        /// <param name="SQLs">用于返回记录集的SQL语句</param>
-        /// <param name="TableNames">映射表名</param>
-        /// <returns>记录集</returns>
-
-        public static DataSet ExecuteDataset(string[] SQLs, string[] TableNames)
-        {
-            DataSet ds = new DataSet();
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
-            {
-                try
-                {
-                    for (int i = 0; i < SQLs.Length; i++)
+                    using (StreamReader objReader = new StreamReader(CFGPATH))
                     {
-
-                        SqlDataAdapter da = new SqlDataAdapter();
-                        SqlCommand cmd = new SqlCommand(SQLs[i], m_Conn);
-                        da.SelectCommand = cmd;
-                        da.Fill(ds, TableNames[i]);
+                        m_host = objReader.ReadLine();
+                        m_ConnStr = objReader.ReadLine();
+                        m_Path = objReader.ReadLine();
                     }
                 }
-                catch (Exception e)
-                {
-                    CallException(SQLs + "        " + e.Message);
-                }
-            }
-            return ds;
-        }
-
-        #endregion ExecuteDataset
-
-        /// <summary>
-        /// 返回表
-        /// </summary>
-        /// <param name="SQL">用于返回记录集的SQL语句</param>
-        /// <returns>记录集</returns>
-        public static DataTable ExecuteDataTable(string SQL)
-        {
-            DataTable dt = new DataTable();
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
-            {
-                try
+                IPAddress addr;
+                if (string.IsNullOrEmpty(m_host) || !IPAddress.TryParse(m_host, out addr))
                 {
-                    SqlDataAdapter da = new SqlDataAdapter();
-                    SqlCommand cmd = new SqlCommand(SQL, m_Conn);
-                    da.SelectCommand = cmd;
-                    da.Fill(dt);
+                    m_host = Environment.MachineName;
                 }
-                catch (Exception e)
+                switch (m_type.ToUpper())
                 {
-                    CallException(SQL + "        " + e.Message);
+                    case "MSSQL":
+                        _ins = new MssqlFactory();
+                        break;
+                    case "MYSQL":
+                        _ins = new MysqlFactory();
+                        break;
+                    default:
+                        _ins = new MssqlFactory();
+                        break;
                 }
             }
-            return dt;
-        }
-
-        #region ExecuteNonQuery //执行非查询语句
-
-        /// <summary>
-        /// 执行一条INSERT、UPDATE、DELETE语句
-        /// </summary>
-        /// <param name="SQL">T-SQL语句</param>
-        /// <returns>返回影响的行数</returns>
-        public static int ExecuteNonQuery(string SQL)
-        {
-            int res = -1;
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
+            catch (Exception e)
             {
-                SqlTransaction sqlT = null;
-                try
-                {
-                    using (SqlCommand cmd = new SqlCommand(SQL, m_Conn))
-                    {
-                        if (m_Conn.State == ConnectionState.Closed)
-                            m_Conn.Open();
-                        cmd.Connection = m_Conn;
-                        sqlT = m_Conn.BeginTransaction();
-                        cmd.Transaction = sqlT;
-                        res = cmd.ExecuteNonQuery();
-                        sqlT.Commit();
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (sqlT != null)
-                        sqlT.Rollback();
-                    CallException(SQL + "   " + e.Message);
-                    return -1;
-                }
-                return res;
+                AddErrorLog(e);
             }
         }
 
-        /// <summary>
-        /// 执行一组INSERT、UPDATE、DELETE语句
-        /// </summary>
-        /// <param name="SQLs">T-SQL语句</param>
-        /// <returns>返回影响的行数</returns>
-        public static int ExecuteNonQuery(string[] SQLs)
+        public static DbParameter CreateParam(string paramName, SqlDbType dbType, object objValue, int size = 0, ParameterDirection direction = ParameterDirection.Input)
         {
-            int res = -1;
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
-            {
-                SqlTransaction sqlT = null;
-                SqlCommand cmd = new SqlCommand();
-                try
-                {
-                    if (m_Conn.State == ConnectionState.Closed)
-                        m_Conn.Open();
-                    cmd.Connection = m_Conn;
-                    sqlT = m_Conn.BeginTransaction();
-                    cmd.Transaction = sqlT;
-                    for (int i = 0; i < SQLs.Length; i++)
-                    {
-                        cmd.CommandText = SQLs[i];
-                        res = cmd.ExecuteNonQuery();
-                    }
-                    sqlT.Commit();
-                }
-                catch (Exception e)
-                {
-                    if (sqlT != null)
-                        sqlT.Rollback();
-                    CallException(SQLs + "        " + e.Message);
-                    res = -1;
-                }
-                return res;
-            }
+            return _ins.CreateParam(paramName, dbType, objValue, size, direction);
         }
 
-        /// <summary>
-        /// 执行一组INSERT、UPDATE、DELETE语句
-        /// </summary>
-        /// <param name="SQLs">T-SQL语句</param>
-        /// <param name="Pars">执行参数</param>
-        /// <returns>返回影响的行数</returns>
-        public static int ExecuteNonQuery(string[] SQLs, object[][] Pars)
+        public static string DataTableToCsv(DataTable table)
         {
-            int res = -1;
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
+            //以半角逗号（即,）作分隔符，列为空也要表达其存在。  
+            //列内容如存在半角逗号（即,）则用半角引号（即""）将该字段值包含起来。  
+            //列内容如存在半角引号（即"）则应替换成半角双引号（""）转义，并用半角引号（即""）将该字段值包含起来。  
+            StringBuilder sb = new StringBuilder();
+            DataColumn colum;
+            foreach (DataRow row in table.Rows)
             {
-                SqlTransaction sqlT = null;
-                SqlCommand cmd = new SqlCommand();
-                try
+                for (int i = 0; i < table.Columns.Count; i++)
                 {
-                    if (m_Conn.State == ConnectionState.Closed)
-                        m_Conn.Open();
-                    cmd.Connection = m_Conn;
-                    sqlT = m_Conn.BeginTransaction();
-                    cmd.Transaction = sqlT;
-                    for (int i = 0; i < SQLs.Length; i++)
+                    colum = table.Columns[i];
+                    if (i != 0) sb.Append(",");
+                    var txt = row[colum] == null ? "" : row[colum].ToString();
+                    if (colum.DataType == typeof(string) && txt.Contains(","))
                     {
-                        cmd.CommandText = SQLs[i];
-                        cmd.Parameters.Clear();
-                        for (int j = 0; j < Pars[i].Length; j++)
-                        {
-                            cmd.Parameters.AddWithValue("@p" + j.ToString(), Pars[i][j]);
-                        }
-                        res = cmd.ExecuteNonQuery();
+                        sb.Append("\"" + txt.Replace("\"", "\"\"") + "\"");
                     }
-                    sqlT.Commit();
+                    else sb.Append(txt);
                 }
-                catch (Exception e)
-                {
-                    if (sqlT != null)
-                        sqlT.Rollback();
-                    CallException(SQLs + "        " + e.Message);
-                    res = -1;
-                }
-                return res;
+                sb.AppendLine();
             }
+            return sb.ToString();
         }
 
-        #endregion ExecuteNonQuery
-
-        #region FillDataSet //填充一个记录集
-
-        /// <summary>
-        /// 用指定的SQL语句来填充一个记录集
-        /// </summary>
-        /// <param name="ds">记录集</param>
-        /// <param name="SQL">SELECT语句</param>
-        /// <param name="TableName">映射表名</param>
-        public static void FillDataSet(ref DataSet ds, string SQL, string TableName)
-        {
-            try
-            {
-                SqlConnection m_Conn;
-                m_Conn = new SqlConnection(m_ConnStr);
-                SqlDataAdapter da = new SqlDataAdapter();
-                SqlCommand cmd = new SqlCommand(SQL, m_Conn);
-                da.SelectCommand = cmd;
-                da.Fill(ds, TableName);
-            }
-            catch (Exception e)
-            {
-                CallException(SQL + "        " + e.Message);
-            }
-        }
-
-        #endregion FillDataSet
-
-        #region
-        // <summary>
-        /// 返回一个SqlDataReader
-        /// </summary>
-        public static SqlDataReader ExecuteReader(string sSQL)
-        {
-            SqlConnection connection = new SqlConnection(m_ConnStr);
-            SqlCommand command = new SqlCommand(sSQL, connection);
-            if (connection.State == ConnectionState.Closed)
-                connection.Open();
-            return command.ExecuteReader(CommandBehavior.CloseConnection);
-        }
-
-
-        public static SqlDataReader ExecuteProcedureReader(string sSQL, params SqlParameter[] ParaName)
-        {
-            SqlConnection connection = new SqlConnection(m_ConnStr);
-            SqlCommand command = new SqlCommand(sSQL, connection);
-            command.CommandType = CommandType.StoredProcedure;
-            if (ParaName != null)
+        public static string ReaderToCsv(IDataReader reader)
+        {  
+            StringBuilder sb = new StringBuilder();
+            var colcount = reader.FieldCount;
+            while (reader.Read())
             {
-                command.Parameters.AddRange(ParaName);
-            }
-            try
-            {
-                if (connection.State == ConnectionState.Closed)
-                    connection.Open();
-                return command.ExecuteReader(CommandBehavior.CloseConnection);
-            }
-            catch (Exception e)
-            {
-                CallException(sSQL + "        " + e.Message);
-                return null;
-            }
-        }
-        #endregion
-
-        #region ExecuteScalar //执行查询，并返回查询所返回的结果集中第一行的第一列
-
-        /// <summary>
-        /// 执行查询，并返回查询所返回的结果集中第一行的第一列
-        /// </summary>
-        /// <param name="sSQL">SQL语句</param>
-        /// <returns></returns>
-        public static object ExecuteScalar(string sSQL)
-        {
-            SqlTransaction sqlT = null;
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
-            {
-                SqlCommand cmd = new SqlCommand(sSQL, m_Conn);
-                try
-                {
-                    if (m_Conn.State == ConnectionState.Closed)
-                        m_Conn.Open();
-                    sqlT = m_Conn.BeginTransaction();
-                    cmd.Transaction = sqlT;
-                    var res = cmd.ExecuteScalar();
-                    sqlT.Commit();
-                    if (res == DBNull.Value) res = null;
-                    return res;
-                }
-                catch (Exception e)
+                for (int i = 0; i < colcount; i++)
                 {
-                    if (sqlT != null)
-                        sqlT.Rollback();
-                    CallException(sSQL + "        " + e.Message);
-                    return null;
-                }
-            }
-        }
-
-        #endregion ExecuteScalar
-
-        #region ExecuteStoredProcedure //执行一个存储过程
-
-        /// <summary>
-        /// 执行一个带参数的存储过程
-        /// </summary>
-        /// <param name="ProName">存储过程名</param>
-        /// <param name="ParaName">参数名称</param>
-        /// <param name="ParaDir">参数方向，Input参数是输入参数 InputOutput参数既能输入，也能输出 Output参数是输出参数 ReturnValue参数存储过程返回值。</param>
-        /// <param name="Para">参数对象数组</param>
-        /// <returns>成功返回true，失败返回false</returns>
-        public static int ExecuteStoredProcedure(string ProName, params SqlParameter[] ParaName)
-        {
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
-            {
-                try
-                {
-                    SqlCommand cmd = new SqlCommand(ProName, m_Conn)
-                    {
-                        CommandType = CommandType.StoredProcedure
-                    };
-                    if (ParaName != null)
-                    {
-                        cmd.Parameters.AddRange(ParaName);
-                    }
-                    SqlParameter param = new SqlParameter();
-                    cmd.Parameters.Add(param);
-                    param.Direction = ParameterDirection.ReturnValue;
-                    if (m_Conn.State == ConnectionState.Closed)
+                    if (i != 0) sb.Append(",");
+                    var txt = reader[i] == null ? "" : reader[i].ToString();
+                    if (txt.Contains(","))
                     {
-                        m_Conn.Open();
+                        sb.Append("\"" + txt.Replace("\"", "\"\"") + "\"");
                     }
-                    cmd.ExecuteNonQuery();
-                    return (int)param.Value;
-                }
-                catch (Exception e)
-                {
-                    CallException(ProName + "        " + e.Message);
-                    return -1;
-                }
-            }
-        }
-
-        /// <summary>
-        /// 执行一个没有参数和返回值的存储过程（默认参数类型）
-        /// </summary>
-        /// <param name="ProName">存储过程名</param>
-        /// <param name="Para">参数对象数组</param>
-        /// <returns>成功返回true，失败返回false</returns>
-        public static bool ExecuteStoredProcedure(string ProName)
-        {
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
-            {
-                try
-                {
-                    if (m_Conn.State == ConnectionState.Closed)
-                        m_Conn.Open();
-                    SqlCommand cmd = new SqlCommand(ProName, m_Conn);
-                    cmd.CommandType = CommandType.StoredProcedure;
-                    cmd.ExecuteNonQuery();
-                    return true;
-                }
-                catch (Exception e)
-                {
-                    CallException(ProName + "        " + e.Message);
-                    return false;
+                    else sb.Append(txt);
                 }
+                sb.AppendLine();
             }
+            return sb.ToString();
         }
 
-        /// <summary>
-        /// 执行一个带参数的存储过程，并返回数据集
-        /// </summary>
-        /// <param name="ProName">存储过程名</param>
-        /// <param name="ParaName">参数名称</param>
-        /// <param name="Para">参数对象数组</param>
-        /// <param name="ds">执行过程中返回的数据集</param>
-        /// <returns>成功返回true，失败返回false</returns>
-        public static DataSet ExecuteDataSetProcedure(string ProName, ref int returnValue, params SqlParameter[] ParaName)
+        public static void AddErrorLog(Exception e)
         {
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
+            string err = "";
+            Exception exp = e;
+            while (exp != null)
             {
-                DataSet ds = new DataSet();
-                try
-                {
-                    SqlCommand cmd = new SqlCommand(ProName, m_Conn);
-                    cmd.CommandType = CommandType.StoredProcedure;
-                    if (ParaName != null)
-                    {
-                        cmd.Parameters.AddRange(ParaName);
-                    }
-                    SqlParameter param = new SqlParameter { Direction = ParameterDirection.ReturnValue };
-                    cmd.Parameters.Add(param);
-                    if (m_Conn.State == ConnectionState.Closed)
-                        m_Conn.Open();
-                    SqlDataAdapter da = new SqlDataAdapter();
-                    da.SelectCommand = cmd;
-                    da.Fill(ds);
-                    returnValue = (int)param.Value;
-                    return ds;
-                }
-                catch (Exception e)
-                {
-                    CallException(ProName + "        " + e.Message);
-                    return null;
-                }
+                err += string.Format("\n {0}", exp.Message);
+                exp = exp.InnerException;
             }
+            err += string.Format("\n {0}", e.StackTrace);
+            Log.Source = DATALOGSOURCE;
+            Log.WriteEntry(err, EventLogEntryType.Error);
         }
 
-        public static DataSet ExecuteDataSetProcedure(string ProName, params SqlParameter[] ParaName)
+        public static string GetNullableString(this DbDataReader reader, int index)
         {
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
+            SqlDataReader dataReader = reader as SqlDataReader;
+            if (dataReader != null)
             {
-                DataSet ds = new DataSet();
-                try
-                {
-                    SqlCommand cmd = new SqlCommand(ProName, m_Conn);
-                    cmd.CommandType = CommandType.StoredProcedure;
-                    if (ParaName != null)
-                    {
-                        cmd.Parameters.AddRange(ParaName);
-                    }
-                    if (m_Conn.State == ConnectionState.Closed)
-                        m_Conn.Open();
-                    SqlDataAdapter da = new SqlDataAdapter();
-                    da.SelectCommand = cmd;
-                    da.Fill(ds);
-                    return ds;
-                }
-
-                catch (Exception e)
-                {
-                    CallException(ProName + "        " + e.Message);
-                    return null;
-                }
+                var svr = dataReader.GetSqlString(index);
+                return svr.IsNull ? null : svr.Value;
             }
+            else return reader.GetString(index);
         }
 
-        /// <summary>
-        /// 执行一个带参数的存储过程，并返回数据集
-        /// </summary>
-        /// <param name="ProName">存储过程名</param>
-        /// <param name="ParaName">参数名称</param>
-        /// <param name="Para">参数对象数组</param>
-        /// <param name="ds">执行过程中返回的数据集</param>
-        /// <returns>成功返回true，失败返回false</returns>
-        /// 
-        public static DataTable ExecuteDataTableProcedure(string ProName, params SqlParameter[] ParaName)
+        public static DateTime? GetNullableTime(this DbDataReader reader, int index)
         {
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
-            {
-                DataTable ds = new DataTable();
-                try
-                {
-                    SqlCommand cmd = new SqlCommand(ProName, m_Conn);
-                    cmd.CommandType = CommandType.StoredProcedure;
-                    if (ParaName != null)
-                    {
-                        cmd.Parameters.AddRange(ParaName);
-                    }
-                    if (m_Conn.State == ConnectionState.Closed)
-                        m_Conn.Open();
-                    SqlDataAdapter da = new SqlDataAdapter();
-                    da.SelectCommand = cmd;
-                    da.Fill(ds);
-                    return ds;
-                }
-                catch (Exception e)
-                {
-                    CallException(ProName + "        " + e.Message);
-                    return null;
-                }
-            }
+            SqlDataReader dataReader = reader as SqlDataReader;
+            var svr = dataReader.GetSqlDateTime(index);
+            return svr.IsNull ? default(Nullable<DateTime>) : svr.Value;
         }
 
-        public static DataTable ExecuteDataTableProcedure(string ProName, ref int returnValue, SqlParameter[] ParaName)
+        public static int GetTimeTick(this DbDataReader reader, int index)
         {
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
+            SqlDataReader dataReader = reader as SqlDataReader;
+            if (dataReader != null)
             {
-                DataTable ds = new DataTable();
-                try
-                {
-                    SqlCommand cmd = new SqlCommand(ProName, m_Conn);
-                    cmd.CommandType = CommandType.StoredProcedure;
-                    if (ParaName != null)
-                    {
-                        cmd.Parameters.AddRange(ParaName);
-                    }
-                    SqlParameter param = new SqlParameter { Direction = ParameterDirection.ReturnValue };
-                    cmd.Parameters.Add(param);
-                    if (m_Conn.State == ConnectionState.Closed)
-                        m_Conn.Open();
-                    SqlDataAdapter da = new SqlDataAdapter();
-                    da.SelectCommand = cmd;
-                    da.Fill(ds);
-                    returnValue = (int)param.Value;
-                    return ds;
-                }
-                catch (Exception e)
-                {
-                    CallException(ProName + "        " + e.Message);
-                    return null;
-                }
+                return dataReader.GetSqlDateTime(index).TimeTicks;
             }
+            var datetime = reader.GetDateTime(index);
+            var value = datetime.Subtract(new DateTime(1900, 1, 1));
+            long num2 = value.Ticks - value.Days * 864000000000;
+            if (num2 < 0)
+                num2 += 864000000000;
+            int num3 = (int)(num2 / 10000.0 * 0.3 + 0.5);
+            if (num3 > 300 * 60 * 60 * 24 - 1)
+                num3 = 0;
+            return num3;
         }
 
-        /// <summary>
-        /// 执行一个带参数的存储过程,同时输出一行
-        /// </summary>
-        /// <param name="ProName">存储过程名</param>
-        /// <param name="ParaName">参数名称</param>
-        /// <param name="Para">参数对象数组</param>
-        /// <returns>返回整数</returns>		
-        public static DataRow ExecuteDataRowProcedure(string ProName, params SqlParameter[] ParaName)
+        public static object GetSqlValue(this DbDataReader reader, int index)
         {
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
+            SqlDataReader dataReader = reader as SqlDataReader;
+            if (dataReader != null)
             {
-                try
-                {
-                    SqlCommand cmd = new SqlCommand(ProName, m_Conn);
-                    cmd.CommandType = CommandType.StoredProcedure;
-                    if (ParaName != null)
-                    {
-                        cmd.Parameters.AddRange(ParaName);
-                    }
-                    if (m_Conn.State == ConnectionState.Closed)
-                        m_Conn.Open();
-                    DataTable table = new DataTable();
-                    SqlDataAdapter da = new SqlDataAdapter();
-                    da.SelectCommand = cmd;
-                    da.Fill(table);
-                    if (table.Rows.Count > 0)
-                        return table.Rows[0];
-                    else
-                        return table.NewRow();
-                }
-                catch (Exception e)
-                {
-                    CallException(ProName + "        " + e.Message);
-                    return null;
-                }
+                return dataReader.GetSqlValue(index);
             }
-        }
-
-        /// <summary>
-        /// 执行一个带参数的存储过程,同时输出一行
-        /// </summary>
-        /// <param name="ProName">存储过程名</param>
-        /// <param name="ParaName">参数名称</param>
-        /// <param name="Para">参数对象数组</param>
-        /// <returns>返回整数</returns>		
-        public static DataRowView ExecuteDataRowViewProcedure(string ProName, params SqlParameter[] ParaName)
-        {
-            using (SqlConnection m_Conn = new SqlConnection(m_ConnStr))
+            var mq = reader as MySqlDataReader;
+            if (mq != null)
             {
-                try
-                {
-                    SqlCommand cmd = new SqlCommand(ProName, m_Conn);
-                    cmd.CommandType = CommandType.StoredProcedure;
-                    if (ParaName != null)
-                    {
-                        cmd.Parameters.AddRange(ParaName);
-                    }
-                    if (m_Conn.State == ConnectionState.Closed)
-                        m_Conn.Open();
-                    DataTable table = new DataTable();
-                    SqlDataAdapter da = new SqlDataAdapter();
-                    da.SelectCommand = cmd;
-                    da.Fill(table);
-                    if (table.Rows.Count > 0)
-                        return table.DefaultView[0];
-                    else
-                        return table.DefaultView.AddNew();
-                }
-                catch (Exception e)
-                {
-                    CallException(ProName + "        " + e.Message);
-                    return null;
-                }
+                return mq.GetValue(index);
             }
+            return "";
         }
-
-        #endregion ExecuteStoredProcedure
     }
 
+
     public static class WinAPI
     {
 
@@ -760,4 +236,4 @@ namespace DatabaseLib
         [DllImport("kernel32")]
         public static extern int GetPrivateProfileString(string section, string key, string def, StringBuilder retval, int size, string filePath);
     }
-}
+}

SCADA/Program/DataHelper/DataHelper.csproj

@@ -139,6 +139,10 @@
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="MySql.Data, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.6.9.10\lib\net40\MySql.Data.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.XML" />
@@ -146,6 +150,9 @@
   <ItemGroup>
     <Compile Include="DataHelper.cs" />
     <Compile Include="HDAIOHelper.cs" />
+    <Compile Include="IDataFactory.cs" />
+    <Compile Include="MssqlFactory.cs" />
+    <Compile Include="MysqlFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -154,6 +161,10 @@
       <Name>DataService</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

SCADA/Program/DataHelper/HDAIOHelper.cs

@@ -62,7 +62,7 @@ namespace DatabaseLib
 
         public static bool GetRangeFromDatabase(short? ID, ref DateTime start, ref DateTime end)
         {
-            using (SqlDataReader reader = DataHelper.ExecuteReader("SELECT MIN(TIMESTAMP),MAX(TIMESTAMP) FROM LOG_HDATA" + (ID.HasValue ? " WHERE ID=" + ID.Value : "")))
+            using (var reader = DataHelper.Instance.ExecuteReader("SELECT MIN(TIMESTAMP),MAX(TIMESTAMP) FROM LOG_HDATA" + (ID.HasValue ? " WHERE ID=" + ID.Value : "")))
             {
                 if (reader != null)
                 {
@@ -86,7 +86,7 @@ namespace DatabaseLib
             {
                 if (WriteToFile(date.AddDays(-1)) == 0)
                 {
-                    DataHelper.ExecuteNonQuery(string.Format("DELETE FROM LOG_HDATA WHERE [TIMESTAMP]<='{0}';", date.ToShortDateString()));
+                    DataHelper.Instance.ExecuteNonQuery(string.Format("DELETE FROM LOG_HDATA WHERE [TIMESTAMP]<='{0}';", date.ToShortDateString()));
                 }
             }
         }
@@ -104,8 +104,7 @@ namespace DatabaseLib
                     stream.Read(bits, 0, 8);//如果该位置指针为>0的正数，说明该区域已有数据
                     if (BitConverter.ToInt64(bits, 0) > 0) return -1;
                 }
-                using (SqlDataReader dataReader = DataHelper.ExecuteProcedureReader("WRITEHDATA",
-                  new SqlParameter("@DATE", SqlDbType.DateTime) { Value = date }))
+                using (var dataReader = DataHelper.Instance.ExecuteProcedureReader("WRITEHDATA", DataHelper.CreateParam("@DATE", SqlDbType.DateTime, date)))
                 {
                     if (dataReader == null) return -10;
                     else
@@ -160,7 +159,7 @@ namespace DatabaseLib
                                                 {
                                                     if (dataReader.Read())
                                                     {
-                                                        w.Write(dataReader.GetSqlDateTime(0).TimeTicks);
+                                                        w.Write(dataReader.GetTimeTick(0));
                                                         switch (list[i].Type)
                                                         {
                                                             case DataType.BOOL:
@@ -442,10 +441,10 @@ namespace DatabaseLib
 
         public static IEnumerable<HistoryData> LoadFromDatabase(DateTime start, DateTime end, short? ID = null)
         {
-            using (SqlDataReader dataReader = DataHelper.ExecuteProcedureReader("READHDATA",
-              new SqlParameter("@STARTTIME", SqlDbType.DateTime) { Value = start },
-              new SqlParameter("@ENDTIME", SqlDbType.DateTime) { Value = end },
-              new SqlParameter("@ID", SqlDbType.Int) { Value = (object)ID ?? DBNull.Value }))
+            using (var dataReader = DataHelper.Instance.ExecuteProcedureReader("READHDATA",
+                DataHelper.CreateParam("@STARTTIME", SqlDbType.DateTime, start),
+                DataHelper.CreateParam("@ENDTIME", SqlDbType.DateTime, end),
+                DataHelper.CreateParam("@ID", SqlDbType.Int, (object)ID ?? DBNull.Value)))
             {
                 if (dataReader == null) yield break;
                 HistoryData data = HistoryData.Empty;
@@ -492,7 +491,7 @@ namespace DatabaseLib
             {
                 sql.Append("'").Append(timeStamps[i]).Append("',");
             }
-            using (SqlDataReader dataReader = DataHelper.ExecuteReader(sql.Append("1)").ToString()))
+            using (var dataReader = DataHelper.Instance.ExecuteReader(sql.Append("1)").ToString()))
             {
                 if (dataReader == null) yield break;
                 HistoryData data = HistoryData.Empty;

SCADA/Program/DataHelper/IDataFactory.cs

@@ -0,0 +1,33 @@
+using System.Data;
+using System.Data.Common;
+using System.Data.SqlClient;
+
+namespace DatabaseLib
+{
+    public interface IDataFactory
+    {
+        bool BulkCopy(IDataReader reader, string tableName, string command = null, SqlBulkCopyOptions options = SqlBulkCopyOptions.Default);
+        void CallException(string message);
+        bool ConnectionTest();
+        DbParameter CreateParam(string paramName, SqlDbType dbType, object objValue, int size = 0, ParameterDirection direction = ParameterDirection.Input);
+        DataRow ExecuteDataRowProcedure(string ProName, params DbParameter[] ParaName);
+        DataRowView ExecuteDataRowViewProcedure(string ProName, params DbParameter[] ParaName);
+        DataSet ExecuteDataset(string SQL);
+        DataSet ExecuteDataset(string[] SQLs, string[] TableNames);
+        DataSet ExecuteDataset(string SQL, string TableName);
+        DataSet ExecuteDataSetProcedure(string ProName, params DbParameter[] ParaName);
+        DataSet ExecuteDataSetProcedure(string ProName, ref int returnValue, params DbParameter[] ParaName);
+        DataTable ExecuteDataTable(string SQL);
+        DataTable ExecuteDataTableProcedure(string ProName, params DbParameter[] ParaName);
+        DataTable ExecuteDataTableProcedure(string ProName, ref int returnValue, DbParameter[] ParaName);
+        int ExecuteNonQuery(string[] SQLs);
+        int ExecuteNonQuery(string SQL);
+        int ExecuteNonQuery(string[] SQLs, object[][] Pars);
+        DbDataReader ExecuteProcedureReader(string sSQL, params DbParameter[] ParaName);
+        DbDataReader ExecuteReader(string sSQL);
+        object ExecuteScalar(string sSQL);
+        bool ExecuteStoredProcedure(string ProName);
+        int ExecuteStoredProcedure(string ProName, params DbParameter[] ParaName);
+        void FillDataSet(ref DataSet ds, string SQL, string TableName);
+    }
+}

SCADA/Program/DataHelper/MssqlFactory.cs

@@ -0,0 +1,710 @@
+using System;
+using System.Data;
+using System.Data.Common;
+using System.Data.SqlClient;
+
+namespace DatabaseLib
+{
+    public class MssqlFactory : IDataFactory
+    {
+        public void CallException(string message)
+        {
+            DataHelper.AddErrorLog(new Exception(message));
+        }
+
+        public bool ConnectionTest()
+        {
+            //创建连接对象
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                //mySqlConnection.ConnectionTimeout = 1;//设置连接超时的时间
+                try
+                {
+                    //Open DataBase
+                    //打开数据库
+                    m_Conn.Open();
+                    if (m_Conn.State == ConnectionState.Open)
+                    {
+                        return true;
+                    }
+                }
+                catch (Exception e)
+                {
+                    CallException(e.Message);
+                }
+            }
+            //mySqlConnection   is   a   SqlConnection   object 
+            return false;
+        }
+
+        public DbParameter CreateParam(string paramName, SqlDbType dbType, object objValue, int size = 0, ParameterDirection direction = ParameterDirection.Input)
+        {
+            SqlParameter parameter = new SqlParameter(paramName, dbType);
+            if (size > 0) parameter.Size = size;
+            if (objValue == null)
+            {
+                if (direction == ParameterDirection.Output)
+                {
+                    parameter.Direction = direction;
+                    return parameter;
+                }
+                parameter.IsNullable = true;
+                parameter.Value = DBNull.Value;
+                return parameter;
+            }
+            parameter.Value = objValue;
+            return parameter;
+        }
+
+        #region ExecuteDataset  //执行查询语句，返回一个记录集
+
+        /// <summary>
+        /// 返回记录集
+        /// </summary>
+        /// <param name="SQL">用于返回记录集的SQL语句</param>
+        /// <returns>记录集</returns>
+        public DataSet ExecuteDataset(string SQL)
+        {
+            DataSet ds = new DataSet();
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                try
+                {
+                    SqlDataAdapter da = new SqlDataAdapter();
+                    SqlCommand cmd = new SqlCommand(SQL, m_Conn);
+                    da.SelectCommand = cmd;
+                    da.Fill(ds);
+                }
+                catch (Exception e)
+                {
+                    CallException(SQL + "        " + e.Message);
+                }
+            }
+            return ds;
+        }
+
+
+        /// <summary>
+        /// 返回记录集
+        /// </summary>
+        /// <param name="SQL">用于返回记录集的SQL语句</param>
+        /// <param name="TableName">映射表名</param>
+        /// <returns>记录集</returns>
+        public DataSet ExecuteDataset(string SQL, string TableName)
+        {
+            DataSet ds = new DataSet();
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                try
+                {
+                    SqlDataAdapter da = new SqlDataAdapter();
+                    SqlCommand cmd = new SqlCommand(SQL, m_Conn);
+                    da.SelectCommand = cmd;
+                    da.Fill(ds, TableName);
+                }
+                catch (Exception e)
+                {
+                    CallException(SQL + "        " + e.Message);
+                }
+            }
+            return ds;
+        }
+
+        /// <summary>
+        /// 返回包含多个表的记录集
+        /// </summary>
+        /// <param name="SQLs">用于返回记录集的SQL语句</param>
+        /// <param name="TableNames">映射表名</param>
+        /// <returns>记录集</returns>
+
+        public DataSet ExecuteDataset(string[] SQLs, string[] TableNames)
+        {
+            DataSet ds = new DataSet();
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                try
+                {
+                    for (int i = 0; i < SQLs.Length; i++)
+                    {
+
+                        SqlDataAdapter da = new SqlDataAdapter();
+                        SqlCommand cmd = new SqlCommand(SQLs[i], m_Conn);
+                        da.SelectCommand = cmd;
+                        da.Fill(ds, TableNames[i]);
+                    }
+                }
+                catch (Exception e)
+                {
+                    CallException(SQLs + "        " + e.Message);
+                }
+            }
+            return ds;
+        }
+
+        #endregion ExecuteDataset
+
+        /// <summary>
+        /// 返回表
+        /// </summary>
+        /// <param name="SQL">用于返回记录集的SQL语句</param>
+        /// <returns>记录集</returns>
+        public DataTable ExecuteDataTable(string SQL)
+        {
+            DataTable dt = new DataTable();
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                try
+                {
+                    SqlDataAdapter da = new SqlDataAdapter();
+                    SqlCommand cmd = new SqlCommand(SQL, m_Conn);
+                    da.SelectCommand = cmd;
+                    da.Fill(dt);
+                }
+                catch (Exception e)
+                {
+                    CallException(SQL + "        " + e.Message);
+                }
+            }
+            return dt;
+        }
+
+        #region ExecuteNonQuery //执行非查询语句
+
+        /// <summary>
+        /// 执行一条INSERT、UPDATE、DELETE语句
+        /// </summary>
+        /// <param name="SQL">T-SQL语句</param>
+        /// <returns>返回影响的行数</returns>
+        public int ExecuteNonQuery(string SQL)
+        {
+            int res = -1;
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                SqlTransaction sqlT = null;
+                try
+                {
+                    using (SqlCommand cmd = new SqlCommand(SQL, m_Conn))
+                    {
+                        if (m_Conn.State == ConnectionState.Closed)
+                            m_Conn.Open();
+                        cmd.Connection = m_Conn;
+                        sqlT = m_Conn.BeginTransaction();
+                        cmd.Transaction = sqlT;
+                        res = cmd.ExecuteNonQuery();
+                        sqlT.Commit();
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (sqlT != null)
+                        sqlT.Rollback();
+                    CallException(SQL + "   " + e.Message);
+                    return -1;
+                }
+                return res;
+            }
+        }
+
+        /// <summary>
+        /// 执行一组INSERT、UPDATE、DELETE语句
+        /// </summary>
+        /// <param name="SQLs">T-SQL语句</param>
+        /// <returns>返回影响的行数</returns>
+        public int ExecuteNonQuery(string[] SQLs)
+        {
+            int res = -1;
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                SqlTransaction sqlT = null;
+                SqlCommand cmd = new SqlCommand();
+                try
+                {
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    cmd.Connection = m_Conn;
+                    sqlT = m_Conn.BeginTransaction();
+                    cmd.Transaction = sqlT;
+                    for (int i = 0; i < SQLs.Length; i++)
+                    {
+                        cmd.CommandText = SQLs[i];
+                        res = cmd.ExecuteNonQuery();
+                    }
+                    sqlT.Commit();
+                }
+                catch (Exception e)
+                {
+                    if (sqlT != null)
+                        sqlT.Rollback();
+                    CallException(SQLs + "        " + e.Message);
+                    res = -1;
+                }
+                return res;
+            }
+        }
+
+        /// <summary>
+        /// 执行一组INSERT、UPDATE、DELETE语句
+        /// </summary>
+        /// <param name="SQLs">T-SQL语句</param>
+        /// <param name="Pars">执行参数</param>
+        /// <returns>返回影响的行数</returns>
+        public int ExecuteNonQuery(string[] SQLs, object[][] Pars)
+        {
+            int res = -1;
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                SqlTransaction sqlT = null;
+                SqlCommand cmd = new SqlCommand();
+                try
+                {
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    cmd.Connection = m_Conn;
+                    sqlT = m_Conn.BeginTransaction();
+                    cmd.Transaction = sqlT;
+                    for (int i = 0; i < SQLs.Length; i++)
+                    {
+                        cmd.CommandText = SQLs[i];
+                        cmd.Parameters.Clear();
+                        for (int j = 0; j < Pars[i].Length; j++)
+                        {
+                            cmd.Parameters.AddWithValue("@p" + j.ToString(), Pars[i][j]);
+                        }
+                        res = cmd.ExecuteNonQuery();
+                    }
+                    sqlT.Commit();
+                }
+                catch (Exception e)
+                {
+                    if (sqlT != null)
+                        sqlT.Rollback();
+                    CallException(SQLs + "        " + e.Message);
+                    res = -1;
+                }
+                return res;
+            }
+        }
+
+        #endregion ExecuteNonQuery
+
+        #region FillDataSet //填充一个记录集
+
+        /// <summary>
+        /// 用指定的SQL语句来填充一个记录集
+        /// </summary>
+        /// <param name="ds">记录集</param>
+        /// <param name="SQL">SELECT语句</param>
+        /// <param name="TableName">映射表名</param>
+        public void FillDataSet(ref DataSet ds, string SQL, string TableName)
+        {
+            try
+            {
+                SqlConnection m_Conn;
+                m_Conn = new SqlConnection(DataHelper.ConnectString);
+                SqlDataAdapter da = new SqlDataAdapter();
+                SqlCommand cmd = new SqlCommand(SQL, m_Conn);
+                da.SelectCommand = cmd;
+                da.Fill(ds, TableName);
+            }
+            catch (Exception e)
+            {
+                CallException(SQL + "        " + e.Message);
+            }
+        }
+
+        #endregion FillDataSet
+
+        #region
+        // <summary>
+        /// 返回一个SqlDataReader
+        /// </summary>
+        public DbDataReader ExecuteReader(string sSQL)
+        {
+            SqlConnection connection = new SqlConnection(DataHelper.ConnectString);
+            SqlCommand command = new SqlCommand(sSQL, connection);
+            if (connection.State == ConnectionState.Closed)
+                connection.Open();
+            return command.ExecuteReader(CommandBehavior.CloseConnection);
+        }
+
+
+        public DbDataReader ExecuteProcedureReader(string sSQL, params DbParameter[] ParaName)
+        {
+            SqlConnection connection = new SqlConnection(DataHelper.ConnectString);
+            SqlCommand command = new SqlCommand(sSQL, connection);
+            command.CommandType = CommandType.StoredProcedure;
+            if (ParaName != null)
+            {
+                command.Parameters.AddRange(ParaName);
+            }
+            try
+            {
+                if (connection.State == ConnectionState.Closed)
+                    connection.Open();
+                return command.ExecuteReader(CommandBehavior.CloseConnection);
+            }
+            catch (Exception e)
+            {
+                CallException(sSQL + "        " + e.Message);
+                return null;
+            }
+        }
+        #endregion
+
+        #region ExecuteScalar //执行查询，并返回查询所返回的结果集中第一行的第一列
+
+        /// <summary>
+        /// 执行查询，并返回查询所返回的结果集中第一行的第一列
+        /// </summary>
+        /// <param name="sSQL">SQL语句</param>
+        /// <returns></returns>
+        public object ExecuteScalar(string sSQL)
+        {
+            SqlTransaction sqlT = null;
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                SqlCommand cmd = new SqlCommand(sSQL, m_Conn);
+                try
+                {
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    sqlT = m_Conn.BeginTransaction();
+                    cmd.Transaction = sqlT;
+                    var res = cmd.ExecuteScalar();
+                    sqlT.Commit();
+                    if (res == DBNull.Value) res = null;
+                    return res;
+                }
+                catch (Exception e)
+                {
+                    if (sqlT != null)
+                        sqlT.Rollback();
+                    CallException(sSQL + "        " + e.Message);
+                    return null;
+                }
+            }
+        }
+
+        #endregion ExecuteScalar
+
+        #region ExecuteStoredProcedure //执行一个存储过程
+
+        /// <summary>
+        /// 执行一个带参数的存储过程
+        /// </summary>
+        /// <param name="ProName">存储过程名</param>
+        /// <param name="ParaName">参数名称</param>
+        /// <param name="ParaDir">参数方向，Input参数是输入参数 InputOutput参数既能输入，也能输出 Output参数是输出参数 ReturnValue参数存储过程返回值。</param>
+        /// <param name="Para">参数对象数组</param>
+        /// <returns>成功返回true，失败返回false</returns>
+        public int ExecuteStoredProcedure(string ProName, params DbParameter[] ParaName)
+        {
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                try
+                {
+                    SqlCommand cmd = new SqlCommand(ProName, m_Conn)
+                    {
+                        CommandType = CommandType.StoredProcedure
+                    };
+                    if (ParaName != null)
+                    {
+                        cmd.Parameters.AddRange(ParaName);
+                    }
+                    SqlParameter param = new SqlParameter();
+                    cmd.Parameters.Add(param);
+                    param.Direction = ParameterDirection.ReturnValue;
+                    if (m_Conn.State == ConnectionState.Closed)
+                    {
+                        m_Conn.Open();
+                    }
+                    cmd.ExecuteNonQuery();
+                    return (int)param.Value;
+                }
+                catch (Exception e)
+                {
+                    CallException(ProName + "        " + e.Message);
+                    return -1;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 执行一个没有参数和返回值的存储过程（默认参数类型）
+        /// </summary>
+        /// <param name="ProName">存储过程名</param>
+        /// <param name="Para">参数对象数组</param>
+        /// <returns>成功返回true，失败返回false</returns>
+        public bool ExecuteStoredProcedure(string ProName)
+        {
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                try
+                {
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    SqlCommand cmd = new SqlCommand(ProName, m_Conn);
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    cmd.ExecuteNonQuery();
+                    return true;
+                }
+                catch (Exception e)
+                {
+                    CallException(ProName + "        " + e.Message);
+                    return false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 执行一个带参数的存储过程，并返回数据集
+        /// </summary>
+        /// <param name="ProName">存储过程名</param>
+        /// <param name="ParaName">参数名称</param>
+        /// <param name="Para">参数对象数组</param>
+        /// <param name="ds">执行过程中返回的数据集</param>
+        /// <returns>成功返回true，失败返回false</returns>
+        public DataSet ExecuteDataSetProcedure(string ProName, ref int returnValue, params DbParameter[] ParaName)
+        {
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                DataSet ds = new DataSet();
+                try
+                {
+                    SqlCommand cmd = new SqlCommand(ProName, m_Conn);
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    if (ParaName != null)
+                    {
+                        cmd.Parameters.AddRange(ParaName);
+                    }
+                    SqlParameter param = new SqlParameter { Direction = ParameterDirection.ReturnValue };
+                    cmd.Parameters.Add(param);
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    SqlDataAdapter da = new SqlDataAdapter();
+                    da.SelectCommand = cmd;
+                    da.Fill(ds);
+                    returnValue = (int)param.Value;
+                    return ds;
+                }
+                catch (Exception e)
+                {
+                    CallException(ProName + "        " + e.Message);
+                    return null;
+                }
+            }
+        }
+
+        public DataSet ExecuteDataSetProcedure(string ProName, params DbParameter[] ParaName)
+        {
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                DataSet ds = new DataSet();
+                try
+                {
+                    SqlCommand cmd = new SqlCommand(ProName, m_Conn);
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    if (ParaName != null)
+                    {
+                        cmd.Parameters.AddRange(ParaName);
+                    }
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    SqlDataAdapter da = new SqlDataAdapter();
+                    da.SelectCommand = cmd;
+                    da.Fill(ds);
+                    return ds;
+                }
+
+                catch (Exception e)
+                {
+                    CallException(ProName + "        " + e.Message);
+                    return null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 执行一个带参数的存储过程，并返回数据集
+        /// </summary>
+        /// <param name="ProName">存储过程名</param>
+        /// <param name="ParaName">参数名称</param>
+        /// <param name="Para">参数对象数组</param>
+        /// <param name="ds">执行过程中返回的数据集</param>
+        /// <returns>成功返回true，失败返回false</returns>
+        /// 
+        public DataTable ExecuteDataTableProcedure(string ProName, params DbParameter[] ParaName)
+        {
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                DataTable ds = new DataTable();
+                try
+                {
+                    SqlCommand cmd = new SqlCommand(ProName, m_Conn);
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    if (ParaName != null)
+                    {
+                        cmd.Parameters.AddRange(ParaName);
+                    }
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    SqlDataAdapter da = new SqlDataAdapter();
+                    da.SelectCommand = cmd;
+                    da.Fill(ds);
+                    return ds;
+                }
+                catch (Exception e)
+                {
+                    CallException(ProName + "        " + e.Message);
+                    return null;
+                }
+            }
+        }
+
+        public DataTable ExecuteDataTableProcedure(string ProName, ref int returnValue, DbParameter[] ParaName)
+        {
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                DataTable ds = new DataTable();
+                try
+                {
+                    SqlCommand cmd = new SqlCommand(ProName, m_Conn);
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    if (ParaName != null)
+                    {
+                        cmd.Parameters.AddRange(ParaName);
+                    }
+                    SqlParameter param = new SqlParameter { Direction = ParameterDirection.ReturnValue };
+                    cmd.Parameters.Add(param);
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    SqlDataAdapter da = new SqlDataAdapter();
+                    da.SelectCommand = cmd;
+                    da.Fill(ds);
+                    returnValue = (int)param.Value;
+                    return ds;
+                }
+                catch (Exception e)
+                {
+                    CallException(ProName + "        " + e.Message);
+                    return null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 执行一个带参数的存储过程,同时输出一行
+        /// </summary>
+        /// <param name="ProName">存储过程名</param>
+        /// <param name="ParaName">参数名称</param>
+        /// <param name="Para">参数对象数组</param>
+        /// <returns>返回整数</returns>		
+        public DataRow ExecuteDataRowProcedure(string ProName, params DbParameter[] ParaName)
+        {
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                try
+                {
+                    SqlCommand cmd = new SqlCommand(ProName, m_Conn);
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    if (ParaName != null)
+                    {
+                        cmd.Parameters.AddRange(ParaName);
+                    }
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    DataTable table = new DataTable();
+                    SqlDataAdapter da = new SqlDataAdapter();
+                    da.SelectCommand = cmd;
+                    da.Fill(table);
+                    if (table.Rows.Count > 0)
+                        return table.Rows[0];
+                    else
+                        return table.NewRow();
+                }
+                catch (Exception e)
+                {
+                    CallException(ProName + "        " + e.Message);
+                    return null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 执行一个带参数的存储过程,同时输出一行
+        /// </summary>
+        /// <param name="ProName">存储过程名</param>
+        /// <param name="ParaName">参数名称</param>
+        /// <param name="Para">参数对象数组</param>
+        /// <returns>返回整数</returns>		
+        public DataRowView ExecuteDataRowViewProcedure(string ProName, params DbParameter[] ParaName)
+        {
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                try
+                {
+                    SqlCommand cmd = new SqlCommand(ProName, m_Conn);
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    if (ParaName != null)
+                    {
+                        cmd.Parameters.AddRange(ParaName);
+                    }
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    DataTable table = new DataTable();
+                    SqlDataAdapter da = new SqlDataAdapter();
+                    da.SelectCommand = cmd;
+                    da.Fill(table);
+                    if (table.Rows.Count > 0)
+                        return table.DefaultView[0];
+                    else
+                        return table.DefaultView.AddNew();
+                }
+                catch (Exception e)
+                {
+                    CallException(ProName + "        " + e.Message);
+                    return null;
+                }
+            }
+        }
+
+        #endregion ExecuteStoredProcedure
+
+        public bool BulkCopy(IDataReader reader, string tableName, string command = null, SqlBulkCopyOptions options = SqlBulkCopyOptions.Default)
+        {
+            using (SqlConnection m_Conn = new SqlConnection(DataHelper.ConnectString))
+            {
+                SqlTransaction sqlT = null;
+                try
+                {
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    sqlT = m_Conn.BeginTransaction();
+                    if (!string.IsNullOrEmpty(command))
+                    {
+                        SqlCommand cmd = new SqlCommand(command, m_Conn);
+                        cmd.Transaction = sqlT;
+                        cmd.ExecuteNonQuery();
+                    }
+                    SqlBulkCopy copy = new SqlBulkCopy(m_Conn, options, sqlT);
+                    copy.DestinationTableName = tableName;
+                    copy.BulkCopyTimeout = 100000;
+                    //copy.BatchSize = _capacity;
+                    copy.WriteToServer(reader);//如果写入失败，考虑不能无限增加线程数
+                                               //Clear();
+                    sqlT.Commit();
+                    m_Conn.Close();
+                    return true;
+                }
+                catch (Exception e)
+                {
+                    if (sqlT != null)
+                        sqlT.Rollback();
+                    m_Conn.Close();
+                    CallException(e.Message);
+                    return false;
+                }
+            }
+        }
+    }
+}

SCADA/Program/DataHelper/MysqlFactory.cs

@@ -0,0 +1,780 @@
+using MySql.Data.MySqlClient;
+using System;
+using System.Data;
+using System.Data.Common;
+using System.Data.SqlClient;
+using System.IO;
+
+namespace DatabaseLib
+{
+    public class MysqlFactory : IDataFactory
+    {
+        public void CallException(string message)
+        {
+            DataHelper.AddErrorLog(new Exception(message));
+        }
+
+        public bool ConnectionTest()
+        {
+            //创建连接对象
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                //myMySqlConnection.ConnectionTimeout = 1;//设置连接超时的时间
+                try
+                {
+                    //Open DataBase
+                    //打开数据库
+                    m_Conn.Open();
+                    if (m_Conn.State == ConnectionState.Open)
+                    {
+                        return true;
+                    }
+                }
+                catch (Exception e)
+                {
+                    CallException(e.Message);
+                }
+            }
+            //myMySqlConnection   is   a   MySqlConnection   object 
+            return false;
+        }
+
+        public MySqlDbType ConvertType(SqlDbType dbType)
+        {
+            switch (dbType)
+            {
+                case SqlDbType.BigInt:
+                    return MySqlDbType.Int64;
+                case SqlDbType.Binary:
+                    return MySqlDbType.Binary;
+                case SqlDbType.Bit:
+                    return MySqlDbType.Bit;
+                case SqlDbType.Date:
+                    return MySqlDbType.Date;
+                case SqlDbType.SmallDateTime:
+                case SqlDbType.DateTime2:
+                case SqlDbType.DateTime:
+                    return MySqlDbType.DateTime;
+                case SqlDbType.DateTimeOffset:
+                    return MySqlDbType.Time;
+                case SqlDbType.Decimal:
+                    return MySqlDbType.Decimal;
+                case SqlDbType.Float:
+                    return MySqlDbType.Double;
+                case SqlDbType.Image:
+                    return MySqlDbType.Binary;
+                case SqlDbType.Int:
+                    return MySqlDbType.Int32;
+                case SqlDbType.Money:
+                    return MySqlDbType.Float;
+                case SqlDbType.NText:
+                case SqlDbType.Text:
+                    return MySqlDbType.Text;
+                case SqlDbType.Real:
+                    return MySqlDbType.Float;
+                case SqlDbType.SmallInt:
+                    return MySqlDbType.Int16;
+                case SqlDbType.Structured:
+                    return MySqlDbType.Set;
+                case SqlDbType.Time:
+                    return MySqlDbType.Time;
+                case SqlDbType.Timestamp:
+                    return MySqlDbType.Timestamp;
+                case SqlDbType.TinyInt:
+                    return MySqlDbType.Byte;
+                case SqlDbType.VarBinary:
+                    return MySqlDbType.VarBinary;
+                case SqlDbType.Char:
+                case SqlDbType.NVarChar:
+                case SqlDbType.VarChar:
+                    return MySqlDbType.VarChar;
+                default:
+                    return MySqlDbType.VarChar;
+            }
+        }
+
+        public DbParameter CreateParam(string paramName, SqlDbType dbType, object objValue, int size = 0, ParameterDirection direction = ParameterDirection.Input)
+        {
+            if (string.IsNullOrEmpty(paramName)) return null;
+            if (paramName[0] == '@') paramName = 'p' + paramName.TrimStart('@');
+            MySqlParameter parameter = new MySqlParameter(paramName, ConvertType(dbType));
+            if (size > 0) parameter.Size = size;
+            if (objValue == null)
+            {
+                if (direction == ParameterDirection.Output)
+                {
+                    parameter.Direction = direction;
+                    return parameter;
+                }
+                parameter.IsNullable = true;
+                parameter.Value = DBNull.Value;
+                return parameter;
+            }
+            parameter.Value = objValue;
+            return parameter;
+        }
+
+        #region ExecuteDataset  //执行查询语句，返回一个记录集
+
+        /// <summary>
+        /// 返回记录集
+        /// </summary>
+        /// <param name="SQL">用于返回记录集的SQL语句</param>
+        /// <returns>记录集</returns>
+        public DataSet ExecuteDataset(string SQL)
+        {
+            DataSet ds = new DataSet();
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                try
+                {
+                    var da = new MySqlDataAdapter();
+                    MySqlCommand cmd = new MySqlCommand(SQL, m_Conn);
+                    da.SelectCommand = cmd;
+                    da.Fill(ds);
+                }
+                catch (Exception e)
+                {
+                    CallException(SQL + "        " + e.Message);
+                }
+            }
+            return ds;
+        }
+
+
+        /// <summary>
+        /// 返回记录集
+        /// </summary>
+        /// <param name="SQL">用于返回记录集的SQL语句</param>
+        /// <param name="TableName">映射表名</param>
+        /// <returns>记录集</returns>
+        public DataSet ExecuteDataset(string SQL, string TableName)
+        {
+            DataSet ds = new DataSet();
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                try
+                {
+                    var da = new MySqlDataAdapter();
+                    MySqlCommand cmd = new MySqlCommand(SQL, m_Conn);
+                    da.SelectCommand = cmd;
+                    da.Fill(ds, TableName);
+                }
+                catch (Exception e)
+                {
+                    CallException(SQL + "        " + e.Message);
+                }
+            }
+            return ds;
+        }
+
+        /// <summary>
+        /// 返回包含多个表的记录集
+        /// </summary>
+        /// <param name="SQLs">用于返回记录集的SQL语句</param>
+        /// <param name="TableNames">映射表名</param>
+        /// <returns>记录集</returns>
+
+        public DataSet ExecuteDataset(string[] SQLs, string[] TableNames)
+        {
+            DataSet ds = new DataSet();
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                try
+                {
+                    for (int i = 0; i < SQLs.Length; i++)
+                    {
+                        var da = new MySqlDataAdapter();
+                        MySqlCommand cmd = new MySqlCommand(SQLs[i], m_Conn);
+                        da.SelectCommand = cmd;
+                        da.Fill(ds, TableNames[i]);
+                    }
+                }
+                catch (Exception e)
+                {
+                    CallException(SQLs + "        " + e.Message);
+                }
+            }
+            return ds;
+        }
+
+        #endregion ExecuteDataset
+
+        /// <summary>
+        /// 返回表
+        /// </summary>
+        /// <param name="SQL">用于返回记录集的SQL语句</param>
+        /// <returns>记录集</returns>
+        public DataTable ExecuteDataTable(string SQL)
+        {
+            DataTable dt = new DataTable();
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                try
+                {
+                    var da = new MySqlDataAdapter();
+                    MySqlCommand cmd = new MySqlCommand(SQL, m_Conn);
+                    da.SelectCommand = cmd;
+                    da.Fill(dt);
+                }
+                catch (Exception e)
+                {
+                    CallException(SQL + "        " + e.Message);
+                }
+            }
+            return dt;
+        }
+
+        #region ExecuteNonQuery //执行非查询语句
+
+        /// <summary>
+        /// 执行一条INSERT、UPDATE、DELETE语句
+        /// </summary>
+        /// <param name="SQL">T-SQL语句</param>
+        /// <returns>返回影响的行数</returns>
+        public int ExecuteNonQuery(string SQL)
+        {
+            int res = -1;
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                MySqlTransaction sqlT = null; MySqlBulkLoader loader = new MySqlBulkLoader(m_Conn);
+                //loader.Columns
+                try
+                {
+                    using (MySqlCommand cmd = new MySqlCommand(SQL, m_Conn))
+                    {
+                        if (m_Conn.State == ConnectionState.Closed)
+                            m_Conn.Open();
+                        cmd.Connection = m_Conn;
+                        sqlT = m_Conn.BeginTransaction();
+                        cmd.Transaction = sqlT;
+                        res = cmd.ExecuteNonQuery();
+                        sqlT.Commit();
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (sqlT != null)
+                        sqlT.Rollback();
+                    CallException(SQL + "   " + e.Message);
+                    return -1;
+                }
+                return res;
+            }
+        }
+
+        /// <summary>
+        /// 执行一组INSERT、UPDATE、DELETE语句
+        /// </summary>
+        /// <param name="SQLs">T-SQL语句</param>
+        /// <returns>返回影响的行数</returns>
+        public int ExecuteNonQuery(string[] SQLs)
+        {
+            int res = -1;
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                MySqlTransaction sqlT = null;
+                MySqlCommand cmd = new MySqlCommand();
+                try
+                {
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    cmd.Connection = m_Conn;
+                    sqlT = m_Conn.BeginTransaction();
+                    cmd.Transaction = sqlT;
+                    for (int i = 0; i < SQLs.Length; i++)
+                    {
+                        cmd.CommandText = SQLs[i];
+                        res = cmd.ExecuteNonQuery();
+                    }
+                    sqlT.Commit();
+                }
+                catch (Exception e)
+                {
+                    if (sqlT != null)
+                        sqlT.Rollback();
+                    CallException(SQLs + "        " + e.Message);
+                    res = -1;
+                }
+                return res;
+            }
+        }
+
+        /// <summary>
+        /// 执行一组INSERT、UPDATE、DELETE语句
+        /// </summary>
+        /// <param name="SQLs">T-SQL语句</param>
+        /// <param name="Pars">执行参数</param>
+        /// <returns>返回影响的行数</returns>
+        public int ExecuteNonQuery(string[] SQLs, object[][] Pars)
+        {
+            int res = -1;
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                MySqlTransaction sqlT = null;
+                MySqlCommand cmd = new MySqlCommand();
+                try
+                {
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    cmd.Connection = m_Conn;
+                    sqlT = m_Conn.BeginTransaction();
+                    cmd.Transaction = sqlT;
+                    for (int i = 0; i < SQLs.Length; i++)
+                    {
+                        cmd.CommandText = SQLs[i];
+                        cmd.Parameters.Clear();
+                        for (int j = 0; j < Pars[i].Length; j++)
+                        {
+                            cmd.Parameters.AddWithValue("@p" + j.ToString(), Pars[i][j]);
+                        }
+                        res = cmd.ExecuteNonQuery();
+                    }
+                    sqlT.Commit();
+                }
+                catch (Exception e)
+                {
+                    if (sqlT != null)
+                        sqlT.Rollback();
+                    CallException(SQLs + "        " + e.Message);
+                    res = -1;
+                }
+                return res;
+            }
+        }
+
+        #endregion ExecuteNonQuery
+
+        #region FillDataSet //填充一个记录集
+
+        /// <summary>
+        /// 用指定的SQL语句来填充一个记录集
+        /// </summary>
+        /// <param name="ds">记录集</param>
+        /// <param name="SQL">SELECT语句</param>
+        /// <param name="TableName">映射表名</param>
+        public void FillDataSet(ref DataSet ds, string SQL, string TableName)
+        {
+            try
+            {
+                MySqlConnection m_Conn;
+                m_Conn = new MySqlConnection(DataHelper.ConnectString);
+                var da = new MySqlDataAdapter();
+                MySqlCommand cmd = new MySqlCommand(SQL, m_Conn);
+                da.SelectCommand = cmd;
+                da.Fill(ds, TableName);
+            }
+            catch (Exception e)
+            {
+                CallException(SQL + "        " + e.Message);
+            }
+        }
+
+        #endregion FillDataSet
+
+        #region
+        // <summary>
+        /// 返回一个MySqlDataReader
+        /// </summary>
+        public DbDataReader ExecuteReader(string sSQL)
+        {
+            MySqlConnection connection = new MySqlConnection(DataHelper.ConnectString);
+            MySqlCommand command = new MySqlCommand(sSQL, connection);
+            if (connection.State == ConnectionState.Closed)
+                connection.Open();
+            return command.ExecuteReader(CommandBehavior.CloseConnection);
+        }
+
+
+        public DbDataReader ExecuteProcedureReader(string sSQL, params DbParameter[] ParaName)
+        {
+            MySqlConnection connection = new MySqlConnection(DataHelper.ConnectString);
+            MySqlCommand command = new MySqlCommand(sSQL, connection);
+            command.CommandType = CommandType.StoredProcedure;
+            if (ParaName != null)
+            {
+                command.Parameters.AddRange(ParaName);
+            }
+            try
+            {
+                if (connection.State == ConnectionState.Closed)
+                    connection.Open();
+                return command.ExecuteReader(CommandBehavior.CloseConnection);
+            }
+            catch (Exception e)
+            {
+                CallException(sSQL + "        " + e.Message);
+                return null;
+            }
+        }
+        #endregion
+
+        #region ExecuteScalar //执行查询，并返回查询所返回的结果集中第一行的第一列
+
+        /// <summary>
+        /// 执行查询，并返回查询所返回的结果集中第一行的第一列
+        /// </summary>
+        /// <param name="sSQL">SQL语句</param>
+        /// <returns></returns>
+        public object ExecuteScalar(string sSQL)
+        {
+            MySqlTransaction sqlT = null;
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                MySqlCommand cmd = new MySqlCommand(sSQL, m_Conn);
+                try
+                {
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    sqlT = m_Conn.BeginTransaction();
+                    cmd.Transaction = sqlT;
+                    var res = cmd.ExecuteScalar();
+                    sqlT.Commit();
+                    if (res == DBNull.Value) res = null;
+                    return res;
+                }
+                catch (Exception e)
+                {
+                    if (sqlT != null)
+                        sqlT.Rollback();
+                    CallException(sSQL + "        " + e.Message);
+                    return null;
+                }
+            }
+        }
+
+        #endregion ExecuteScalar
+
+        #region ExecuteStoredProcedure //执行一个存储过程
+
+        /// <summary>
+        /// 执行一个带参数的存储过程
+        /// </summary>
+        /// <param name="ProName">存储过程名</param>
+        /// <param name="ParaName">参数名称</param>
+        /// <param name="ParaDir">参数方向，Input参数是输入参数 InputOutput参数既能输入，也能输出 Output参数是输出参数 ReturnValue参数存储过程返回值。</param>
+        /// <param name="Para">参数对象数组</param>
+        /// <returns>成功返回true，失败返回false</returns>
+        public int ExecuteStoredProcedure(string ProName, params DbParameter[] ParaName)
+        {
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                try
+                {
+                    MySqlCommand cmd = new MySqlCommand(ProName, m_Conn)
+                    {
+                        CommandType = CommandType.StoredProcedure
+                    };
+                    if (ParaName != null)
+                    {
+                        cmd.Parameters.AddRange(ParaName);
+                    }
+                    MySqlParameter param = new MySqlParameter();
+                    cmd.Parameters.Add(param);
+                    param.Direction = ParameterDirection.ReturnValue;
+                    if (m_Conn.State == ConnectionState.Closed)
+                    {
+                        m_Conn.Open();
+                    }
+                    cmd.ExecuteNonQuery();
+                    return (int)param.Value;
+                }
+                catch (Exception e)
+                {
+                    CallException(ProName + "        " + e.Message);
+                    return -1;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 执行一个没有参数和返回值的存储过程（默认参数类型）
+        /// </summary>
+        /// <param name="ProName">存储过程名</param>
+        /// <param name="Para">参数对象数组</param>
+        /// <returns>成功返回true，失败返回false</returns>
+        public bool ExecuteStoredProcedure(string ProName)
+        {
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                try
+                {
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    MySqlCommand cmd = new MySqlCommand(ProName, m_Conn);
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    cmd.ExecuteNonQuery();
+                    return true;
+                }
+                catch (Exception e)
+                {
+                    CallException(ProName + "        " + e.Message);
+                    return false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 执行一个带参数的存储过程，并返回数据集
+        /// </summary>
+        /// <param name="ProName">存储过程名</param>
+        /// <param name="ParaName">参数名称</param>
+        /// <param name="Para">参数对象数组</param>
+        /// <param name="ds">执行过程中返回的数据集</param>
+        /// <returns>成功返回true，失败返回false</returns>
+        public DataSet ExecuteDataSetProcedure(string ProName, ref int returnValue, params DbParameter[] ParaName)
+        {
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                DataSet ds = new DataSet();
+                try
+                {
+                    MySqlCommand cmd = new MySqlCommand(ProName, m_Conn);
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    if (ParaName != null)
+                    {
+                        cmd.Parameters.AddRange(ParaName);
+                    }
+                    MySqlParameter param = new MySqlParameter { Direction = ParameterDirection.ReturnValue };
+                    cmd.Parameters.Add(param);
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    var da = new MySqlDataAdapter();
+                    da.SelectCommand = cmd;
+                    da.Fill(ds);
+                    returnValue = (int)param.Value;
+                    return ds;
+                }
+                catch (Exception e)
+                {
+                    CallException(ProName + "        " + e.Message);
+                    return null;
+                }
+            }
+        }
+
+        public DataSet ExecuteDataSetProcedure(string ProName, params DbParameter[] ParaName)
+        {
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                DataSet ds = new DataSet();
+                try
+                {
+                    MySqlCommand cmd = new MySqlCommand(ProName, m_Conn);
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    if (ParaName != null)
+                    {
+                        cmd.Parameters.AddRange(ParaName);
+                    }
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    var da = new MySqlDataAdapter();
+                    da.SelectCommand = cmd;
+                    da.Fill(ds);
+                    return ds;
+                }
+
+                catch (Exception e)
+                {
+                    CallException(ProName + "        " + e.Message);
+                    return null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 执行一个带参数的存储过程，并返回数据集
+        /// </summary>
+        /// <param name="ProName">存储过程名</param>
+        /// <param name="ParaName">参数名称</param>
+        /// <param name="Para">参数对象数组</param>
+        /// <param name="ds">执行过程中返回的数据集</param>
+        /// <returns>成功返回true，失败返回false</returns>
+        /// 
+        public DataTable ExecuteDataTableProcedure(string ProName, params DbParameter[] ParaName)
+        {
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                DataTable ds = new DataTable();
+                try
+                {
+                    MySqlCommand cmd = new MySqlCommand(ProName, m_Conn);
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    if (ParaName != null)
+                    {
+                        cmd.Parameters.AddRange(ParaName);
+                    }
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    var da = new MySqlDataAdapter();
+                    da.SelectCommand = cmd;
+                    da.Fill(ds);
+                    return ds;
+                }
+                catch (Exception e)
+                {
+                    CallException(ProName + "        " + e.Message);
+                    return null;
+                }
+            }
+        }
+
+        public DataTable ExecuteDataTableProcedure(string ProName, ref int returnValue, DbParameter[] ParaName)
+        {
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                DataTable ds = new DataTable();
+                try
+                {
+                    MySqlCommand cmd = new MySqlCommand(ProName, m_Conn);
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    if (ParaName != null)
+                    {
+                        cmd.Parameters.AddRange(ParaName);
+                    }
+                    MySqlParameter param = new MySqlParameter { Direction = ParameterDirection.ReturnValue };
+                    cmd.Parameters.Add(param);
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    var da = new MySqlDataAdapter();
+                    da.SelectCommand = cmd;
+                    da.Fill(ds);
+                    returnValue = (int)param.Value;
+                    return ds;
+                }
+                catch (Exception e)
+                {
+                    CallException(ProName + "        " + e.Message);
+                    return null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 执行一个带参数的存储过程,同时输出一行
+        /// </summary>
+        /// <param name="ProName">存储过程名</param>
+        /// <param name="ParaName">参数名称</param>
+        /// <param name="Para">参数对象数组</param>
+        /// <returns>返回整数</returns>		
+        public DataRow ExecuteDataRowProcedure(string ProName, params DbParameter[] ParaName)
+        {
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                try
+                {
+                    MySqlCommand cmd = new MySqlCommand(ProName, m_Conn);
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    if (ParaName != null)
+                    {
+                        cmd.Parameters.AddRange(ParaName);
+                    }
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    DataTable table = new DataTable();
+                    var da = new MySqlDataAdapter();
+                    da.SelectCommand = cmd;
+                    da.Fill(table);
+                    if (table.Rows.Count > 0)
+                        return table.Rows[0];
+                    else
+                        return table.NewRow();
+                }
+                catch (Exception e)
+                {
+                    CallException(ProName + "        " + e.Message);
+                    return null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 执行一个带参数的存储过程,同时输出一行
+        /// </summary>
+        /// <param name="ProName">存储过程名</param>
+        /// <param name="ParaName">参数名称</param>
+        /// <param name="Para">参数对象数组</param>
+        /// <returns>返回整数</returns>		
+        public DataRowView ExecuteDataRowViewProcedure(string ProName, params DbParameter[] ParaName)
+        {
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                try
+                {
+                    MySqlCommand cmd = new MySqlCommand(ProName, m_Conn);
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    if (ParaName != null)
+                    {
+                        cmd.Parameters.AddRange(ParaName);
+                    }
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    DataTable table = new DataTable();
+                    var da = new MySqlDataAdapter();
+                    da.SelectCommand = cmd;
+                    da.Fill(table);
+                    if (table.Rows.Count > 0)
+                        return table.DefaultView[0];
+                    else
+                        return table.DefaultView.AddNew();
+                }
+                catch (Exception e)
+                {
+                    CallException(ProName + "        " + e.Message);
+                    return null;
+                }
+            }
+        }
+
+        public bool BulkCopy(IDataReader reader, string tableName, string command = null, SqlBulkCopyOptions options = SqlBulkCopyOptions.Default)
+        {
+            using (MySqlConnection m_Conn = new MySqlConnection(DataHelper.ConnectString))
+            {
+                MySqlTransaction sqlT = null;
+                try
+                {
+                    if (m_Conn.State == ConnectionState.Closed)
+                        m_Conn.Open();
+                    sqlT = m_Conn.BeginTransaction();
+                    if (!string.IsNullOrEmpty(command))
+                    {
+                        MySqlCommand cmd = new MySqlCommand(command, m_Conn);
+                        cmd.Transaction = sqlT;
+                        cmd.ExecuteNonQuery();
+                    }
+                    string tmpPath = Path.GetTempFileName();
+                    string csv = DataHelper.ReaderToCsv(reader);
+                    File.WriteAllText(tmpPath, csv);
+                    MySqlBulkLoader copy = new MySqlBulkLoader(m_Conn)
+                    {
+                        FieldTerminator = ",",
+                        FieldQuotationCharacter = '"',
+                        EscapeCharacter = '"',
+                        LineTerminator = "\r\n",
+                        FileName = tmpPath,
+                        NumberOfLinesToSkip = 0,
+                        TableName = tableName,
+                    };
+                    //copy.BatchSize = _capacity;
+                    copy.Load();//如果写入失败，考虑不能无限增加线程数
+                                //Clear();
+                    sqlT.Commit();
+                    m_Conn.Close();
+                    File.Delete(tmpPath);
+                    return true;
+                }
+                catch (Exception e)
+                {
+                    if (sqlT != null)
+                        sqlT.Rollback();
+                    m_Conn.Close();
+                    DataHelper.AddErrorLog(e);
+                    return false;
+                }
+            }
+        }
+
+      
+        #endregion ExecuteStoredProcedure
+    }
+}

SCADA/Program/DataHelper/app.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  
+<system.data>
+    <DbProviderFactories>
+      <remove invariant="MySql.Data.MySqlClient" />
+      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
+    </DbProviderFactories>
+  </system.data></configuration>

SCADA/Program/DataHelper/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MySql.Data" version="6.9.10" targetFramework="net40-client" />
+</packages>

SCADA/Program/DataService/DataService.csproj

@@ -160,7 +160,6 @@
     <Compile Include="DeviceAddress.cs" />
     <Compile Include="Eval.cs" />
     <Compile Include="TagMetaData.cs" />
-    <Compile Include="MediaTimer.cs" />
     <Compile Include="Condition.cs" />
     <Compile Include="PLCGroup.cs" />
     <Compile Include="HistoryData.cs" />

SCADA/Program/DataService/ExtensionMethods.cs

@@ -9,53 +9,6 @@ namespace DataService
 {
     public static class ExtMethods
     {
-        public static bool ModifyItemType(this ITag tag, VarEnum dataType)
-        {
-            DeviceAddress addr = tag.Address;
-            switch (dataType)
-            {
-                case VarEnum.VT_BOOL:
-                    if (addr.VarType == DataType.BYTE || addr.VarType == DataType.SHORT || addr.VarType == DataType.INT || addr.VarType == DataType.FLOAT)
-                    {
-                        tag.Address = new DeviceAddress(addr.Area, addr.DBNumber, addr.CacheIndex, addr.Start, 1, 0, DataType.BOOL);
-                        return true;
-                    }
-                    return false;
-                case VarEnum.VT_UI1:
-                    if (addr.VarType == DataType.BOOL || addr.VarType == DataType.SHORT || addr.VarType == DataType.INT || addr.VarType == DataType.FLOAT)
-                    {
-                        tag.Address = new DeviceAddress(addr.Area, addr.DBNumber, addr.CacheIndex, addr.Start, 1, 0, DataType.BYTE);
-                        return true;
-                    }
-                    return false;
-                case VarEnum.VT_UI2:
-                case VarEnum.VT_I2:
-                    if (addr.VarType == DataType.BYTE || addr.VarType == DataType.BOOL || addr.VarType == DataType.INT || addr.VarType == DataType.FLOAT)
-                    {
-                        tag.Address = new DeviceAddress(addr.Area, addr.DBNumber, addr.CacheIndex, addr.Start, 2, 0, DataType.SHORT);
-                        return true;
-                    }
-                    return false;
-                case VarEnum.VT_UI4:
-                case VarEnum.VT_I4:
-                    if (addr.VarType == DataType.BYTE || addr.VarType == DataType.SHORT || addr.VarType == DataType.BOOL || addr.VarType == DataType.FLOAT)
-                    {
-                        tag.Address = new DeviceAddress(addr.Area, addr.DBNumber, addr.CacheIndex, addr.Start, 4, 0, DataType.INT);
-                        return true;
-                    }
-                    return false;
-                case VarEnum.VT_R4:
-                    if (addr.VarType == DataType.BYTE || addr.VarType == DataType.SHORT || addr.VarType == DataType.BOOL || addr.VarType == DataType.INT)
-                    {
-                        tag.Address = new DeviceAddress(addr.Area, addr.DBNumber, addr.CacheIndex, addr.Start, 4, 0, DataType.FLOAT);
-                        return true;
-                    }
-                    return false;
-                default:
-                    return false;
-            }
-        }
-
         public static string GetExceptionMsg(this Exception e)
         {
             string err = string.Empty;
@@ -69,18 +22,6 @@ namespace DataService
             return err;
         }
 
-        public static string GetNullableString(this SqlDataReader dataReader, int index)
-        {
-            var svr = dataReader.GetSqlString(index);
-            return svr.IsNull ? null : svr.Value;
-        }
-
-        public static DateTime? GetNullableTime(this SqlDataReader dataReader, int index)
-        {
-            var svr = dataReader.GetSqlDateTime(index);
-            return svr.IsNull ? default(Nullable<DateTime>) : svr.Value;
-        }
-
         public static bool ModifyItemName(this ITag tag, string name)
         {
             IDataServer server = tag.Parent.Server;
@@ -413,31 +354,6 @@ namespace DataService
             return filetime == 0 ? DateTime.Now : DateTime.FromFileTime(filetime);
         }
 
-        public static VarEnum ToVarEnum(this DataType dataType)
-        {
-            switch (dataType)
-            {
-                case DataType.BOOL:
-                    return VarEnum.VT_BOOL;
-                case DataType.BYTE:
-                    return VarEnum.VT_UI1;
-                case DataType.WORD:
-                    return VarEnum.VT_UI2;
-                case DataType.SHORT:
-                    return VarEnum.VT_I2;
-                case DataType.TIME:
-                    return VarEnum.VT_FILETIME;
-                case DataType.INT:
-                    return VarEnum.VT_I4;
-                case DataType.FLOAT:
-                    return VarEnum.VT_R4;
-                case DataType.STR:
-                    return VarEnum.VT_BSTR;
-                default:
-                    return VarEnum.VT_VARIANT;
-            }
-        }
-
         public static Type ToType(this DataType dataType)
         {
             switch (dataType)
@@ -700,38 +616,38 @@ namespace DataService
     public static class Utility
     {
         private static readonly ushort[] crcTable = {
-        	0X0000, 0XC0C1, 0XC181, 0X0140, 0XC301, 0X03C0, 0X0280, 0XC241,
-        	0XC601, 0X06C0, 0X0780, 0XC741, 0X0500, 0XC5C1, 0XC481, 0X0440,
-        	0XCC01, 0X0CC0, 0X0D80, 0XCD41, 0X0F00, 0XCFC1, 0XCE81, 0X0E40,
-        	0X0A00, 0XCAC1, 0XCB81, 0X0B40, 0XC901, 0X09C0, 0X0880, 0XC841,
-        	0XD801, 0X18C0, 0X1980, 0XD941, 0X1B00, 0XDBC1, 0XDA81, 0X1A40,
-        	0X1E00, 0XDEC1, 0XDF81, 0X1F40, 0XDD01, 0X1DC0, 0X1C80, 0XDC41,
-        	0X1400, 0XD4C1, 0XD581, 0X1540, 0XD701, 0X17C0, 0X1680, 0XD641,
-        	0XD201, 0X12C0, 0X1380, 0XD341, 0X1100, 0XD1C1, 0XD081, 0X1040,
-        	0XF001, 0X30C0, 0X3180, 0XF141, 0X3300, 0XF3C1, 0XF281, 0X3240,
-        	0X3600, 0XF6C1, 0XF781, 0X3740, 0XF501, 0X35C0, 0X3480, 0XF441,
-        	0X3C00, 0XFCC1, 0XFD81, 0X3D40, 0XFF01, 0X3FC0, 0X3E80, 0XFE41,
-        	0XFA01, 0X3AC0, 0X3B80, 0XFB41, 0X3900, 0XF9C1, 0XF881, 0X3840,
-        	0X2800, 0XE8C1, 0XE981, 0X2940, 0XEB01, 0X2BC0, 0X2A80, 0XEA41,
-        	0XEE01, 0X2EC0, 0X2F80, 0XEF41, 0X2D00, 0XEDC1, 0XEC81, 0X2C40,
-        	0XE401, 0X24C0, 0X2580, 0XE541, 0X2700, 0XE7C1, 0XE681, 0X2640,
-        	0X2200, 0XE2C1, 0XE381, 0X2340, 0XE101, 0X21C0, 0X2080, 0XE041,
-        	0XA001, 0X60C0, 0X6180, 0XA141, 0X6300, 0XA3C1, 0XA281, 0X6240,
-        	0X6600, 0XA6C1, 0XA781, 0X6740, 0XA501, 0X65C0, 0X6480, 0XA441,
-        	0X6C00, 0XACC1, 0XAD81, 0X6D40, 0XAF01, 0X6FC0, 0X6E80, 0XAE41,
-        	0XAA01, 0X6AC0, 0X6B80, 0XAB41, 0X6900, 0XA9C1, 0XA881, 0X6840,
-        	0X7800, 0XB8C1, 0XB981, 0X7940, 0XBB01, 0X7BC0, 0X7A80, 0XBA41,
-        	0XBE01, 0X7EC0, 0X7F80, 0XBF41, 0X7D00, 0XBDC1, 0XBC81, 0X7C40,
-        	0XB401, 0X74C0, 0X7580, 0XB541, 0X7700, 0XB7C1, 0XB681, 0X7640,
-        	0X7200, 0XB2C1, 0XB381, 0X7340, 0XB101, 0X71C0, 0X7080, 0XB041,
-        	0X5000, 0X90C1, 0X9181, 0X5140, 0X9301, 0X53C0, 0X5280, 0X9241,
-        	0X9601, 0X56C0, 0X5780, 0X9741, 0X5500, 0X95C1, 0X9481, 0X5440,
-        	0X9C01, 0X5CC0, 0X5D80, 0X9D41, 0X5F00, 0X9FC1, 0X9E81, 0X5E40,
-        	0X5A00, 0X9AC1, 0X9B81, 0X5B40, 0X9901, 0X59C0, 0X5880, 0X9841,
-        	0X8801, 0X48C0, 0X4980, 0X8941, 0X4B00, 0X8BC1, 0X8A81, 0X4A40,
-        	0X4E00, 0X8EC1, 0X8F81, 0X4F40, 0X8D01, 0X4DC0, 0X4C80, 0X8C41,
-        	0X4400, 0X84C1, 0X8581, 0X4540, 0X8701, 0X47C0, 0X4680, 0X8641,
-        	0X8201, 0X42C0, 0X4380, 0X8341, 0X4100, 0X81C1, 0X8081, 0X4040 
+            0X0000, 0XC0C1, 0XC181, 0X0140, 0XC301, 0X03C0, 0X0280, 0XC241,
+            0XC601, 0X06C0, 0X0780, 0XC741, 0X0500, 0XC5C1, 0XC481, 0X0440,
+            0XCC01, 0X0CC0, 0X0D80, 0XCD41, 0X0F00, 0XCFC1, 0XCE81, 0X0E40,
+            0X0A00, 0XCAC1, 0XCB81, 0X0B40, 0XC901, 0X09C0, 0X0880, 0XC841,
+            0XD801, 0X18C0, 0X1980, 0XD941, 0X1B00, 0XDBC1, 0XDA81, 0X1A40,
+            0X1E00, 0XDEC1, 0XDF81, 0X1F40, 0XDD01, 0X1DC0, 0X1C80, 0XDC41,
+            0X1400, 0XD4C1, 0XD581, 0X1540, 0XD701, 0X17C0, 0X1680, 0XD641,
+            0XD201, 0X12C0, 0X1380, 0XD341, 0X1100, 0XD1C1, 0XD081, 0X1040,
+            0XF001, 0X30C0, 0X3180, 0XF141, 0X3300, 0XF3C1, 0XF281, 0X3240,
+            0X3600, 0XF6C1, 0XF781, 0X3740, 0XF501, 0X35C0, 0X3480, 0XF441,
+            0X3C00, 0XFCC1, 0XFD81, 0X3D40, 0XFF01, 0X3FC0, 0X3E80, 0XFE41,
+            0XFA01, 0X3AC0, 0X3B80, 0XFB41, 0X3900, 0XF9C1, 0XF881, 0X3840,
+            0X2800, 0XE8C1, 0XE981, 0X2940, 0XEB01, 0X2BC0, 0X2A80, 0XEA41,
+            0XEE01, 0X2EC0, 0X2F80, 0XEF41, 0X2D00, 0XEDC1, 0XEC81, 0X2C40,
+            0XE401, 0X24C0, 0X2580, 0XE541, 0X2700, 0XE7C1, 0XE681, 0X2640,
+            0X2200, 0XE2C1, 0XE381, 0X2340, 0XE101, 0X21C0, 0X2080, 0XE041,
+            0XA001, 0X60C0, 0X6180, 0XA141, 0X6300, 0XA3C1, 0XA281, 0X6240,
+            0X6600, 0XA6C1, 0XA781, 0X6740, 0XA501, 0X65C0, 0X6480, 0XA441,
+            0X6C00, 0XACC1, 0XAD81, 0X6D40, 0XAF01, 0X6FC0, 0X6E80, 0XAE41,
+            0XAA01, 0X6AC0, 0X6B80, 0XAB41, 0X6900, 0XA9C1, 0XA881, 0X6840,
+            0X7800, 0XB8C1, 0XB981, 0X7940, 0XBB01, 0X7BC0, 0X7A80, 0XBA41,
+            0XBE01, 0X7EC0, 0X7F80, 0XBF41, 0X7D00, 0XBDC1, 0XBC81, 0X7C40,
+            0XB401, 0X74C0, 0X7580, 0XB541, 0X7700, 0XB7C1, 0XB681, 0X7640,
+            0X7200, 0XB2C1, 0XB381, 0X7340, 0XB101, 0X71C0, 0X7080, 0XB041,
+            0X5000, 0X90C1, 0X9181, 0X5140, 0X9301, 0X53C0, 0X5280, 0X9241,
+            0X9601, 0X56C0, 0X5780, 0X9741, 0X5500, 0X95C1, 0X9481, 0X5440,
+            0X9C01, 0X5CC0, 0X5D80, 0X9D41, 0X5F00, 0X9FC1, 0X9E81, 0X5E40,
+            0X5A00, 0X9AC1, 0X9B81, 0X5B40, 0X9901, 0X59C0, 0X5880, 0X9841,
+            0X8801, 0X48C0, 0X4980, 0X8941, 0X4B00, 0X8BC1, 0X8A81, 0X4A40,
+            0X4E00, 0X8EC1, 0X8F81, 0X4F40, 0X8D01, 0X4DC0, 0X4C80, 0X8C41,
+            0X4400, 0X84C1, 0X8581, 0X4540, 0X8701, 0X47C0, 0X4680, 0X8641,
+            0X8201, 0X42C0, 0X4380, 0X8341, 0X4100, 0X81C1, 0X8081, 0X4040
         };
 
         /// <summary>

SCADA/Program/DataService/MediaTimer.cs

@@ -1,135 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace DataService
-{
-    public class MediaTimer : IDisposable
-    {
-        //Lib API declarations
-        [DllImport("Winmm.dll", CharSet = CharSet.Auto)]
-        static extern uint timeSetEvent(uint uDelay, uint uResolution, TimerCallback lpTimeProc, UIntPtr dwUser,uint fuEvent);
-
-        [DllImport("Winmm.dll", CharSet = CharSet.Auto)]
-        static extern uint timeKillEvent(uint uTimerID);
-
-        [DllImport("Winmm.dll", CharSet = CharSet.Auto)]
-        static extern uint timeGetTime();
-
-        [DllImport("Winmm.dll", CharSet = CharSet.Auto)]
-        static extern uint timeBeginPeriod(uint uPeriod);
-
-        [DllImport("Winmm.dll", CharSet = CharSet.Auto)]
-        static extern uint timeEndPeriod(uint uPeriod);
-
-        //Timer type definitions
-        [Flags]
-        public enum fuEvent : uint
-        {
-            TIME_ONESHOT = 0, //Event occurs once, after uDelay milliseconds. 
-            TIME_PERIODIC = 1,
-            TIME_CALLBACK_FUNCTION = 0x0000, /* callback is function */
-            TIME_CALLBACK_EVENT_SET = 0x0010, /* callback is event - use SetEvent */
-            TIME_CALLBACK_EVENT_PULSE = 0x0020  /* callback is event - use PulseEvent */
-        }
-
-        //Delegate definition for the API callback
-        delegate void TimerCallback(uint uTimerID, uint uMsg, UIntPtr dwUser, UIntPtr dw1, UIntPtr dw2);
-
-        //IDisposable code
-        private bool disposed = false;
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        private void Dispose(bool disposing)
-        {
-            if (!this.disposed)
-            {
-                if (disposing)
-                {
-                    Stop();
-                }
-            }
-            disposed = true;
-        }
-
-        ~MediaTimer()
-        {
-            Dispose(false);
-        }
-
-        /// <summary>
-        /// The current timer instance ID
-        /// </summary>
-        uint id = 0;
-
-        /// <summary>
-        /// The callback used by the the API
-        /// </summary>
-        TimerCallback thisCallBack;
-
-        /// <summary>
-        /// The timer elapsed event 
-        /// </summary>
-        public event EventHandler Timer;
-
-        public MediaTimer()
-        {
-            //Initialize the API callback
-            thisCallBack = CallBackFunc;
-        }
-
-        /// <summary>
-        /// Stop the current timer instance (if any)
-        /// </summary>
-        public void Stop()
-        {
-            lock (this)
-            {
-                if (id != 0)
-                {
-                    timeKillEvent(id);
-                    //Debug.WriteLine("MMTimer " + id.ToString() + " stopped");
-                    id = 0;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Start a timer instance
-        /// </summary>
-        /// <param name="ms">Timer interval in milliseconds</param>
-        /// <param name="repeat">If true sets a repetitive event, otherwise sets a one-shot</param>
-        public void Start(uint ms, bool repeat)
-        {
-            //Kill any existing timer
-            Stop();
-
-            //Set the timer type flags
-            fuEvent f = fuEvent.TIME_CALLBACK_FUNCTION | (repeat ? fuEvent.TIME_PERIODIC : fuEvent.TIME_ONESHOT);
-
-            lock (this)
-            {
-                id = timeSetEvent(ms, 0, thisCallBack, UIntPtr.Zero, (uint)f);
-                if (id == 0)
-                {
-                    throw new Exception("timeSetEvent error");
-                }
-                //Debug.WriteLine("MMTimer " + id.ToString() + " started");
-            }
-        }
-
-        void CallBackFunc(uint uTimerID, uint uMsg, UIntPtr dwUser, UIntPtr dw1, UIntPtr dw2)
-        {
-            //Callback from the MMTimer API that fires the Timer event. Note we are in a different thread here
-            if (Timer != null)
-            {
-                Timer(this, new EventArgs());
-            }
-        }
-    }
-
-}

SCADA/Program/DataService/PLCGroup.cs

@@ -20,8 +20,7 @@ namespace DataService
                 _isActive = value;
                 if (value)
                 {
-                    //_timer.Start((uint)_updateRate, true);
-                    //_timer.Timer += new EventHandler(timer_Timer);
+                    if (_updateRate <= 0) _updateRate = 100;
                     _timer.Interval = _updateRate;
                     _timer.Elapsed += new ElapsedEventHandler(timer_Timer);
                     _timer.Start();

SCADA/Program/HMIControl/bin/Release/HMIControl.VisualStudio.Design.dll.config

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <configSections>
-    </configSections>
-    <connectionStrings>
-        <add name="HMIControl.VisualStudio.Design.Properties.Settings.MYCOS_DATAConnectionString"
-            connectionString="Data Source=COMPUTER\SQLEXPRESS;Initial Catalog=MYCOS_DATA;Persist Security Info=True;User ID=sa"
-            providerName="System.Data.SqlClient" />
-    </connectionStrings>
-</configuration>

SCADA/Program/HMIControl/bin/Release/Microsoft.Expression.Controls.xml

@@ -1,557 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>Microsoft.Expression.Controls</name>
-    </assembly>
-    <members>
-        <member name="M:Microsoft.Expression.Controls.DistributionStrategy.Initialize">
-            <summary>
-            Called before the polylines are looped over.
-            </summary>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.DistributionStrategy.ComputeAutoCapacity">
-            <summary>
-            Computes the value used when LayoutPath.Capacity is set to Auto.
-            </summary>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.DistributionStrategy.ShouldBreak(System.Int32)">
-            <summary>
-            Checks whether or not the polylines should continue being looped over.
-            </summary>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.DistributionStrategy.OnPolylineBegin(Microsoft.Expression.Drawing.Core.PolylineData)">
-            <summary>
-            Called before a new polyline is marched.
-            </summary>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.DistributionStrategy.OnPolylineCompleted(System.Double)">
-            <summary>
-            Called when a polyline is completed.
-            </summary>
-            <param name="remaingLength">The remaining arclength in the polyline.</param>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.DistributionStrategy.OnStepCompleted(System.Double)">
-            <summary>
-            Called when a step is successfully completed.
-            </summary>
-            <param name="actualStepDistance">The actual step distance.
-            This may be different than Step if another polyline has been wrapped to.</param>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.DistributionStrategy.Distribute(Microsoft.Expression.Controls.PathPanel,System.Int32,System.Int32)">
-            <summary>
-            Distributes the children of a path panel along a given layout path.
-            </summary>
-            <param name="pathPanel">The path panel.</param>
-            <param name="pathIndex">The index of the path in pathPanel.LayoutPaths.</param>
-            <param name="childIndex">The index of the first child to be laid out on this path.</param>
-            <returns>The index of the next child to be distributed. If childIndex is returned, this function has done nothing.</returns>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.DistributionStrategy.ChildIndex">
-            <summary>
-            The index of the next child to be arranged.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.DistributionStrategy.Span">
-            <summary>
-            The distance in arc length that will be used for layout.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.DistributionStrategy.Step">
-            <summary>
-            The distance in arc length to walk along the current polyline.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.DistributionStrategy.Capacity">
-            <summary>
-            The total number of elements to be arranged on the LayoutPath.
-            </summary>
-        </member>
-        <member name="T:Microsoft.Expression.Controls.EvenDistributionStrategy">
-            <summary>
-            Distributes the children of a path panel along a layout path.
-            Even distribution means that there is equal arclength between the centers of all
-            the elements on the path.
-            </summary>
-        </member>
-        <member name="T:Microsoft.Expression.Controls.ChangedPathLayoutProperties">
-            <summary>
-            Specifies which path layout properties have changed.
-            </summary>
-        </member>
-        <member name="T:Microsoft.Expression.Controls.PathLayoutUpdatedEventArgs">
-            <summary>
-            Provides data for the <see cref="E:Microsoft.Expression.Controls.IPathLayoutItem.PathLayoutUpdated"/> event.
-            </summary>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.PathLayoutUpdatedEventArgs.#ctor(Microsoft.Expression.Controls.ChangedPathLayoutProperties)">
-            <summary>
-            Initializes a new instance of the <see cref="T:Microsoft.Expression.Controls.PathLayoutUpdatedEventArgs"/> class.
-            </summary>
-            <param name="changedProperties">The data for the event.</param>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathLayoutUpdatedEventArgs.ChangedProperties">
-            <summary>
-            Gets the properties changed in a <see cref="E:Microsoft.Expression.Controls.IPathLayoutItem.PathLayoutUpdated"/> event.
-            </summary>
-        </member>
-        <member name="T:Microsoft.Expression.Controls.PathLayoutData">
-            <summary>
-            Encapsulates the data needed to update a <see cref="T:Microsoft.Expression.Controls.IPathLayoutItem"/>.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathLayoutData.LayoutPathIndex">
-            <summary>
-            Gets or sets the index of the path on which an element is arranged.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathLayoutData.GlobalIndex">
-            <summary>
-            Gets or sets the index of an element in a collection of elements.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathLayoutData.LocalIndex">
-            <summary>
-            Gets or sets the index of an element on a path.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathLayoutData.GlobalOffset">
-            <summary>
-            Gets or sets the offset of an element proportional to the total length of a collection of paths.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathLayoutData.LocalOffset">
-            <summary>
-            Gets or sets the offset of an element proportional to the length of a path.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathLayoutData.NormalAngle">
-            <summary>
-            Gets or sets the angle perpendicular to the path at an element's location.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathLayoutData.OrientationAngle">
-            <summary>
-            Gets or sets the angle perpendicular to the path at an element's location if the element is oriented to the path.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathLayoutData.IsArranged">
-            <summary>
-            Gets or sets whether or not an element is arranged on a path.
-            </summary>
-        </member>
-        <member name="T:Microsoft.Expression.Controls.IPathLayoutItem">
-            <summary>
-            Represents an element that is arranged by a <see cref="T:Microsoft.Expression.Controls.PathPanel"/>.
-            </summary>
-            <remarks>
-            Implementing this interface enables <see cref="T:Microsoft.Expression.Controls.PathPanel"/> to set these properties when the element is arranged.
-            This interface is not intended for general implementation.
-            </remarks>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.IPathLayoutItem.Update(Microsoft.Expression.Controls.PathLayoutData)">
-            <summary>
-            Updates the <see cref="T:Microsoft.Expression.Controls.IPathLayoutItem"/> properties based on the given <see cref="T:Microsoft.Expression.Controls.PathLayoutData"/> and raises the <see cref="E:Microsoft.Expression.Controls.IPathLayoutItem.PathLayoutUpdated"/> event.
-            </summary>
-            <param name="data">The data needed to update the <see cref="T:Microsoft.Expression.Controls.IPathLayoutItem"/>.</param>
-        </member>
-        <member name="E:Microsoft.Expression.Controls.IPathLayoutItem.PathLayoutUpdated">
-            <summary>
-            Occurs when one or more of the <see cref="T:Microsoft.Expression.Controls.IPathLayoutItem"/> properties change.
-            </summary>
-            <remarks>
-            This event is raised whenever the item’s position along the path is updated. This can occur due to changes in the properties on the <see cref="T:Microsoft.Expression.Controls.LayoutPath"/> or changes to <see cref="P:Microsoft.Expression.Controls.LayoutPath.SourceElement"/>.
-            </remarks>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.IPathLayoutItem.LayoutPathIndex">
-            <summary>
-            Gets the index of the path on which the item is arranged.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.IPathLayoutItem.GlobalIndex">
-            <summary>
-            Gets the index of the item in a collection of items.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.IPathLayoutItem.LocalIndex">
-            <summary>
-            Gets the index of the item on the path on which it is arranged.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.IPathLayoutItem.GlobalOffset">
-            <summary>
-            Gets the offset of the item proportional to the total length of a collection of paths.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.IPathLayoutItem.LocalOffset">
-            <summary>
-            Gets the offset of the item proportional to the length of the path on which it is arranged.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.IPathLayoutItem.NormalAngle">
-            <summary>
-            Gets the angle perpendicular to the path at the item's location.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.IPathLayoutItem.OrientationAngle">
-            <summary>
-            Gets the angle perpendicular to the path at the items's location if the item is oriented to the path.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.IPathLayoutItem.IsArranged">
-            <summary>
-            Gets or sets whether or not the item is arranged on the path.
-            </summary>
-        </member>
-        <member name="T:Microsoft.Expression.Controls.IsArrangedToScaleConverter">
-            <summary>
-            Converts a <see cref="T:System.Boolean"/> representing whether or not an element is arranged to a <see cref="T:System.Double"/> value used to scale the element.
-            </summary>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.IsArrangedToScaleConverter.ConvertBack(System.Object,System.Type,System.Object,System.Globalization.CultureInfo)">
-            <summary>
-            Throws a <see cref="T:System.NotImplementedException" /> exception in all cases.
-            </summary>
-            <param name="value">The target data being passed to the source.</param>
-            <param name="targetType">The <see cref="T:System.Type" /> of data expected by the source object.</param>
-            <param name="parameter">An optional parameter to be used in the converter logic.</param>
-            <param name="culture">The culture of the conversion.</param>
-            <returns>The value to be passed to the source object.</returns>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.IsArrangedToScaleConverter.Convert(System.Object,System.Type,System.Object,System.Globalization.CultureInfo)">
-            <summary>
-            Converts the specified <see cref="T:System.Boolean"/> to a <see cref="T:System.Double"/>. 
-            </summary>		
-            <param name="value">The source data being passed to the target.</param>
-            <param name="targetType">The <see cref="T:System.Type"/> of data expected by the target dependency property.</param>
-            <param name="parameter">An optional parameter to be used in the converter logic.</param>
-            <param name="culture">The culture of the conversion.</param>
-            <returns>If the <see cref="T:System.Boolean"/> is true, 1 is returned. Else, 0 is returned.</returns>
-        </member>
-        <member name="T:Microsoft.Expression.Controls.Distribution">
-            <summary>
-            Specifies the distribution of a <see cref="T:Microsoft.Expression.Controls.LayoutPath"/>.
-            </summary>
-        </member>
-        <member name="T:Microsoft.Expression.Controls.Orientation">
-            <summary>
-            Specifies the orientation of elements on a <see cref="T:Microsoft.Expression.Controls.LayoutPath"/>.
-            </summary>
-        </member>
-        <member name="T:Microsoft.Expression.Controls.FillBehavior">
-            <summary>
-            Specifies the method for altering the <see cref="P:Microsoft.Expression.Controls.LayoutPath.Span"/> on an open path.
-            </summary>
-        </member>
-        <member name="T:Microsoft.Expression.Controls.LayoutPath">
-            <summary>
-            Describes a path along which elements are arranged.
-            </summary>
-        </member>
-        <member name="F:Microsoft.Expression.Controls.LayoutPath.transformedPolylines">
-            <summary>
-            Ideally, we want to cache the Bezier curves before flattening, because transform will affect flattening.
-            That requires us to cache curves that we don't support very well yet.  Instead, we cache the flatten points
-            in distribution strategy and transform them on demand.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.LayoutPath.SourceElement">
-            <summary>
-            Gets or sets the element that defines the path.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.LayoutPath.Distribution">
-            <summary>
-            Gets or sets whether items are laid out evenly or with a fixed padding.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.LayoutPath.Capacity">
-            <summary>
-            Gets or sets the maximum number of items displayed on the <see cref="T:Microsoft.Expression.Controls.LayoutPath"/>.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.LayoutPath.Padding">
-            <summary>
-            Gets or sets the distance in pixels along the arc length of the <see cref="T:Microsoft.Expression.Controls.LayoutPath"/> between two items.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.LayoutPath.Orientation">
-            <summary>
-            Gets or sets the orientation of the items.
-            </summary>
-            <remarks>
-            This property is supported on <see cref="T:Microsoft.Expression.Controls.PathListBox"/>, but not <see cref="T:Microsoft.Expression.Controls.PathPanel"/>.
-            </remarks>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.LayoutPath.Start">
-            <summary>
-            Gets or sets the distance from the start of the <see cref="T:Microsoft.Expression.Controls.LayoutPath"/> to place the first item.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.LayoutPath.Span">
-            <summary>
-            Gets or sets the percentage of the <see cref="T:Microsoft.Expression.Controls.LayoutPath"/> that participates in layout.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.LayoutPath.FillBehavior">
-            <summary>
-            Gets or set the method to alter <see cref="P:Microsoft.Expression.Controls.LayoutPath.Span"/> on an open path.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.LayoutPath.ActualCapacity">
-            <summary>
-            Gets the computed Capacity.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.LayoutPath.IsValid">
-            <summary>
-            Gets whether or not the <see cref="P:Microsoft.Expression.Controls.LayoutPath.SourceElement"/> is valid in the context.
-            A <see cref="P:Microsoft.Expression.Controls.LayoutPath.SourceElement"/> is not valid if it is a descendant of the <see cref="T:Microsoft.Expression.Controls.PathPanel"/> in which it is used.
-            </summary>
-        </member>
-        <member name="T:Microsoft.Expression.Controls.PaddedDistributionStrategy">
-            <summary>
-            Distributes the children of a layout path based on the size of the children and a given padding between the children.
-            The distance in arclength between children is determined by the padding plus the sum of the radii of the children's bounding boxes.
-            </summary>
-        </member>
-        <member name="T:Microsoft.Expression.Controls.PathListBox">
-            <summary>
-            Contains a list of items that are laid out along one or more paths.
-            </summary>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.PathListBox.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:Microsoft.Expression.Controls.PathListBox"/> class.
-            </summary>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.PathListBox.GetContainerForItemOverride">
-            <summary>
-            Creates the element used to display a specified item.
-            </summary>
-            <returns>A <see cref="T:Microsoft.Expression.Controls.PathListBoxItem"/> corresponding to a specified item.</returns>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.PathListBox.IsItemItsOwnContainerOverride(System.Object)">
-            <summary>
-            Determines if the specified item is (or is eligible to be) its own item container.
-            </summary>
-            <returns>true if the item is its own item container; otherwise, false.</returns>
-            <param name="item">The specified item.</param>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.PathListBox.ArrangeOverride(System.Windows.Size)">
-            <summary>
-            Positions child elements.
-            </summary>
-            <param name="finalSize">The size that this object should use to arrange its child elements.</param>
-            <returns>The actual size used.</returns>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathListBox.LayoutPaths">
-            <summary>
-            Gets or sets a collection of objects that define the path(s) used for layout.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathListBox.StartItemIndex">
-            <summary>
-            Gets or sets the index to use within the list of items.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathListBox.WrapItems">
-            <summary>
-            Gets or sets whether the item index wraps to the beginning of the collection when StartItemIndex is greater than 0.
-            </summary>
-        </member>
-        <member name="T:Microsoft.Expression.Controls.PathListBoxItem">
-            <summary>
-            Represents an item in a <see cref="T:Microsoft.Expression.Controls.PathListBox"/>.
-            </summary>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.PathListBoxItem.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:Microsoft.Expression.Controls.PathListBoxItem"/> class.
-            </summary>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.PathListBoxItem.Update(Microsoft.Expression.Controls.PathLayoutData)">
-            <summary>
-            For a description of this member, see <see cref="M:Microsoft.Expression.Controls.IPathLayoutItem.Update(Microsoft.Expression.Controls.PathLayoutData)"/>.
-            </summary>
-        </member>
-        <member name="E:Microsoft.Expression.Controls.PathListBoxItem.PathLayoutUpdated">
-            <summary>
-            For a description of this member, see <see cref="E:Microsoft.Expression.Controls.IPathLayoutItem.PathLayoutUpdated"/>.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathListBoxItem.LayoutPathIndex">
-            <summary>
-            For a description of this member, see <see cref="P:Microsoft.Expression.Controls.IPathLayoutItem.LayoutPathIndex"/>.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathListBoxItem.GlobalIndex">
-            <summary>
-            For a description of this member, see <see cref="P:Microsoft.Expression.Controls.IPathLayoutItem.GlobalIndex"/>.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathListBoxItem.LocalIndex">
-            <summary>
-            For a description of this member, see <see cref="P:Microsoft.Expression.Controls.IPathLayoutItem.LocalIndex"/>.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathListBoxItem.GlobalOffset">
-            <summary>
-            For a description of this member, see <see cref="P:Microsoft.Expression.Controls.IPathLayoutItem.GlobalOffset"/>.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathListBoxItem.LocalOffset">
-            <summary>
-            For a description of this member, see <see cref="P:Microsoft.Expression.Controls.IPathLayoutItem.LocalOffset"/>.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathListBoxItem.NormalAngle">
-            <summary>
-            For a description of this member, see <see cref="P:Microsoft.Expression.Controls.IPathLayoutItem.NormalAngle"/>.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathListBoxItem.OrientationAngle">
-            <summary>
-            For a description of this member, see <see cref="P:Microsoft.Expression.Controls.IPathLayoutItem.OrientationAngle"/>.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathListBoxItem.IsArranged">
-            <summary>
-            For a description of this member, see <see cref="P:Microsoft.Expression.Controls.IPathLayoutItem.IsArranged"/>.
-            </summary>
-        </member>
-        <member name="T:Microsoft.Expression.Controls.PathPanel">
-            <summary>
-            Arranges child elements along one or more path.
-            </summary>
-            <remarks>
-            <see cref="T:Microsoft.Expression.Controls.PathPanel"/> can be used as an alternative to <see cref="T:Microsoft.Expression.Controls.PathListBox"/> when selection is not necessary.
-            The <see cref="P:Microsoft.Expression.Controls.LayoutPath.Orientation"/> property is not supported on <see cref="T:Microsoft.Expression.Controls.PathPanel"/>.
-            </remarks>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.PathPanel.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:Microsoft.Expression.Controls.PathPanel"/> class.
-            </summary>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.PathPanel.MeasureOverride(System.Windows.Size)">
-            <summary>
-            Measures the size required for child elements.
-            </summary>
-            <param name="availableSize">The available size that this element can give to child elements. </param>
-            <returns>The size that this element determines it needs during layout, based on its calculations of child element sizes.</returns>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.PathPanel.ArrangeOverride(System.Windows.Size)">
-            <summary>
-            Positions child elements.
-            </summary>
-            <param name="finalSize">The size that this object should use to arrange its child elements.</param>
-            <returns>The actual size used.</returns>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.PathPanel.ArrangeChild(System.Int32,System.Int32,Microsoft.Expression.Drawing.Core.PolylineData,Microsoft.Expression.Drawing.Core.MarchLocation,System.Int32)">
-            <summary>
-            Arranges the child at the given index at a particular location on a LayoutPath.
-            </summary>
-            <param name="indirectIndex">An index from the range 0 to PathPanel.Count.</param>
-            <param name="pathIndex">The index of the layout path on which to arrange the child.</param>
-            <param name="polyline">The polyline in the layout path.</param>
-            <param name="location">The location on the polyline.</param>
-            <param name="localIndex">The index of the child on the LayoutPath.</param>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.PathPanel.GetChildRadius(System.Int32)">
-            <summary>
-            Calculates the radius of the bounding circle for the child at the given index.
-            </summary>
-            <param name="indirectIndex">An index from the range 0 to PathPanel.Count.</param>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathPanel.LayoutPaths">
-            <summary>
-            Gets or sets a collection of objects that define the path(s) used for layout.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathPanel.StartItemIndex">
-            <summary>
-            Gets or sets the index to use within the list of items.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathPanel.WrapItems">
-            <summary>
-            Gets or sets whether the item index wraps to the beginning of the collection when <see cref="P:Microsoft.Expression.Controls.PathPanel.StartItemIndex"/> is greater than 0.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathPanel.ValidPaths">
-            <summary>
-            The subset of LayoutPaths that are attached and not collapsed.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Expression.Controls.PathPanel.Count">
-            <summary>
-            Count is the number of Children that the PathPanel will lay out.
-            If StartItemIndex > 0 and WrapItems is false, then this can be less than PathPanel.Children.Count
-            </summary>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.Utilities.GetItemsHost(System.Windows.Controls.ItemsControl)">
-            <summary>
-            Gets the panel that contains the containers of an ItemsControl.
-            </summary>
-            <param name="control">The ItemsControl.</param>
-            <returns>
-            The panel that contains the containers of an ItemsControl, or null
-            if the panel could not be found.
-            </returns>
-            <exception cref="T:System.ArgumentNullException">
-            <paramref name="control" /> is null.
-            </exception>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.Utilities.TraverseBreadthFirst``1(``0,System.Func{``0,System.Collections.Generic.IEnumerable{``0}},System.Func{``0,System.Boolean})">
-            <summary>
-            Traverses a tree by accepting an initial value and a function that 
-            retrieves the child nodes of a node.
-            </summary>
-            <typeparam name="T">The type of the stream.</typeparam>
-            <param name="initialNode">The initial node.</param>
-            <param name="getChildNodes">A function that retrieves the child
-            nodes of a node.</param>
-            <param name="traversePredicate">A predicate that evaluates a node
-            and returns a value indicating whether that node and it's children
-            should be traversed.</param>
-            <returns>A stream of nodes.</returns>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.Utilities.GetVisualChildren(System.Windows.DependencyObject)">
-            <summary>
-            Get the visual tree children of an element.
-            </summary>
-            <param name="element">The element.</param>
-            <returns>The visual tree children of an element.</returns>
-            <exception cref="T:System.ArgumentNullException">
-            <paramref name="element"/> is null.
-            </exception>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.Utilities.GetVisualChildrenAndSelfIterator(System.Windows.DependencyObject)">
-            <summary>
-            Get the visual tree children of an element and the element itself.
-            </summary>
-            <param name="element">The element.</param>
-            <returns>
-            The visual tree children of an element and the element itself.
-            </returns>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.Utilities.GetLogicalChildren(System.Windows.FrameworkElement)">
-            <summary>
-            Retrieves all the logical children of a framework element using a 
-            breadth-first search. For performance reasons this method manually 
-            manages the stack instead of using recursion.
-            </summary>
-            <param name="parent">The parent framework element.</param>
-            <returns>The logical children of the framework element.</returns>
-        </member>
-        <member name="M:Microsoft.Expression.Controls.Utilities.GetLogicalDescendents(System.Windows.FrameworkElement)">
-            <summary>
-            Retrieves all the logical descendents of a framework element using a 
-            breadth-first search. For performance reasons this method manually 
-            manages the stack instead of using recursion.
-            </summary>
-            <param name="parent">The parent framework element.</param>
-            <returns>The logical children of the framework element.</returns>
-        </member>
-    </members>
-</doc>

SCADA/Program/HMIControl/obj/Debug/GeneratedInternalTypeHelper.g.i.cs

@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// <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);
-        }
-    }
-}
-

SCADA/Program/LinkableControlDesignTime/LinkableControlDesign.csproj

@@ -104,6 +104,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\DataHelper\DataHelper.csproj">
+      <Project>{755c5459-bca4-4729-a93c-0c73a41bdf3c}</Project>
+      <Name>DataHelper</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HMIControl\HMIControl.csproj">
       <Project>{F9F0BFA7-0C4A-4C8C-B81C-2A0477CBF637}</Project>
       <Name>HMIControl</Name>

SCADA/Program/LinkableControlDesignTime/TagList.cs

@@ -1,9 +1,9 @@
-using System;
+using DatabaseLib;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
 using System.Data.SqlClient;
-using System.IO;
 using System.Reflection;
 using System.Windows.Forms;
 
@@ -13,9 +13,6 @@ namespace HMIControl.VisualStudio.Design
     {
         static List<string> list;
         static List<TagMetaData> metaList;
-        const string PATH = @"C:\DataConfig\";
-        const string CONFIGFILE = "host.cfg";
-        static string CONN = @"Data Source=.\SQLEXPRESS;Initial Catalog=MYCOS_DATA;Integrated Security=True";
 
         public static readonly List<DataTypeSource> DataDict = new List<DataTypeSource>
         {
@@ -50,39 +47,16 @@ namespace HMIControl.VisualStudio.Design
             {
                 list = new List<string> { "@Time", "@Date", "@DateTime", "@User", "@AppName", "@LocName", "@Region", "@Path" };
                 metaList = new List<TagMetaData>();
-                try
+                using (var reader = DataHelper.Instance.ExecuteReader("SELECT ISNULL(TagName,''),ISNULL(ADDRESS,''),ISNULL(DESCRIPTION,''),DATATYPE,DATASIZE,TAGID,GROUPID,ISACTIVE,ARCHIVE,DEFAULTVALUE FROM Meta_Tag"))
                 {
-                    using (StreamReader objReader = new StreamReader(PATH + CONFIGFILE))
+                    if (reader == null) return list;
+                    while (reader.Read())
                     {
-                        objReader.ReadLine();
-                        CONN = objReader.ReadLine();
+                        string name = reader.GetString(0);
+                        list.Add(name);
+                        metaList.Add(new TagMetaData(name.ToUpper(), reader.GetString(1), reader.GetString(2), (DataType)reader.GetByte(3), (ushort)reader.GetInt16(4),
+                            reader.GetInt16(5), reader.GetInt16(6), reader.GetBoolean(7), reader.GetBoolean(8), reader.GetSqlValue(9)));
                     }
-                }
-                catch (Exception e)
-                {
-                    return list;
-                }
-                SqlConnection connection = new SqlConnection(CONN);
-                SqlCommand command = new SqlCommand(
-                    "SELECT ISNULL(TagName,''),ISNULL(ADDRESS,''),ISNULL(DESCRIPTION,''),DATATYPE,DATASIZE,TAGID,GROUPID,ISACTIVE,ARCHIVE,DEFAULTVALUE FROM Meta_Tag", connection);
-                try
-                {
-                    if (connection.State == ConnectionState.Closed)
-                        connection.Open();
-                    using (var reader = command.ExecuteReader(CommandBehavior.CloseConnection))
-                    {
-                        while (reader.Read())
-                        {
-                            string name = reader.GetString(0);
-                            list.Add(name);
-                            metaList.Add(new TagMetaData(name.ToUpper(), reader.GetString(1), reader.GetString(2), (DataType)reader.GetByte(3), (ushort)reader.GetInt16(4),
-                                reader.GetInt16(5), reader.GetInt16(6), reader.GetBoolean(7), reader.GetBoolean(8), reader.GetSqlValue(9)));
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-
                 }
                 list.Sort();
             }
@@ -110,30 +84,7 @@ namespace HMIControl.VisualStudio.Design
         {
             dataGridView1.CurrentCell = null;
             bindingSource1.EndEdit();
-            TagDataReader reader = new TagDataReader(metaList);
-            SqlConnection m_Conn = new SqlConnection(CONN);
-            SqlTransaction sqlT = null;
-            try
-            {
-                if (m_Conn.State == ConnectionState.Closed)
-                    m_Conn.Open();
-                sqlT = m_Conn.BeginTransaction();
-                string sql = "DELETE FROM Meta_Tag;";
-                SqlCommand cmd = new SqlCommand(sql, m_Conn);
-                cmd.Transaction = sqlT;
-                cmd.ExecuteNonQuery();
-                SqlBulkCopy bulk = new SqlBulkCopy(m_Conn, SqlBulkCopyOptions.KeepIdentity, sqlT);
-                bulk.DestinationTableName = "Meta_Tag";
-                bulk.WriteToServer(reader);
-                sqlT.Commit();
-                m_Conn.Close();
-            }
-            catch (Exception ex)
-            {
-                if (sqlT != null)
-                    sqlT.Rollback();
-                m_Conn.Close();
-            }
+            DataHelper.Instance.BulkCopy(new TagDataReader(metaList), "Meta_Tag", "DELETE FROM Meta_Tag;", SqlBulkCopyOptions.KeepIdentity);
         }
 
         private void toolStripButton2_Click(object sender, EventArgs e)

SCADA/Program/OPCLib/OPCDA/obj/Release/OPCDA.csproj.FileListAbsolute.txt

@@ -1,5 +0,0 @@
-F:\新建文件夹\OPCLib\OPCDA\bin\Release\OPCDA.dll
-F:\新建文件夹\OPCLib\OPCDA\bin\Release\OPCDA.pdb
-F:\新建文件夹\OPCLib\OPCDA\obj\Release\ResolveAssemblyReference.cache
-F:\新建文件夹\OPCLib\OPCDA\obj\Release\OPCDA.dll
-F:\新建文件夹\OPCLib\OPCDA\obj\Release\OPCDA.pdb

SCADA/Program/packages/MySql.Data.6.9.10/CHANGES

@@ -0,0 +1,82 @@
+6.9.10
+- Added user contribution in bug MySql.Web.Security.CreateUserInUserTable does not work (MySQL Bug #83656, Oracle Bug # 25046364).
+- Fixed incorrect encoding in connection passwords (MySQL Bug #80611, Oracle Bug #23257011).
+
+
+6.9.9
+- Fix for Nested transactions are not supported in Entity Framework (MySQL Bug #71502, Oracle Bug #22366266).
+- Fix for EF5 and EF6 wrong SQL statement to set primary key (MySQL Bug 76292, Oracle Bug #20711384) 
+- Fixed problem where mysql.proc tables would not be used for metadata even though access was available (MySQL Bug #74116, Oracle Bug #20960373)
+- Added support for TLSv1.1 and TLSv1.2
+- Fixed Fix for "Aborted connection" (MySQL Bug #80997, Oracle Bug # 23346197).
+
+
+6.9.8
+- Added support for Chinese character set gb18030. (Oracle bug # 21098546).
+- Added support for Json type. (WL # 8132).
+- Added changes for metadata information in generated columns with 5.7 (WL #411)
+
+6.9.7
+- Changed default SSL mode to Preferred in connection string. Now the server connections will be using SSL if server allows it by default but it's possible to override this configuration.
+- Changed handshake process to use bytes instead of encoded strings.
+- Fix for Fabric connections (Oracle Bug #20983968).
+- Fix for Fabric plugin: fabric server selection is broken when master is faulty (Oracle Bug #21203824).
+
+
+6.9.6
+- Fix for Incorrect query result with Entity Framework 6 (MySql bug #74918, Oracle bug #20129927).
+- Fix for GetTimeZoneOffset to use date and time to calculate timediff (MySQL Bug #74905, Oracle Bug #20065691).
+- Fix for MySqlSimpleMembershipProvider keeps database connections open on some operations (MySQL Bug #74662, Oracle Bug #20109419)
+- Fix for Any Call to RoleExists() returns true whether or not the role exists (MySql bug #75397, Oracle bug #20325391).
+- Fix for all dateTimes set as UTC Kind (MySQL Bug #74134, Oracle Bug #20200662).
+- Fix for Invalid SQL query when eager loading two nested collections (MySQL Bug #70941, Oracle bug #18049862).
+- Fix for chinese characters used in the connection string when connecting to MySql Server (MySQL Bug #70041, Oracle Bug #18141356).
+
+
+
+6.9.5
+- Disabled installation on-demand in Installer (Oracle Bug #19670596).
+- Fix for Generated SQL requests column that doesn't exist in LINQ to Entities (MySql bug #72004, Oracle bug #19681348).
+- Fix for MySQL Connector/NET generates incorrect SQL for LINQ 'StartsWith' queries (MySql bug #72058, Oracle bug #19680236).
+- Fix for Exception when using IEnumerable.Contains(model.property) in Where predicate (MySql bug #73643, Oracle bug #19690370).
+- Fix for Generated Sql does not contain ORDER BY statement whose is requested by LINQ (MySql bug #73549, Oracle bug #19698010).
+- Fix for Web providers registration in machine.config (removed v20 suffix) (MySQL Bug #74080, Oracle Bug #19715398)
+- Fix for Error of "Every derived table must have an alias" in LINQ to Entities when using EF6 + DbFirst + View + Take
+  (MySql Bug #72148, Oracle bug #19356006).
+- Fix for 'the method or operation is not implemented' when using linq with orderby (MySQL Bug #70722, Oracle Bug #19681723).
+- Fix for Exception "The given key was not present in the dictionary" when using utf16le charset in a query. (MySql #72737, Oracle Bug #19355906)
+- Fix for Memory leak in a loop opening a connection to the database and executing a command (MySql Bug #73122, Oracle Bug #19467233).
+- Fix for Multiple issues caused by trailing and leading white space character in params using MySql Membership Provider (MySql Bug #73411, Oracle Bug #19453313)
+- Fix for bad assumption leads to modify query adding CALL statement to the beginning of the sql query even when CommandType.Text is specified (MySql Bug #72736, Oracle Bug #19325120).
+
+
+6.9.4
+- Added a new plugin for MySql Fabric 1.5 support
+
+
+6.9.3
+- Fix for Web Parts Personalization provider
+- Fix for changing the PK between two int columns (MySql Bug #71418, Oracle bug #18923294).
+- Fix for Error when Calling MySqlConnection.GetSchema("PROCEDURES WITH PARAMETERS", ...) (Oracle bug #19285959).
+- Fix for EF provider reports ManifestProviderToken = 5.6 for server 5.7 (Oracle bug #19453814).
+- Fix for Fluent API DbModelBuilder.HasColumnType is ignored in EF6 (Oracle bug #19456229).
+- Fix for Setting a PK GUID identity in Code First in EF6 no longer works in Server 5.7 (Oracle bug #19456452).
+- Non PKs declared as Identity GUID have no GUID autogenerated (Oracle bug #19456415).
+
+
+6.9.2
+- Add async/await compatible methods
+- Fix for Unable to read geometry column when it has been set with a SRID value. (MySql Bug #71869, Oracle Bug #19137999)
+- Fix for Exception adding a new column to an existing model as identity and PK fails when applying the migration (MySql Bug #71418, Oracle bug #18923294).
+- Added SiteMap and Personalization configuration web providers to MySql.Web Nuget Package.
+
+
+6.9.1
+- Fix for Exception of "duplicate entry" in MySqlSessionProvider (MySql Bug #70409, Oracle bug #18657550).
+
+
+6.9.0
+- Added implementation of MySQLPersonalizationProvider.
+- Added SiteMap Web provider.
+- Added Simple Membership Web Provider.
+- Fix for open sockets connections left when connection open fails, the error happens when the client try to get a connection when the max number of connections is reached in the server. (MySql #72025, Oracle Bug #18665388).

SCADA/Program/packages/MySql.Data.6.9.10/Readme.txt

@@ -0,0 +1,15 @@
+Connector/Net 6.9  Release Notes
+------------------------------------
+
+Welcome to the release notes for Connector/Net 6.9
+
+What's new in 6.9
+--------------------
+
+- Simple Membership Web Provider
+- Site Map Web Provider
+- Personalization Web Provider
+- MySql Fabric support
+
+
+Be sure and check the documentation for more information on these new features.

SCADA/Program/packages/MySql.Data.6.9.10/content/app.config.transform

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="MySql.Data.MySqlClient" />
+      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
+    </DbProviderFactories>
+  </system.data>
+</configuration>

SCADA/Program/packages/MySql.Data.6.9.10/content/web.config.transform

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="MySql.Data.MySqlClient" />
+      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
+    </DbProviderFactories>
+  </system.data>
+</configuration>

SCADA/TagConfig/TagConfig/obj/x86/Debug/TagConfig.csproj.FileListAbsolute.txt

@@ -1 +0,0 @@
-C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\bin\Debug\TagConfig.exe.config

SCADA/TagConfig/TagConfig/obj/x86/Release/TagConfig.csproj.FileListAbsolute.txt

@@ -1 +0,0 @@
-C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\TagConfig\TagConfig\bin\Release\TagConfig.exe.config