版本1.7.3

限制fid发送内存的最大长度限制

GcDevicePc/AboutForm.cs

@@ -42,7 +42,7 @@ namespace GcDevicePc
             this.fid1ver.Text = this.FID1version;
             this.fid2ver.Text = this.FID2version;
             this.tcdver.Text = this.TCD1version;
-            this.PCver.Text = this.Hmiversion + "/1.7.2";
+            this.PCver.Text = this.Hmiversion + "/1.7.3";
         }
     }
 }

GcDevicePc/GcDevicePc.csproj

@@ -14,6 +14,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -29,8 +31,6 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -43,7 +43,7 @@
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -55,7 +55,7 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>F5BC126F49467FD58B7F9ED6D25381562543841F</ManifestCertificateThumbprint>
@@ -167,7 +167,7 @@
     </Reference>
     <Reference Include="WTModbus, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\x86\Debug\WTModbus.dll</HintPath>
+      <HintPath>..\dll\WTModbus.dll</HintPath>
     </Reference>
     <Reference Include="ZedGraph">
       <HintPath>..\dll\ZedGraph.dll</HintPath>

GcDevicePc/GcDevicePc.csproj.user

@@ -18,7 +18,7 @@
     <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
   </PropertyGroup>
   <PropertyGroup>
-    <ReferencePath>C:\Users\a\Desktop\色谱仪\新建文件夹\gcdevicepc_nmoc8-16\CKVocAnalyzer\bin\Debug\</ReferencePath>
+    <ReferencePath>D:\workspace\VS2017\voc\dll\</ReferencePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <StartAction>Project</StartAction>

GcDevicePc/MDIBase.cs

@@ -834,7 +834,7 @@ namespace GcDevicePc
         /// 1.0.2.3  添加了周期完成后，重新绘图功能
         private void timer1_Tick(object sender, EventArgs e)
         {
-            this.Text = String.Format("{0}-1.7.2{1}", globaldata.AppName,Formstr);
+            this.Text = String.Format("{0}-1.7.3{1}", globaldata.AppName,Formstr);
 
             HmiStatus.Text = bEnglishLanguage == false ? String.Format("状态：{0}", statestr) : String.Format("State：{0}", statestr);
 

GcDevicePc/ProThread/GcDataTh.cs

@@ -248,11 +248,11 @@ namespace GcDevicePc.ProThread
 #endif
                                 //j++;
                                 //Get_Channel1_ValueNum++;
-                                if (globaldata.m_signalbuffer.Draw_Port.Count < globaldata.m_signalbuffer.Draw_Port.Capacity)
+                                if (globaldata.m_signalbuffer.Draw_Port.Count < globaldata.MAX_ARRAY_LEN)
                                 {
                                     globaldata.m_signalbuffer.Draw_Port.Add(globaldata.m_signalbuffer.Channel1_Port);
                                 }
-                                if(globaldata.m_signalbuffer.Save_Port.Count < globaldata.m_signalbuffer.Save_Port.Capacity)
+                                if(globaldata.m_signalbuffer.Save_Port.Count < globaldata.MAX_ARRAY_LEN)
                                 { 
                                     globaldata.m_signalbuffer.Save_Port.Add(globaldata.m_signalbuffer.Channel1_Port);
                                 }
@@ -261,14 +261,14 @@ namespace GcDevicePc.ProThread
 
                                     lock (globaldata.channelA_A)
                                     {
-                                        if (globaldata.channelA_A.Count < globaldata.channelA_A.Capacity)
+                                        if (globaldata.channelA_A.Count < globaldata.MAX_ARRAY_LEN)
                                         {
                                             globaldata.channelA_A.Add((long)(fidv[i] * 1000000));
                                         }
                                     }
                                     lock (globaldata.channelB_A)
                                     {
-                                        if (globaldata.channelB_A.Count < globaldata.channelB_A.Capacity)
+                                        if (globaldata.channelB_A.Count < globaldata.MAX_ARRAY_LEN)
                                         {
                                             globaldata.channelB_A.Add((long)(fidv[i] * 1000000));
                                         }
@@ -278,14 +278,14 @@ namespace GcDevicePc.ProThread
                                 {
                                     lock (globaldata.channelA_A)
                                     {
-                                        if (globaldata.channelA_A.Count < globaldata.channelA_A.Capacity)
+                                        if (globaldata.channelA_A.Count < globaldata.MAX_ARRAY_LEN)
                                         {
                                             globaldata.channelA_A.Add((long)(fidv[i] * 1000000));
                                         }
                                     }
                                     lock (globaldata.channelB_A)
                                     {
-                                        if (globaldata.channelB_A.Count < globaldata.channelB_A.Capacity)
+                                        if (globaldata.channelB_A.Count < globaldata.MAX_ARRAY_LEN)
                                         {
                                             globaldata.channelB_A.Add((long)(fidv[i] * 1000000));
                                         }

GcDevicePc/globaldata.cs

@@ -196,6 +196,8 @@ namespace GcDevicePc
         public static String DeviceName;            //HMI名字
         public static IPAddress myIpaddr;
 
+        public static int MAX_ARRAY_LEN = 5120;
+
 
         //public static AppInit m_appinit = new AppInit();    //程序初始化