Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master

GcDevicePc/CK_UI/UserCtl.cs

@@ -36,22 +36,32 @@ namespace GcDevicePc.CK_UI
 
         private void UserCtl_Load(object sender, EventArgs e)
         {
-            Systemtype = CKVocAnalyzer.GlobalCKV.Systemtype;
-           
-            switch (Systemtype)
+            try
             {
-                default:                                 //非甲烷总烃
-                     InitZedgrap(zedGraphControl1);
-                     data();
-                    datadisp();
-                    UIVisible(false);
-                    break;
-                case 1:
-                    InitZedgrapben(zedGraphControl1);
-                    data2();
-                    datadisp2();
+                Systemtype =  CKVocAnalyzer.GlobalCKV.Systemtype;
+
+                switch (Systemtype)
+                {
+                    default:                                 //非甲烷总烃
+                        InitZedgrap(zedGraphControl1);
+                        data();
+                        datadisp();
+                        UIVisible(false);
                         break;
+                    case 1:
+                        InitZedgrapben(zedGraphControl1);
+                        data2();
+                        datadisp2();
+                        break;
+                }
+
             }
+            catch (Exception ex)
+            {
+
+                Trace.Write(ex);
+            }
+           
            
            
         }
@@ -228,7 +238,10 @@ namespace GcDevicePc.CK_UI
             {
                 if (myPaneNmoc == null || myPaneCh4 == null || myPaneThc == null|| listNmoc.Count<1||listCH4.Count<1||listTHC.Count<1)
                 {
+                   // Trace.WriteLine("跳出", "sys");
+                   // Trace.WriteLine(string.Format("NMHC-{0},ch4={1},thc-{2}",listNmoc.Count,listCH4.Count,listTHC.Count),"sys");
                     return;
+                   
                 }
                 textBox1.Text =Math.Round(listNmoc[listNmoc.Count - 1].Y,2).ToString() + "ppm";
                 textBox2.Text =Math.Round(listTHC[listTHC.Count - 1].Y,2).ToString() + "ppm";
@@ -270,6 +283,7 @@ namespace GcDevicePc.CK_UI
                 zedGraphControl1.AxisChange();
                 zedGraphControl1.Refresh();
                
+               
             }
             catch(Exception ex)
             {
@@ -417,6 +431,7 @@ namespace GcDevicePc.CK_UI
                     }
 
                 }
+              //  Trace.WriteLine(string.Format("读取个数{0}",sql.ReturnData.Count),"sys");
                
                
             }catch(Exception ex)
@@ -493,19 +508,27 @@ namespace GcDevicePc.CK_UI
 
         private void timer1_Tick(object sender, EventArgs e)
         {
-            switch (Systemtype)
+            try
             {
-                default:                                 //非甲烷总烃
-                   
-                    data();
-                    datadisp();
-                    UIVisible(false);
-                    break;
-                case 1:
-                   
-                    data2();
-                    datadisp2();
-                    break;
+                switch (Systemtype)
+                {
+                    default:                                 //非甲烷总烃
+
+                        data();
+                        datadisp();
+                        UIVisible(false);
+                        break;
+                    case 1:
+
+                        data2();
+                        datadisp2();
+                        break;
+                }
+               // Trace.WriteLine("绘图","sys");
+            }
+            catch(Exception ex)
+            {
+                Trace.Write(ex);
             }
            
            

GcDevicePc/FormUser.cs

@@ -50,13 +50,7 @@ namespace GcDevicePc
         //自动校准
         private void buttonauto_Click(object sender, EventArgs e)  
         {
-            if (CK_UI.LandIn.Island)
-            {
-               
-            }else
-            {
-               
-            }
+           
 
             DialogResult dr = new CK_UI.LandIn("calibration").ShowDialog();
 

GcDevicePc/MDIBase.cs

@@ -398,7 +398,7 @@ namespace GcDevicePc
          float fDetvalueold = 0.0f;
         private void timer1_Tick(object sender, EventArgs e)
         {
-            this.Text = String.Format("VOCs在线监测-1.1.3.01   {0}",Formstr);
+            this.Text = String.Format("VOCs在线监测-1.1.3.05 {0}",Formstr);
             if (LandIn.Island)
             {
             HmiStatus.Text = String.Format("状态：{0}", statestr);
@@ -1998,6 +1998,8 @@ namespace GcDevicePc
         {
             try
             {
+                //Trace.WriteLine(string.Format("{0},{1}", SharedSpace.MControl.SetOut, SharedSpace.MControl.SetRun), "debug");
+
                 if (SharedSpace.MControl.SetOut && SharedSpace.MControl.SetRun == false)  //准备开始校准
                 {
                     SharedSpace.MControl.errstr = null;
@@ -2029,6 +2031,11 @@ namespace GcDevicePc
                         SharedSpace.MControl.SetOut = false;
                     }
                 }
+                //else if (SharedSpace.MControl.SetRun == false)
+                //{
+                //    SharedSpace.MControl.errstr = "系统准备失败";
+                //    SharedSpace.MControl.SetOut = false;
+                //}
                 //等待校准结束
                 if (DateTime.Now >= AutoAdjust && SharedSpace.MControl.SetOut && SharedSpace.MControl.SetRun)
                 {

GcDevicePc/Program.cs

@@ -20,6 +20,7 @@ namespace GcDevicePc
                     if (createNew)
                     {
                         Application.Run(new StartForm());
+                       // Application.Run(new MDIBase());
                     }
                     else
                     {