合并远程库

GcDevicePc/AboutForm.cs

@@ -42,7 +42,11 @@ namespace GcDevicePc
             this.fid1ver.Text = this.FID1version;
             this.fid2ver.Text = this.FID2version;
             this.tcdver.Text = this.TCD1version;
+<<<<<<< HEAD
             this.PCver.Text = this.Hmiversion + "/1.6.3";
+=======
+            this.PCver.Text = this.Hmiversion + "/1.6.1";
+>>>>>>> origin/wang_master
         }
     }
 }

GcDevicePc/CK_UI/UserCtl.cs

@@ -654,6 +654,7 @@ namespace GcDevicePc.CK_UI
                     int indexTWO = CKVocAnalyzer.GlobalCKV.adjustTwo.FindIndex(s => s.name == sql.ReturnData[i].name);
 
                     double v = 0;
+<<<<<<< HEAD
                     v = sql.ReturnData[i].value;
                     if (indexTWO > -1)
                     {
@@ -662,12 +663,24 @@ namespace GcDevicePc.CK_UI
                     if (cpde != null && cpde.Count > 0)
                     {
                         v = CKVocAnalyzer.Utility.Calculation(cpde[0].OExpression, v);//sql.ReturnData[i].value
+=======
+                    if (cpde != null && cpde.Count > 0)
+                    {
+                        v = CKVocAnalyzer.Utility.Calculation(cpde[0].OExpression, sql.ReturnData[i].value);
+>>>>>>> origin/wang_master
                     }
                     else
                     {
                         v = sql.ReturnData[i].value;
                     }
+<<<<<<< HEAD
 
+=======
+                    if (indexTWO > -1)
+                    {
+                        v = v * CKVocAnalyzer.GlobalCKV.adjustTwo[indexTWO].BValue + CKVocAnalyzer.GlobalCKV.adjustTwo[indexTWO].CValue;
+                    }
+>>>>>>> origin/wang_master
 
 
                     if (sql.ReturnData[i].name == CKVocAnalyzer.GlobalCKV.IngredientList[0].name)

GcDevicePc/MDIBase.cs

@@ -660,7 +660,11 @@ namespace GcDevicePc
         /// 1.0.2.3  添加了周期完成后，重新绘图功能
         private void timer1_Tick(object sender, EventArgs e)
         {
+<<<<<<< HEAD
             this.Text = String.Format("{0}-1.6.3 {1}", globaldata.AppName,Formstr);
+=======
+            this.Text = String.Format("{0}-1.6.1 {1}", globaldata.AppName,Formstr);
+>>>>>>> origin/wang_master
 
             HmiStatus.Text = String.Format("状态：{0}", statestr);
 

VocsSetup/GC_Config/GC_DataPro/AutoAdjust.ini

@@ -3,6 +3,7 @@ ECOUNT=3
 [ENTITY0]
 ECC=NMHC,1,0,0,1
 [ENTITY1]
+<<<<<<< HEAD
 ECC=THC,1,-4.09499979019165,0,1
 [ENTITY2]
 ECC=CH4,1,-2.16199994087219,0,1
@@ -12,3 +13,8 @@ ECC=
 ECC=,1,0,0,1
 [ENTITY5]
 ECC=ױ,1,0,0,1
+=======
+ECC=THC,1,0,0,1
+[ENTITY2]
+ECC=CH4,1,0,0,1
+>>>>>>> origin/wang_master

VocsSetup/GC_Config/GC_DataPro/Calibrationdel.std

 [SYSINFO]
 ECOUNT=3
 [ENTITY0]
+<<<<<<< HEAD
 ECC=NMHC,0,2,0,0,0,-2147483648,0,0,0,1,mV,1000,uV,ppm,0,0,0,0,0
 ECCD0=1,浓度1,1.93,,0,,1
 ECCD0_Orig0=0,uV*sec,1030130844-A,D:\Program Files (x86)\色谱工作站\GC_User\原始数据\样气\2019年\10月\30日\1030130844-A.raw
@@ -78,3 +79,16 @@ ECCD0_Orig0=6751.5,uV*sec,1028145648-A,D:\Program Files (x86)\色
 ECC=二甲苯,0,2,0,0.0001639425,4.104957E-08,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
 ECCD0=1,浓度1,1,,6099.7,,1
 ECCD0_Orig0=6099.7,uV*sec,1028145648-A,D:\Program Files (x86)\色谱工作站\GC_User\原始数据\样气\2019年\10月\28日\1028145648-A.raw
+=======
+ECC=NMHC,0,0,0,0,0,0,0,0,0,0,,1000,,,0,0,0,0,0
+ECCD0=1,浓度1,0,,0,,1
+ECCD0_Orig0=0,uV*sec,Default,...\Default.raw
+[ENTITY1]
+ECC=THC,0,0,0,0,0,0,0,0,0,0,,1000,,,0,0,0,0,0
+ECCD0=1,浓度1,0,,0,,1
+ECCD0_Orig0=0,uV*sec,Default,...\Default.raw
+[ENTITY2]
+ECC=CH4,0,0,0,0,0,0,0,0,0,0,,1000,,,0,0,0,0,0
+ECCD0=1,浓度1,0,,0,,1
+ECCD0_Orig0=0,uV*sec,Default,...\Default.raw
+>>>>>>> origin/wang_master

VocsSetup/GC_Config/GC_DataPro/ExteCfg.config

+<<<<<<< HEAD
 <GCCPC>
+=======
+<GCCPC>
+>>>>>>> origin/wang_master
   <Cfg>
     <PARAMETER>
       <DEBUG>True</DEBUG>
       <fid>True</fid>
+<<<<<<< HEAD
       <file1>C:\Users\a\Desktop\色谱仪\新建文件夹\Vocs_opt\VocsSetup\GC_Config\GC_Set\运行表\VOC</file1>
       <file2>C:\Users\a\Desktop\色谱仪\新建文件夹\Vocs_opt\VocsSetup\GC_Config\GC_Set\运行表\VOC</file2>
       <file3>C:\Users\a\Desktop\色谱仪\新建文件夹\Vocs_opt\VocsSetup\GC_Config\GC_Set\运行表\VOC</file3>
       <adjust1>2</adjust1>
       <adjust2>1</adjust2>
+=======
+      <file1></file1>
+      <file2></file2>
+      <file3></file3>
+      <adjust1>3</adjust1>
+      <adjust2>3</adjust2>
+>>>>>>> origin/wang_master
       <adjust3>0</adjust3>
       <systemtype>0</systemtype>
       <spacesize>500</spacesize>
       <spacetimes>3</spacetimes>
+<<<<<<< HEAD
       <cyname>RunMethod.ini</cyname>
       <zeroname>RunMethod.ini</zeroname>
       <bqname>RunMethod.ini</bqname>
+=======
+      <cyname></cyname>
+      <zeroname></zeroname>
+      <bqname></bqname>
+>>>>>>> origin/wang_master
       <RSD>3</RSD>
       <MethodType>1</MethodType>
       <AutoTimes>30</AutoTimes>
       <UnitType>0</UnitType>
+<<<<<<< HEAD
       <Kmax>1.1</Kmax>
       <Kmin>0.9</Kmin>
       <Bmax>10</Bmax>
@@ -36,5 +55,17 @@
       <name>CH4</name>
       <vlue>0</vlue>
     </AutoMessage>
+=======
+      <Kmax>0</Kmax>
+      <Kmin>0</Kmin>
+      <Bmax>0</Bmax>
+      <Bmin>0</Bmin>
+    </PARAMETER>
+    <NMHCcfgSave>
+      <name>
+      </name>
+      <vlue>0</vlue>
+    </NMHCcfgSave>
+>>>>>>> origin/wang_master
   </Cfg>
 </GCCPC>
\ No newline at end of file

VocsSetup/GC_Config/GC_DataPro/SpectralDefault.comp

@@ -2,6 +2,7 @@
 ECOUNT=3
 COEF=1
 [ENTITY0]
+<<<<<<< HEAD
 ETXT=0,NMHC,0,0,0,0,255,0,0,100000,1,0,0
 [ENTITY1]
 ETXT=0,THC,0.4,0.6,0,0,255,0,0,100000,1,0,0
@@ -13,3 +14,10 @@ ETXT=0,
 ETXT=0,,1.68,1.85,0,0,255,0,0,100000,1,0,0
 [ENTITY5]
 ETXT=0,ױ,2.37,2.66,0,0,255,0,0,100000,1,0,0
+=======
+ETXT=0,NMHC,0,0,0,0,255,255,255,0,0,0,0
+[ENTITY1]
+ETXT=0,THC,0,0,0,0,255,255,255,0,0,0,0
+[ENTITY2]
+ETXT=0,CH4,0,0,0,0,255,255,255,0,0,0,0
+>>>>>>> origin/wang_master

VocsSetup/GC_Config/GC_Set/启动参数/CpdExpression.ini

 [CpdCount]
+<<<<<<< HEAD
 Count=12
 [Compound0]
 Name=CH4
@@ -7,10 +8,21 @@ OUnit=mg/m3
 UExpression=x
 IExpression=x
 OExpression=x
+=======
+Count=21
+[Compound0]
+Name=CH4
+IUnit=mg/m3
+OUnit=mg/m3以碳计（CH4单标）
+UExpression=x*12/16
+IExpression=x*22.4/16*16/12
+OExpression=x*16/12
+>>>>>>> origin/wang_master
 TranUnit=ppm
 [Compound1]
 Name=CH4
 IUnit=mg/m3
+<<<<<<< HEAD
 OUnit=ppm
 UExpression=x*12/22.4
 IExpression=x*22.4/12
@@ -95,6 +107,92 @@ OUnit=mg/m3
 TranUnit=ppm
 UExpression=x*7
 IExpression=x
+=======
+OUnit=ppm(CH4单标）
+UExpression=x*16/22.4
+IExpression=x*22.4/16
+OExpression=x*22.4/16
+TranUnit=ppm
+[Compound2]
+Name=CH4
+IUnit=mg/m3
+OUnit=mg/m3以丙烷计
+UExpression=x/3
+IExpression=x*22.4/16*3
+OExpression=x*3
+TranUnit=ppm
+[Compound3]
+Name=CH4
+IUnit=mg/m3
+OUnit=mg/m3以甲烷计(CH4单标）
+TranUnit=ppm
+UExpression=x
+IExpression=x*22.4/16
+OExpression=x
+[Compound4]
+Name=CH4
+IUnit=mg/m3
+OUnit=mg/m3以甲烷计（混标）
+TranUnit=ppm
+UExpression=x
+IExpression=x*22.4/16
+OExpression=x
+[Compound5]
+Name=CH4
+IUnit=mg/m3
+OUnit=mg/m3以碳计(混标）
+TranUnit=ppm
+UExpression=x
+IExpression=x*22.4/16
+OExpression=x
+[Compound6]
+Name=CH4
+IUnit=mg/m3
+OUnit=ppm(混标）
+TranUnit=ppm
+UExpression=x*16/22.4
+IExpression=x*22.4/16
+OExpression=x*22.4/16
+[Compound7]
+Name=NMHC
+IUnit=mg/m3
+OUnit=mg/m3以甲烷计(CH4单标）
+TranUnit=ppm
+UExpression=x
+IExpression=x*22.4/16
+OExpression=x
+[Compound8]
+Name=NMHC
+IUnit=mg/m3
+OUnit=mg/m3以碳计(CH4单标）
+TranUnit=ppm
+UExpression=x
+IExpression=x*12/22.4
+OExpression=x
+[Compound9]
+Name=NMHC
+IUnit=mg/m3
+OUnit=mg/m3以甲烷计（混标）
+TranUnit=ppm
+UExpression=x*3
+IExpression=x*22.4/44/3
+OExpression=x
+[Compound10]
+Name=NMHC
+IUnit=mg/m3
+OUnit=mg/m3以碳计(混标）
+TranUnit=ppm
+UExpression=x*3
+IExpression=x*22.4/44/3
+OExpression=x
+[Compound11]
+Name=NMHC
+IUnit=mg/m3
+OUnit=mg/m3以丙烷计
+TranUnit=ppm
+UExpression=x
+IExpression=x*22.4/44
+>>>>>>> origin/wang_master
 OExpression=x
 [Compound12]
 Name=NMHC

VocsSetup/GC_Config/GC_Set/启动参数/startup.ini

@@ -2,6 +2,7 @@
 MAC地址=
 网口=本地连接
 [StartUp]
+<<<<<<< HEAD
 自启动=1
 打开系统=1
 运行类型=2
@@ -26,3 +27,29 @@ Thirdparty=3
 Foreign=1
 [SaveData]
 ZBSaveData=0
+=======
+自启动=0
+打开系统=0
+运行类型=0
+Forceintegral=0
+space=500
+Datetime=1
+TdName=通用5.2
+[DataFolder]
+历史数据=
+[Logs]
+InfoLog=1
+ErrLog=1
+HmiLog=1
+[Version]
+VersionType=1
+AppName=
+[User]
+Name=admin
+Password=0
+[SendData]
+Thirdparty=3
+Foreign=2
+[SaveData]
+ZBSaveData=1
+>>>>>>> origin/wang_master

VocsSetup/GC_Control/化合物列表.csv

@@ -16,7 +16,11 @@
 15,反-2-戊烯 ,trans -2-Pentene,646-04-8,C5H10,70.1329,5
 16,1-戊烯,1-Pentene,109-67-1,C5H10,70.133,5
 17,顺-2-戊烯,cis -2-Pentene,627-20-3,C5H10,70.1329,5
+<<<<<<< HEAD
 18,2，2-二甲基丁烷,2，2-Dimethylbutane,75-83-2,C6H14,86.175,6
+=======
+18,顺-2-戊烯,2，2-Dimethylbutane,75-83-2,C6H14,86.175,6
+>>>>>>> origin/wang_master
 19,2，3-二甲基丁烷,2，3-Dimethylbutane,79-29-8,C6H14,86.175,6
 20,2-甲基戊烷,2-Methylpentane,107-83-5,C6H14,86.175,6
 21,3-甲基戊烷,3-Methylpentane,96-14-0,C6H14,86.175,6