解决cpu占用率问题，检测器温度信号分开，和仪器方法中的信号配置出错问题

GcDevicePc/ConfigMethod/SignalTab.cs

@@ -28,7 +28,7 @@ namespace GcDevicePc.ConfigMethod
         {
             cleanALLItem();
             addALLItem("无");
-            if (this.hwconfig.hwconfiginfo.u16DetFront == 1)
+            //if (this.hwconfig.hwconfiginfo.u16DetFront == 1)
             {
                 if (this.hwconfig.hwconfiginfo.u16DetFrontType == 0)  //TCD
                 {
@@ -41,7 +41,7 @@ namespace GcDevicePc.ConfigMethod
             }
 
 
-            if (this.hwconfig.hwconfiginfo.u16DetInter == 1)
+            //if (this.hwconfig.hwconfiginfo.u16DetInter == 1)
             {
                 if (this.hwconfig.hwconfiginfo.u16DetInterType == 0)  //TCD
                 {
@@ -54,7 +54,7 @@ namespace GcDevicePc.ConfigMethod
             }
 
 
-            if (this.hwconfig.hwconfiginfo.u16DetBehind == 1)
+            //if (this.hwconfig.hwconfiginfo.u16DetBehind == 1)
             {
                 if (this.hwconfig.hwconfiginfo.u16DetBehindType == 0)  //TCD
                 {

GcDevicePc/DataState.cs

@@ -1395,11 +1395,12 @@ namespace GcDevicePc
 
                     }
 
-                    if (CProfileDevice.m_DevParam.syspara.u16DetInter == 1 && CProfileDevice.m_DevParam.syspara.u16AuxHeater1 != 1)
+                    if (CProfileDevice.m_DevParam.syspara.u16DetInter == 1)
+                    //if (CProfileDevice.m_DevParam.syspara.u16DetInter == 1 && CProfileDevice.m_DevParam.syspara.u16AuxHeater1 != 1)
                         {
 
 
-                        if (globaldata.m_dpbuffer.ShowList.showtemp.iDetSetTemp != 0.0f)
+                        //if (globaldata.m_dpbuffer.ShowList.showtemp.iDetSetTemp != 0.0f)
                         {
                             tempshow = new ListViewItem();
                             if (CProfileDevice.m_DevParam.syspara.u16DetInterType == 0)  //TCD
@@ -1452,11 +1453,12 @@ namespace GcDevicePc
 
                     }
 
-                    if (CProfileDevice.m_DevParam.syspara.u16DetBehind == 1 && CProfileDevice.m_DevParam.syspara.u16AuxHeater2 != 1)
+                    //if (CProfileDevice.m_DevParam.syspara.u16DetBehind == 1 && CProfileDevice.m_DevParam.syspara.u16AuxHeater2 != 1)
+                    if (CProfileDevice.m_DevParam.syspara.u16DetBehind == 1)
                         {
 
 
-                        if (globaldata.m_dpbuffer.ShowList.showtemp.bDetSetTemp != 0.0f)
+                        //if (globaldata.m_dpbuffer.ShowList.showtemp.bDetSetTemp != 0.0f)
                         {
                             //tempshow.SubItems.Add(IsException(globaldata.m_dpbuffer.ShowList.showtemp.bDetActualTemp) + " / " + "未定义");
                             tempshow = new ListViewItem();
@@ -1896,7 +1898,7 @@ namespace GcDevicePc
                 //tempshow = new ListViewItem();
                 //this.datalist.Items.Add(tempshow);
 
-                if (CProfileDevice.m_DevParam.syspara.u16AuxHeater1 != 1)
+                //if (CProfileDevice.m_DevParam.syspara.u16AuxHeater1 != 1)
                 {
                     if (CProfileDevice.m_DevParam.syspara.u16DetInter == 1)
                     {
@@ -2017,13 +2019,13 @@ namespace GcDevicePc
                 //tempshow = new ListViewItem();
                 //this.datalist.Items.Add(tempshow);
 
-                if (CProfileDevice.m_DevParam.syspara.u16AuxHeater2 != 1)
+                //if (CProfileDevice.m_DevParam.syspara.u16AuxHeater2 != 1)
                 {
                     if (CProfileDevice.m_DevParam.syspara.u16DetBehind == 1)
                     {
                         //if (CProfileDevice.m_DevParam.syspara.u16DetBehindType == 0 &&
                         //    CProfileDevice.m_DevParam.tcd[2].u16HeaterSel > 0) //TCD
-                        if (CProfileDevice.m_DevParam.syspara.u16DetBehindType == 00) //TCD
+                        if (CProfileDevice.m_DevParam.syspara.u16DetBehindType == 0) //TCD
                         {
                             tempshow = new ListViewItem();
                             tempshow.Text = "TCD3";

GcDevicePc/ProThread/SendDataToZB.cs

@@ -365,7 +365,7 @@ namespace GcDevicePc.ProThread
             //int i = 0;
             bool runflag = false;
 
-            while (true)
+            while (!datamre.WaitOne(500))
             {
                 if ((globaldata.m_hmibuffer.gcinfo.methodstatus == 4 || globaldata.m_hmibuffer.gcinfo.methodstatus == 5) && methodconfig != null && run_stop != true)
                 //if ((globaldata.m_hmibuffer.gcinfo.methodstatus == 4 || globaldata.m_hmibuffer.gcinfo.methodstatus == 5) && globaldata.m_hmibuffer.gcinfo.hmistatus == 4 && run_stop != true)

GcDevicePc/ProThread/SignalDataToHw.cs

@@ -291,7 +291,7 @@ namespace GcDevicePc.ProThread
             ushort SendNumB = 0;
             //int i = 0;
             bool runflag = false;
-            while (true)
+            while (!datamre.WaitOne(500))
             {
                 if ((globaldata.m_hmibuffer.gcinfo.methodstatus == 4 || globaldata.m_hmibuffer.gcinfo.methodstatus == 5) && methodconfig != null && run_stop != true)
                 //if ((globaldata.m_hmibuffer.gcinfo.methodstatus == 4 || globaldata.m_hmibuffer.gcinfo.methodstatus == 5) && globaldata.m_hmibuffer.gcinfo.hmistatus == 4 && run_stop != true)

GcDevicePc/SysConfig.cs

@@ -49,7 +49,7 @@ namespace GcDevicePc
 
         private void ListBox1_MeasureItem(object sender, MeasureItemEventArgs e)
         {
-            e.ItemHeight = e.ItemHeight + 12;
+            e.ItemHeight += 12;
         }
 
         private void ListBox1_SelectedIndexChanged(object sender, EventArgs e)