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

GcDevicePc/CK_UI/UserCtl.cs

@@ -95,9 +95,9 @@ namespace GcDevicePc.CK_UI
                    "",
                    "");
 
-                 setpane(myPaneNmoc, "NMOC");
-                 setpane(myPaneThc, "THC");
-                 setpane(myPaneCh4, "CH4");
+                 setpane(myPaneNmoc,CKVocAnalyzer.GlobalCKV.IngredientList[0].name); //NMHC
+                 setpane(myPaneThc, CKVocAnalyzer.GlobalCKV.IngredientList[1].name); //thc
+                 setpane(myPaneCh4, CKVocAnalyzer.GlobalCKV.IngredientList[2].name); //CH4
 
                  using (Graphics g = zedgraph.CreateGraphics())
                  {
@@ -156,12 +156,12 @@ namespace GcDevicePc.CK_UI
                  "",
                  "");
 
-                setpane(myPaneNmoc, "NMOC");
-                setpane(myPaneThc, "THC");
-                setpane(myPaneCh4, "CH4");
-                setpane(myPaneben, "苯");
-                setpane(myPanejiaben, "甲苯");
-                setpane(myPaneerjiaben, "二甲苯");
+                setpane(myPaneNmoc, CKVocAnalyzer.GlobalCKV.IngredientList[0].name);
+                setpane(myPaneThc, CKVocAnalyzer.GlobalCKV.IngredientList[1].name);
+                setpane(myPaneCh4, CKVocAnalyzer.GlobalCKV.IngredientList[2].name);
+                setpane(myPaneben, CKVocAnalyzer.GlobalCKV.IngredientList[3].name);
+                setpane(myPanejiaben, CKVocAnalyzer.GlobalCKV.IngredientList[4].name);
+                setpane(myPaneerjiaben, CKVocAnalyzer.GlobalCKV.IngredientList[5].name);
 
                 using (Graphics g = zedgraph.CreateGraphics())
                 {
@@ -397,19 +397,19 @@ namespace GcDevicePc.CK_UI
                 listTHC.Clear();
                 for (int i = 0; i < sql.ReturnData.Count; ++i)
                 {
-                    if(sql.ReturnData[i].name=="NMOC")
+                    if (sql.ReturnData[i].name == CKVocAnalyzer.GlobalCKV.IngredientList[0].name)
                     {
                         double times = (double)new XDate(Convert.ToDateTime(sql.ReturnData[i].Time));
                         double v = sql.ReturnData[i].value;
                         listNmoc.Add(times,v);
                     }
-                    if (sql.ReturnData[i].name == "THC")
+                    if (sql.ReturnData[i].name == CKVocAnalyzer.GlobalCKV.IngredientList[1].name)
                     {
                         double times1 = (double)new XDate(Convert.ToDateTime(sql.ReturnData[i].Time));
                         double v1 = sql.ReturnData[i].value;
                         listTHC.Add(times1, v1);
                     }
-                    if (sql.ReturnData[i].name == "CH4")
+                    if (sql.ReturnData[i].name == CKVocAnalyzer.GlobalCKV.IngredientList[2].name)
                     {
                         double times2 = (double)new XDate(Convert.ToDateTime(sql.ReturnData[i].Time));
                         double v2 = sql.ReturnData[i].value;
@@ -450,31 +450,31 @@ namespace GcDevicePc.CK_UI
                 {
                     double times = (double)new XDate(Convert.ToDateTime(sql.ReturnData[i].Time));
                     double v = sql.ReturnData[i].value;
-                    if (sql.ReturnData[i].name == "NMOC")
+                    if (sql.ReturnData[i].name == CKVocAnalyzer.GlobalCKV.IngredientList[0].name)
                     {                       
                         listNmoc.Add(times, v);
                     }
-                    if (sql.ReturnData[i].name == "THC")
+                    if (sql.ReturnData[i].name == CKVocAnalyzer.GlobalCKV.IngredientList[1].name)
                     {
 
                         listTHC.Add(times, v);
                     }
-                    if (sql.ReturnData[i].name == "CH4")
+                    if (sql.ReturnData[i].name == CKVocAnalyzer.GlobalCKV.IngredientList[2].name)
                     {
 
                         listCH4.Add(times, v);
                     }
-                    if (sql.ReturnData[i].name == "苯")
+                    if (sql.ReturnData[i].name == CKVocAnalyzer.GlobalCKV.IngredientList[3].name)
                     {
                        
                         listben.Add(times, v);
                     }
-                    if (sql.ReturnData[i].name == "甲苯")
+                    if (sql.ReturnData[i].name == CKVocAnalyzer.GlobalCKV.IngredientList[4].name)
                     {
 
                         listjiaben.Add(times, v);
                     }
-                    if (sql.ReturnData[i].name == "二甲苯")
+                    if (sql.ReturnData[i].name == CKVocAnalyzer.GlobalCKV.IngredientList[5].name)
                     {
 
                         listerjiaben.Add(times, v);