Skip to content

G
GC_Branch
Commit 5587fca6 authored by 周磊's avatar 周磊
Browse files
Options

1.版本变更至1.9.0 

2.选项添加"云盒子"控制开关,勾选后发送相关仪器信息到云平台
3.选项添加"nmhc测定方式","间接"等于以前的状态,"直测"会将thc改为nmhc+ch4;nmhc直接测定(包括用户界面,调试界面,上传上位机)
4.优化联机
5.辅助工具-温度趋势,扩展到六路,增加跟随分析启动,增加占空比趋势线等
parent 1961b0e8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5592 additions and 2572 deletions
GcDevicePc/CK_UI/CurveDisPlay.cs
View file @ 5587fca6
......@@ -13,11 +13,19 @@ namespace GcDevicePc
{
public partial class CurveDisPlay : DockContent
{
public class DrawingSubform
{
public CKVocAnalyzer.CtrlWaveCurrent curdisp;
}
public static CKVocAnalyzer.CtrlWaveCurrent curdisp = new CKVocAnalyzer.CtrlWaveCurrent();
/// <summary>
/// 强制清除绘图数据
/// </summary>
public static bool forcePurge = false;
/// <summary>
/// NMHC测定方式
/// </summary>
public static CKVocAnalyzer.CtrlWaveCurrent.NMHCCal nMHCCal;
public CurveDisPlay()
{
InitializeComponent();
......
GcDevicePc/CK_UI/UserCtl.cs
View file @ 5587fca6
......@@ -415,20 +415,37 @@ namespace GcDevicePc.CK_UI
//嵌套for循环,解决"CKVocAnalyzer.GlobalCKV.IngredientList"直接定值索引引起的越界问题
for (int j = 0; j < CKVocAnalyzer.GlobalCKV.IngredientList.Count; j++)
{
if (CKVocAnalyzer.GlobalCKV.vocparamlist[i].Name == CKVocAnalyzer.GlobalCKV.IngredientList[j].name&&listTHC.Count>=1&&listCH4.Count>=1)
if (CKVocAnalyzer.GlobalCKV.vocparamlist[i].Name == CKVocAnalyzer.GlobalCKV.IngredientList[j].name && listTHC.Count >= 1 && listCH4.Count >= 1)
{
switch (j)
{
case 0:
if (isppm)
{
if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_direct)
{
//直接测定
textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y, 2).ToString();
}
else if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_indirect)
{
//间接测定
textBox1.Text = Math.Round(listTHC[listTHC.Count - 1].Y * fAutoDisO2Product - listCH4[listCH4.Count - 1].Y, 2).ToString();
}
//textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y, 2).ToString();
textBox1.Text = Math.Round(listTHC[listTHC.Count - 1].Y * fAutoDisO2Product - listCH4[listCH4.Count - 1].Y, 2).ToString();
}
else
{//此处计算成mg/m3 nmhc
//textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y, 2).ToString();
textBox1.Text = Math.Round(listTHC[listTHC.Count - 1].Y * fAutoDisO2Product - listCH4[listCH4.Count - 1].Y, 2).ToString();
if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_direct)
{
textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y, 2).ToString();
}
else if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_indirect)
{
textBox1.Text = Math.Round(listTHC[listTHC.Count - 1].Y * fAutoDisO2Product - listCH4[listCH4.Count - 1].Y, 2).ToString();
}
//textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y / (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 12) * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
}
......@@ -442,12 +459,26 @@ namespace GcDevicePc.CK_UI
case 1:
if (isppm)
{
textBox2.Text = Math.Round(listTHC[listTHC.Count - 1].Y * fAutoDisO2Product, 2).ToString();
if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_direct)
{
//因为是直测,一根PQ,无需再考虑氧干扰
textBox2.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y + listCH4[listCH4.Count - 1].Y, 2).ToString();
}
else if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_indirect)
{
textBox2.Text = Math.Round(listTHC[listTHC.Count - 1].Y * fAutoDisO2Product, 2).ToString();
}
}
else
{
textBox2.Text = Math.Round(listTHC[listTHC.Count - 1].Y * fAutoDisO2Product, 2).ToString();
if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_direct)
{
textBox2.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y + listCH4[listCH4.Count - 1].Y, 2).ToString();
}
else if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_indirect)
{
textBox2.Text = Math.Round(listTHC[listTHC.Count - 1].Y * fAutoDisO2Product, 2).ToString();
}
//textBox2.Text = Math.Round(listTHC[listTHC.Count - 1].Y / (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 12) * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
}
......
GcDevicePc/CloudBox/DataInstance.cs
View file @ 5587fca6
This diff is collapsed.
GcDevicePc/Common/NModbusSlave.cs
View file @ 5587fca6
......@@ -812,7 +812,6 @@ namespace GcDevicePc.Common
if (address == 2 || address == 3)
{
index = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "THC");
}
if (address == 4 || address == 5)
......@@ -826,23 +825,45 @@ namespace GcDevicePc.Common
if (index > -1)
{
f[0] = float.Parse(SharedSpace.Data.listValue[index].vale.ToString());
if (index == SharedSpace.Data.listValue.FindIndex(lv => lv.name == "THC"))
if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_direct)
{
f[0] = vRead_AutoDisO2Input_Reault(f[0]);
//直测不需要氧校准,THC需要加法计算,其他原值输出
if (index == SharedSpace.Data.listValue.FindIndex(lv => lv.name == "THC"))
{
float fTHCValue, fNMHCValue, fCH4Value;
int sTHCIndex, sNMHCIndex, sCH4Index;
sTHCIndex = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "THC");
sNMHCIndex = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "NMHC");
sCH4Index = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "CH4");
fTHCValue = float.Parse(SharedSpace.Data.listValue[sTHCIndex].vale.ToString());
fNMHCValue = float.Parse(SharedSpace.Data.listValue[sNMHCIndex].vale.ToString());
fCH4Value = float.Parse(SharedSpace.Data.listValue[sCH4Index].vale.ToString());
f[0] = fNMHCValue + fCH4Value;
}
}
else if (index == SharedSpace.Data.listValue.FindIndex(lv => lv.name == "NMHC"))
else if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_indirect)
{
float fTHCValue, fNMHCValue, fCH4Value;
int sTHCIndex, sNMHCIndex, sCH4Index;
sTHCIndex = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "THC");
sNMHCIndex = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "NMHC");
sCH4Index = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "CH4");
fTHCValue = float.Parse(SharedSpace.Data.listValue[sTHCIndex].vale.ToString());
fNMHCValue = float.Parse(SharedSpace.Data.listValue[sNMHCIndex].vale.ToString());
fCH4Value = float.Parse(SharedSpace.Data.listValue[sCH4Index].vale.ToString());
if (index == SharedSpace.Data.listValue.FindIndex(lv => lv.name == "THC"))
{
f[0] = vRead_AutoDisO2Input_Reault(f[0]);
}
else if (index == SharedSpace.Data.listValue.FindIndex(lv => lv.name == "NMHC"))
{
float fTHCValue, fNMHCValue, fCH4Value;
int sTHCIndex, sNMHCIndex, sCH4Index;
sTHCIndex = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "THC");
sNMHCIndex = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "NMHC");
sCH4Index = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "CH4");
f[0] = vRead_AutoDisO2Input_Reault(fTHCValue) - fCH4Value;
fTHCValue = float.Parse(SharedSpace.Data.listValue[sTHCIndex].vale.ToString());
fNMHCValue = float.Parse(SharedSpace.Data.listValue[sNMHCIndex].vale.ToString());
fCH4Value = float.Parse(SharedSpace.Data.listValue[sCH4Index].vale.ToString());
f[0] = vRead_AutoDisO2Input_Reault(fTHCValue) - fCH4Value;
}
}
}
else
......
GcDevicePc/Common/sys_ini.cs
View file @ 5587fca6
......@@ -45,6 +45,7 @@ namespace GcDevicePc.Common
infile.WriteBoolean("TempTrend", "显示节点数据",false);
infile.WriteString("TempTrend", "背景颜色","White");
infile.WriteString("TempTrend", "上次加载数据","");
infile.WriteString("TempTrend", "跟随分析启动","0");
}
/// <summary>
/// 写入氧校准-斜率
......@@ -314,6 +315,26 @@ namespace GcDevicePc.Common
}
}
/// <summary>
/// 写入绘图(温控趋势)信息-跟随启动
/// </summary>
/// <param name="node"></param>
public static void Set_Sys_TempTrend_FollowStart(string node)
{
if (File.Exists(file))
{
infile.WriteString("TempTrend", "跟随分析启动",node);
}
else
{
Directory.CreateDirectory(folder);
using (FileStream nfile=new FileStream(file,FileMode.Create))
{
}
infile.WriteString("TempTrend", "跟随分析启动",node);
}
}
/// <summary>
/// 读取氧校准-斜率
/// </summary>
public static double Get_Sys_CpdCount_OxygenSlope()
......@@ -573,6 +594,24 @@ namespace GcDevicePc.Common
Set_Sys_TempTrend_BackgroundColor(node);
}
return node;
}
/// <summary>
/// /读取温控趋势信息-是否跟随分析启动
/// </summary>
/// <returns></returns>
public static string Get_Sys_TempTrend_FollowStart()
{
string node;
if (File.Exists(file))
{
node=infile.ReadString("TempTrend", "跟随分析启动");
}
else
{
node="";
Save_Setting_Init();
}
return node;
}
/// <summary>
/// 读取绘图(温控趋势)信息-上次加载数据
......@@ -587,7 +626,7 @@ namespace GcDevicePc.Common
else
{
node="";
Save_Setting_Init();
Save_Setting_Init();
}
return node;
}
......
GcDevicePc/DrawUI/TempTrend.resx → GcDevicePc/ExpansionMethod/TempTrend.resx
View file @ 5587fca6
......@@ -120,16 +120,10 @@
<metadata name="cms_Chart.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>367, 22</value>
</metadata>
<metadata name="tim_UpdateState.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="tim_ReadInterval.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>216, 22</value>
</metadata>
<metadata name="cms_file.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>480, 22</value>
</metadata>
<metadata name="tip_.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>578, 22</value>
</metadata>
</root>
\ No newline at end of file
GcDevicePc/Formdebug.cs
View file @ 5587fca6
......@@ -179,6 +179,7 @@ namespace GcDevicePc
Console.WriteLine("绘图show");
this.dockPanel1.Contains(curdisplay);
curdisplay.Show(this.dockPanel1);
CurveDisPlay.nMHCCal=CurveDisPlay.curdisp.nMHCCal;
curdisplay.CloseButtonVisible = false;
}
else
......
GcDevicePc/GCBuffer/DPBuffer.cs
View file @ 5587fca6
......@@ -202,14 +202,14 @@ namespace GcDevicePc.GCBuffer
public struct PwmInfo
{
public int fDPower;
public int iDPower;
public int bDPower;
public int fDPower;//前检测
public int iDPower;//中检测/辅助1
public int bDPower;//后检测/辅助2
public int fSPower;
public int bSPower;
public int fSPower;//后进样,确实是
public int bSPower;//前进样
public int CbPower;
public int CbPower;//柱箱
}
......
GcDevicePc/GcDevicePc.csproj
View file @ 5587fca6
......@@ -181,6 +181,10 @@
<Reference Include="WeifenLuo.WinFormsUI.Docking">
<HintPath>..\dll\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
</Reference>
<Reference Include="WindowsFormsControlLibrary_PopUp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\dll\WindowsFormsControlLibrary_PopUp\bin\Debug\WindowsFormsControlLibrary_PopUp.dll</HintPath>
</Reference>
<Reference Include="WitiumControl">
<HintPath>..\dll\WitiumControl.dll</HintPath>
</Reference>
......@@ -573,10 +577,10 @@
<Compile Include="DeviceConfigUI\Sampling.Designer.cs">
<DependentUpon>Sampling.cs</DependentUpon>
</Compile>
<Compile Include="DrawUI\TempTrend.cs">
<Compile Include="ExpansionMethod\TempTrend.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DrawUI\TempTrend.Designer.cs">
<Compile Include="ExpansionMethod\TempTrend.Designer.cs">
<DependentUpon>TempTrend.cs</DependentUpon>
</Compile>
<Compile Include="EPCTips.cs">
......@@ -1054,7 +1058,7 @@
<EmbeddedResource Include="DeviceConfigUI\Sampling.resx">
<DependentUpon>Sampling.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DrawUI\TempTrend.resx">
<EmbeddedResource Include="ExpansionMethod\TempTrend.resx">
<DependentUpon>TempTrend.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="EPCTips.resx">
......@@ -1179,6 +1183,9 @@
<DependentUpon>SysConfig.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SysConfigSecondary.zh-Hans.resx">
<DependentUpon>SysConfigSecondary.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SysConfigSecondary.zh.resx">
<DependentUpon>SysConfigSecondary.cs</DependentUpon>
</EmbeddedResource>
......@@ -1243,7 +1250,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Components\" />
<Folder Include="ExpansionMethod\" />
<Folder Include="DrawUI\" />
<Folder Include="UI\configmenu\" />
<Folder Include="UI\ico\" />
<Folder Include="UI\menu\" />
......@@ -1258,10 +1265,6 @@
<Content Include="UI\picture\色谱3.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\WindowsFormsControlLibrary_PopUp\WindowsFormsControlLibrary_PopUp.csproj">
<Project>{AFC4DDC8-D40D-481E-AE7A-5AFB73C88E78}</Project>
<Name>WindowsFormsControlLibrary_PopUp</Name>
</ProjectReference>
<ProjectReference Include="..\SharedSpace\SharedSpace.csproj">
<Project>{5498f944-5721-461b-b07f-3105ef0bf643}</Project>
<Name>SharedSpace</Name>
......
GcDevicePc/MDIBase.Designer.cs
View file @ 5587fca6
......@@ -452,6 +452,7 @@
this.MainMenuStrip = this.menuStrip;
this.Name = "MDIBase";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MDIBase_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MDIBase_FormClosed);
this.Load += new System.EventHandler(this.MDIBase_Load);
this.menuStrip.ResumeLayout(false);
this.menuStrip.PerformLayout();
......
GcDevicePc/MDIBase.cs
View file @ 5587fca6
......@@ -66,11 +66,11 @@ namespace GcDevicePc
/// <summary>
/// PC版本号,主界面显示,关于显示
/// </summary>
public static string PCVersion = "1.8.8";
public static string PCVersion = "1.9.0";
/// <summary>
/// 云盒子接口
/// </summary>
/// <summary>
/// 云盒子接口
/// </summary>
DataInstance dataInstance;
/// <summary>
/// HMI控制接口
......@@ -376,7 +376,7 @@ namespace GcDevicePc
{
IniFile ini = new IniFile(file);
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.DataFolder = ini.ReadString("DataFolder", "历史数据");
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.FileClassification=ini.ReadString("DataFolder", "分级文件夹");
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.FileClassification = ini.ReadString("DataFolder", "分级文件夹");
}
}
/// <summary>
......@@ -386,8 +386,8 @@ namespace GcDevicePc
/// <param name="e"></param>
private void MDIBase_Load(object sender, EventArgs e)
{
CKVocAnalyzer.CtrlWaveHistory.delChange+=new CKVocAnalyzer.DelChange(DllChange);
CKVocAnalyzer.CtrlWaveHistory.delChange += new CKVocAnalyzer.DelChange(DllChange);
_userForm = new FormUser();
DllInit();
......@@ -517,9 +517,11 @@ namespace GcDevicePc
//form最开始时候的大小 ：X,Y
// X = this.Width; Y = this.Height; setTag(this); MDIBase_Resize(new object(), new EventArgs());//x,y可在实例化时赋值,最后这句是新加的，在MDI时有用
// b_load = true;
// dataInstance=new DataInstance();
if (ini.ReadString("StartUp", "启用云盒子")=="1")
{
dataInstance = new DataInstance();
}
}
private void MDIBase_SizeChanged(object sender, EventArgs e)
{
......@@ -932,9 +934,12 @@ namespace GcDevicePc
toolStripStatusLabelusertime.Text = bEnglishLanguage == false ? String.Format("运行时间：{0}", timespan.Days.ToString() + "天" + timespan.Hours.ToString() + "时" + timespan.Minutes.ToString() + "分" + timespan.Seconds.ToString() + "秒") :
String.Format("Running time：{0}", timespan.Days.ToString() + "Days" + timespan.Hours.ToString() + "Hours" + timespan.Minutes.ToString() + "Minutes" + timespan.Seconds.ToString() + "Seconds");
//反控,发送状态
Task.Run(() => { SendCounterControlState(); ReconnectionTimes = 0; });
if (statestr!=null)
{
//反控,发送状态
Task.Run(() => { SendCounterControlState(); ReconnectionTimes = 0; });
}
switch (CKVocAnalyzer.GlobalCKV.adjustType)
{
case CKVocAnalyzer.GlobalCKV.AdjustType.AT_Zero:
......@@ -4107,6 +4112,21 @@ namespace GcDevicePc
}
private void button1_Click_1(object sender, EventArgs e)
{
}
private void MDIBase_FormClosed(object sender, FormClosedEventArgs e)
{
//停止云盒子数据发送
if (dataInstance!=null)
{
dataInstance.CloseSocket();
}
}
// private bool b_load;
//private float X;
......
GcDevicePc/MDIBase.resx
View file @ 5587fca6
This diff is collapsed.
GcDevicePc/ProThread/CKvocUpdataSum.cs
View file @ 5587fca6
......@@ -13,12 +13,56 @@ using System.Threading.Tasks;
namespace GcDevicePc.ProThread
{
public delegate void DelTriggerAntiControl(bool b);
//委托告知开始和停止
public delegate void DelTriggerAntiControl(bool b);
class CKvocUpdataSum
{
public static event DelTriggerAntiControl delTriggerAntiControl;
public static event DelTriggerAntiControl delTriggerAntiControl;
ManualResetEvent datamre = new ManualResetEvent(false);
// CurveDisPlaySum CurveDisPlay= new CurveDisPlaySum(null);
class Mapping
{
/// <summary>
/// 是否是开始
/// </summary>
int isstart = 0;
/// <summary>
/// 当前停止状态
/// </summary>
bool bNowStopFlag;
/// <summary>
/// 之前停止状态
/// </summary>
bool bBeforeStopFlag;
/// <summary>
/// 检测器位置
/// </summary>
string type;
/// <summary>
/// 是否清除绘图
/// </summary>
bool ClearData;
/// <summary>
/// 信号集合
/// </summary>
ArrayList Save_PortSumList;
/// <summary>
/// 绘图对象
/// </summary>
CKVocAnalyzer.CtrlWaveCurrent curdisp;
/// <summary>
/// 执行开始的窗口数量
/// </summary>
int DetStart = 0;
/// <summary>
/// 执行停止的窗口数量
/// </summary>
int DetStop = 0;
/// <summary>
/// 检测器数量
/// </summary>
ushort pagenum;
}
public static int isstart = 0;
/// <summary>
/// 执行开始的窗口数量
......@@ -36,7 +80,7 @@ namespace GcDevicePc.ProThread
bool bBeforeStopFlag = globaldata.stopflag;
//批量更新
//用于更新记录数据
private void Monitor_DataList(string type, bool ClearData, ArrayList Save_PortSumList, CKVocAnalyzer.CtrlWaveCurrent curdisp)
private void Monitor_DataList(string type, bool ClearData, ArrayList Save_PortSumList, CKVocAnalyzer.CtrlWaveCurrent curdisp)
{
try
{
......@@ -238,7 +282,7 @@ namespace GcDevicePc.ProThread
DetStop++;
if (DetStop == pagenum)
{
delTriggerAntiControl(false);
delTriggerAntiControl(false);
}
Log.DebugInfo(type + "终点判断,更改drbool为true");//debug
......@@ -331,7 +375,7 @@ namespace GcDevicePc.ProThread
//List<double[]> lr = new List<double[]>();
//List<double[]> lp = new List<double[]>();
public void CKvocUpdataStart(string type, ArrayList Save_PortSumList, CKVocAnalyzer.CtrlWaveCurrent curdisp)
public void CKvocUpdataStart(string type, ArrayList Save_PortSumList, CKVocAnalyzer.CtrlWaveCurrent curdisp)
{
if (datamre != null)
{
......@@ -340,7 +384,8 @@ namespace GcDevicePc.ProThread
// t_DataSave = new Thread(Monitor_DataList);
// t_DataSave.IsBackground = true;
// t_DataSave.Start();
(new Task(() => Monitor_DataList(type, false, Save_PortSumList, curdisp))).Start();
(new Task(() => Monitor_DataList(type, false, Save_PortSumList, curdisp))).Start();
}
public void CKvocUpdataStop()
......
GcDevicePc/ProThread/HMISearch.cs
View file @ 5587fca6
......@@ -274,11 +274,8 @@ namespace GcDevicePc.ProThread
bool IsOnline = false;
try
{
if (b==false)
{
GetHmiIp();
}
ushort countDown = usSearchTime;//限定时间,用于倒计时判定
ushort countDown = (ushort)(usSearchTime / 10);//限定时间,用于倒计时判定
while (countDown > 0)
{
for (int i = 0; i < _localip.Count; i++)
......@@ -318,11 +315,11 @@ namespace GcDevicePc.ProThread
continue;
// break;
} // continue;
if (countDown > 20)
if (countDown > 2 || countDown == 2)
{
countDown -= 20;//既不能让搜索时长过长,也要保证HMI更新搜索IP时足够
countDown -= 2;
}
break;
}
else
{
......@@ -344,17 +341,18 @@ namespace GcDevicePc.ProThread
}
}
if (!IsOnline && countDown <= 0)
if (!IsOnline)
{
//重新获取一次_localip,以解决先开启软件,后开启色谱无法联机的问题(当然总搜索时长至少坚持到色谱开机完成)
//也解决了HMI更新搜索不到的问题(需要重置网络信息)
GetHmiIp();
}
else if (IsOnline&&b)
else if (IsOnline && b)
{
//已经搜索到HMI,并且不是hmi更新类型的搜索,则跳出
break;
}
else if (!SysConfig.UpdateHMI_Stop&&!b)
else if (!SysConfig.UpdateHMI_Stop && !b)
{
//hmi更新类型的搜索,点击了停止搜索
break;
......
GcDevicePc/StartForm.cs
View file @ 5587fca6
......@@ -267,6 +267,7 @@ namespace GcDevicePc
}
if (bNoSearchOK == true)
{
//超时未连接到设备,处理
bNoSearchOK= false;
DialogResult dr = new ConnTimeOut().ShowDialog();
if (dr == DialogResult.OK)
......
GcDevicePc/SysConfigSecondary.cs
View file @ 5587fca6
......@@ -25,10 +25,10 @@ namespace GcDevicePc
public partial class SysConfigSecondary : Form
{
private string HmiIP = null;
// private string HmiIP = null;
private ushort HmiPort = 911;
// private ushort HmiPort = 911;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true : false;
private ArrayList SearchRet = new ArrayList();
......@@ -135,6 +135,7 @@ namespace GcDevicePc
IniFile ini = new IniFile(file);
string value = ini.ReadString("StartUp", "自启动");
string str_Cloud=ini.ReadString("StartUp", "启用云盒子");
string opensys = ini.ReadString("StartUp", "打开系统");
string runtype = ini.ReadString("StartUp", "运行类型");
string info_log = ini.ReadString("Logs", "InfoLog");
......@@ -142,7 +143,8 @@ namespace GcDevicePc
string hmi_log = ini.ReadString("Logs", "HmiLog");
string strAntiControlMode=ini.ReadString("反控", "反控模式");
string strAntiControlFormName=ini.ReadString("反控", "反控进程名称");
string strStartStopTrigger=ini.ReadString("反控", "开始停止触发");
string strStartStopTrigger=ini.ReadString("反控", "开始停止触发");
string strNMHC=ini.ReadString("NMHC", "测定方式");
int Version = ini.ReadInteger("Version", "VersionType");
string appname = ini.ReadString("Version", "AppName");
......@@ -185,12 +187,22 @@ namespace GcDevicePc
if (strStartStopTrigger=="")
{
this.comboBox_FollowStop.Text="只触发开始";
ini.WriteString("反控", "开始停止触发","只触发开始");
ini.WriteString("反控", "开始停止触发","只触发开始");
}
else
{
this.comboBox_FollowStop.Text=strStartStopTrigger;
}
if (strNMHC=="")
{
//兼容
this.comboBox1.Text="间接";
ini.WriteString("NMHC", "测定方式","间接");
}
else
{
this.comboBox1.Text=strNMHC;
}
if (ushort.TryParse(strHMISearchTime, out usHMISearchTime) == true)
{
this.SerachHMINumericUpDown1.Value = usHMISearchTime;
......@@ -204,7 +216,14 @@ namespace GcDevicePc
{
this.appstartup.Checked = false;
}
if (str_Cloud=="1")
{
this.checkBox_Cloud.Checked=true;
}
else
{
this.checkBox_Cloud.Checked=false;
}
if (Convert.ToInt32(opensys) == 1)
{
if (Convert.ToInt32(runtype) == 1)
......@@ -611,6 +630,14 @@ namespace GcDevicePc
rk2.DeleteValue("JcShutdown", false);
rk2.Close();
rk.Close();
}
if (checkBox_Cloud.Checked)
{
ini.WriteString("StartUp", "启用云盒子", "1");
}
else
{
ini.WriteString("StartUp", "启用云盒子", "0");
}
if (runbat.Checked)
{
......@@ -692,6 +719,15 @@ namespace GcDevicePc
{
ini.WriteString("SendData", "Foreign", "2");//无
}
if (comboBox1.Text==""||comboBox1.Text=="间接")
{
ini.WriteString("NMHC", "测定方式", "间接");//NMHC测定方式
}
else
{
ini.WriteString("NMHC", "测定方式", "直测");
}
//发送信号类型
if (radioButton13.Checked)
{
......
GcDevicePc/SysConfigSecondary.en.resx
View file @ 5587fca6
......@@ -166,7 +166,7 @@
<value>22, 113</value>
</data>
<data name="groupBox8.Size" type="System.Drawing.Size, System.Drawing">
<value>436, 85</value>
<value>533, 85</value>
</data>
<data name="groupBox8.Text" xml:space="preserve">
<value>Signal transmission type</value>
......@@ -184,11 +184,26 @@
<value>Default</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>436, 85</value>
<value>530, 85</value>
</data>
<data name="groupBox1.Text" xml:space="preserve">
<value>Third party communication</value>
</data>
<data name="label12.Size" type="System.Drawing.Size, System.Drawing">
<value>29, 12</value>
</data>
<data name="label12.Text" xml:space="preserve">
<value>NMHC</value>
</data>
<data name="comboBox1.Items" xml:space="preserve">
<value>indirect</value>
</data>
<data name="comboBox1.Items1" xml:space="preserve">
<value>direct</value>
</data>
<data name="comboBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>266, 19</value>
</data>
<data name="radioButton5.Size" type="System.Drawing.Size, System.Drawing">
<value>179, 16</value>
</data>
......@@ -211,7 +226,7 @@
<value>25, 208</value>
</data>
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>436, 131</value>
<value>530, 131</value>
</data>
<data name="groupBox2.Text" xml:space="preserve">
<value>External communication protocol</value>
......@@ -244,7 +259,7 @@
<value>57, 20</value>
</data>
<data name="groupBox9.Location" type="System.Drawing.Point, System.Drawing">
<value>296, 36</value>
<value>296, 37</value>
</data>
<data name="groupBox9.Text" xml:space="preserve">
<value>AntiControlSetting</value>
......@@ -256,10 +271,10 @@
<value>Record per minute</value>
</data>
<data name="groupBox7.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 160</value>
<value>22, 161</value>
</data>
<data name="groupBox7.Size" type="System.Drawing.Size, System.Drawing">
<value>256, 47</value>
<value>258, 47</value>
</data>
<data name="groupBox7.Text" xml:space="preserve">
<value>Status record</value>
......@@ -319,10 +334,10 @@
<value>Automatic ignition</value>
</data>
<data name="groupBox6.Location" type="System.Drawing.Point, System.Drawing">
<value>25, 264</value>
<value>25, 265</value>
</data>
<data name="groupBox6.Size" type="System.Drawing.Size, System.Drawing">
<value>583, 98</value>
<value>585, 98</value>
</data>
<data name="groupBox6.Text" xml:space="preserve">
<value>Detecto</value>
......@@ -370,10 +385,10 @@
<value>Save ZB Graph</value>
</data>
<data name="groupBox5.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 213</value>
<value>22, 214</value>
</data>
<data name="groupBox5.Size" type="System.Drawing.Size, System.Drawing">
<value>584, 45</value>
<value>586, 45</value>
</data>
<data name="groupBox5.Text" xml:space="preserve">
<value>Miscellaneous</value>
......@@ -400,22 +415,28 @@
<value>System On</value>
</data>
<data name="groupBox3.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 105</value>
<value>22, 106</value>
</data>
<data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
<value>584, 49</value>
<value>586, 49</value>
</data>
<data name="groupBox3.Text" xml:space="preserve">
<value>Sart up automatically</value>
</data>
<data name="checkBox_Cloud.Size" type="System.Drawing.Size, System.Drawing">
<value>54, 16</value>
</data>
<data name="checkBox_Cloud.Text" xml:space="preserve">
<value>Cloud</value>
</data>
<data name="appstartup.Text" xml:space="preserve">
<value>Autostarts</value>
</data>
<data name="groupBox4.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 36</value>
<value>22, 37</value>
</data>
<data name="groupBox4.Size" type="System.Drawing.Size, System.Drawing">
<value>256, 60</value>
<value>258, 60</value>
</data>
<data name="groupBox4.Text" xml:space="preserve">
<value>Boot configuration</value>
......@@ -454,10 +475,10 @@
<value>Reserved space</value>
</data>
<data name="groupBox11.Location" type="System.Drawing.Point, System.Drawing">
<value>34, 157</value>
<value>34, 158</value>
</data>
<data name="groupBox11.Size" type="System.Drawing.Size, System.Drawing">
<value>569, 67</value>
<value>571, 67</value>
</data>
<data name="groupBox11.Text" xml:space="preserve">
<value>Historical data</value>
......@@ -493,22 +514,22 @@
<value>114, 26</value>
</data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing">
<value>565, 118</value>
<value>567, 118</value>
</data>
<data name="label5.Location" type="System.Drawing.Point, System.Drawing">
<value>566, 78</value>
<value>568, 78</value>
</data>
<data name="label4.Location" type="System.Drawing.Point, System.Drawing">
<value>566, 41</value>
<value>568, 41</value>
</data>
<data name="textBox3.Location" type="System.Drawing.Point, System.Drawing">
<value>394, 109</value>
<value>396, 109</value>
</data>
<data name="textBox2.Location" type="System.Drawing.Point, System.Drawing">
<value>394, 70</value>
<value>396, 70</value>
</data>
<data name="textBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>394, 33</value>
<value>396, 33</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>77, 12</value>
......
GcDevicePc/SysConfigSecondary.resx
View file @ 5587fca6
This diff is collapsed.
GcDevicePc/SysConfigSecondary.zh-Hans.resx 0 → 100644
View file @ 5587fca6
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="groupBox8.Size" type="System.Drawing.Size, System.Drawing">
<value>471, 110</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>474, 81</value>
</data>
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>471, 117</value>
</data>
</root>
\ No newline at end of file
GcDevicePc/SysConfigsecondary.Designer.cs
View file @ 5587fca6
This diff is collapsed.
GcDevicePc/auxtool.cs
View file @ 5587fca6
......@@ -682,11 +682,21 @@ namespace GcDevicePc
else
ToolTip1.Show("TCD reference setting:\nN2 70mA\nAr 100mA\nH2 100mA\nHe 100mA", lab_tcdHelp, 10000);
}
TempTrend temp ;
private void btn_TempTrend_Click(object sender, EventArgs e)
{
TempTrend temp = new TempTrend();
temp.Show();
if (temp==null||temp.IsDisposed)
{
temp = new TempTrend();
temp.Show();
temp.Activate();
}
else
{
temp.Activate();
}
}
#region 云盒子模拟测试,可删除
DataInstance dataInstance;
......
GcDevicePc/auxtool.resx
View file @ 5587fca6
......@@ -822,6 +822,9 @@
<data name="button_CloudBox.Text" xml:space="preserve">
<value>模拟初拟化</value>
</data>
<data name="button_CloudBox.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;button_CloudBox.Name" xml:space="preserve">
<value>button_CloudBox</value>
</data>
......@@ -984,6 +987,9 @@
<data name="comboBox1.Text" xml:space="preserve">
<value>仪器信息</value>
</data>
<data name="comboBox1.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;comboBox1.Name" xml:space="preserve">
<value>comboBox1</value>
</data>
......@@ -1011,6 +1017,9 @@
<data name="button_Send.Text" xml:space="preserve">
<value>发送选择项</value>
</data>
<data name="button_Send.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;button_Send.Name" xml:space="preserve">
<value>button_Send</value>
</data>
......@@ -1035,9 +1044,6 @@
<data name="groupBox2.Text" xml:space="preserve">
<value>调试</value>
</data>
<data name="groupBox2.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;groupBox2.Name" xml:space="preserve">
<value>groupBox2</value>
</data>
......
VocsSetup/GC_Config/GC_CfgBak/GC_DataPro/Calibrationdel_20220321133655.std 0 → 100644
View file @ 5587fca6
[SYSINFO]
ECOUNT=3
[ENTITY0]
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,,0,,1
ECCD0_Orig0=0,uV*sec,0529094515,D:\work\Vocs\VocsSetup\GC_User\原始数据\0529094515.raw
[ENTITY1]
ECC=THC,0,2,0,6.092811E-05,2.535293E-08,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,2,,32825.57,,1
ECCD0_Orig0=32825.57,uV*sec,0529094515,D:\work\Vocs\VocsSetup\GC_User\原始数据\0529094515.raw
[ENTITY2]
ECC=CH4,0,2,0,1.708479E-05,-1.103432E-08,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,1,,58531.58,,1
ECCD0_Orig0=58531.58,uV*sec,0529094515,D:\work\Vocs\VocsSetup\GC_User\原始数据\0529094515.raw
VocsSetup/GC_Config/GC_DataPro/AutoAdjust.ini
View file @ 5587fca6
[SYSINFO]
ECOUNT=3
[ENTITY0]
ECC=NMHC,1,0,0,1
[ENTITY1]
ECC=THC,1,0,0,1
[ENTITY1]
ECC=NMHC,1,0,0,1
[ENTITY2]
ECC=CH4,1,0,0,1
VocsSetup/GC_Config/GC_DataPro/Calibrationdel.std
View file @ 5587fca6
[SYSINFO]
ECOUNT=3
[ENTITY0]
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,,0,,1
ECCD0_Orig0=0,uV*sec,0529094515,D:\work\Vocs\VocsSetup\GC_User\原始数据\0529094515.raw
ECC=THC,0,2,0,0,0,-2147483648,0,0,0,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,30,,0,,1
ECCD0_Orig0=0,uV*sec,0321110304-A,D:\work\色谱\Vocs\VocsSetup\GC_User\原始数据\0321110304-A.raw
[ENTITY1]
ECC=THC,0,2,0,6.092811E-05,2.535293E-08,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,2,,32825.57,,1
ECCD0_Orig0=32825.57,uV*sec,0529094515,D:\work\Vocs\VocsSetup\GC_User\原始数据\0529094515.raw
ECC=NMHC,0,2,0,0.01228547,1.780032E-07,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,10,,813.97,,1
ECCD0_Orig0=813.97,uV*sec,0321110304-A,D:\work\色谱\Vocs\VocsSetup\GC_User\原始数据\0321110304-A.raw
[ENTITY2]
ECC=CH4,0,2,0,1.708479E-05,-1.103432E-08,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,1,,58531.58,,1
ECCD0_Orig0=58531.58,uV*sec,0529094515,D:\work\Vocs\VocsSetup\GC_User\原始数据\0529094515.raw
ECC=CH4,0,2,0,0.009859211,-5.3182E-07,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,20,,2028.56,,1
ECCD0_Orig0=2028.56,uV*sec,0321110304-A,D:\work\色谱\Vocs\VocsSetup\GC_User\原始数据\0321110304-A.raw
VocsSetup/GC_Config/GC_DataPro/Ingredient.ini
View file @ 5587fca6
[SYSINFO]
ECOUNT=64
[ENTITY0]
ID=1
NAME=NMHC
[ENTITY1]
ID=2
NAME=THC
[ENTITY2]
ID=3
NAME=CH4
[ENTITY3]
ID=4
NAME=Benzene
[ENTITY4]
ID=5
NAME=Toluene
[ENTITY5]
ID=6
NAME=Xylene
[ENTITY6]
ID=7
NAME=Acrolein
[ENTITY7]
ID=8
NAME=bimethyl
[ENTITY8]
ID=9
NAME=Ethene
[ENTITY9]
ID=10
NAME=1-Propene
[ENTITY10]
ID=11
NAME=2-methyl-Propane
[ENTITY11]
ID=12
NAME=n-Butane
[ENTITY12]
ID=13
NAME=Acetylene
[ENTITY13]
ID=14
NAME=(E)-2-Butene
[ENTITY14]
ID=15
NAME=1-Butene
[ENTITY15]
ID=16
NAME=(Z)-2-Butene
[ENTITY16]
ID=17
NAME=Cyclopentane
[ENTITY17]
ID=18
NAME=2-Methylbutane
[ENTITY18]
ID=19
NAME=Pentane
[ENTITY19]
ID=20
NAME=TRANS-2-PENTENE
[ENTITY20]
ID=21
NAME=1-Pentene
[ENTITY21]
ID=22
NAME=2-PENTENENITRILE
[ENTITY22]
ID=23
NAME=2,2-Dimethylbutane
[ENTITY23]
ID=24
NAME=2,3-DIMETHYLBUTANE
[ENTITY24]
ID=25
NAME=2-methylpentane
[ENTITY25]
ID=26
NAME=3-METHYLPENTANE
[ENTITY26]
ID=27
NAME=Isoprene
[ENTITY27]
ID=28
NAME=Hexane
[ENTITY28]
ID=29
NAME=1-Hexene
[ENTITY29]
ID=30
NAME=Methylcyclopentane
[ENTITY30]
ID=31
NAME=2,4-DIMETHYLPENTANE
[ENTITY31]
ID=32
NAME=Cyclohexane
[ENTITY32]
ID=33
NAME=ISOHEPTANE
[ENTITY33]
ID=34
NAME=2,3-Dimethylpentane
[ENTITY34]
ID=35
NAME=3-METHYLHEXANE
[ENTITY35]
ID=36
NAME=2,2,4-Trimethylpentane
[ENTITY36]
ID=37
NAME=Heptane
[ENTITY37]
ID=38
NAME=Methylcyclohexane
[ENTITY38]
ID=39
NAME=2,3,4-TRIMETHYLPENTANE
[ENTITY39]
ID=40
NAME=2-METHYLHEPTANE
[ENTITY40]
ID=41
NAME=3-METHYLHEPTANE
[ENTITY41]
ID=42
NAME=N-OCTANE
[ENTITY42]
ID=43
NAME=Styrene
[ENTITY43]
ID=44
NAME=o-Xylene
[ENTITY44]
ID=45
NAME=N-NONANE
[ENTITY45]
ID=46
NAME=Cumene
[ENTITY46]
ID=47
NAME=N-PROPYLBENZENE
[ENTITY47]
ID=48
NAME=3-ETHYLTOLUENE
[ENTITY48]
ID=49
NAME=4-ETHYLTOLUENE
[ENTITY49]
ID=50
NAME=Mesitylene
[ENTITY50]
ID=51
NAME=1,2,4-Trimethylbenzene
[ENTITY51]
ID=52
NAME=1,2,3-Trimethylbenzene
[ENTITY52]
ID=53
NAME=2-ETHYLTOLUENE
[ENTITY53]
ID=54
NAME=Decane
[ENTITY54]
ID=55
NAME=1,3-Diethylbenzene
[ENTITY55]
ID=56
NAME=1,4-DIETHYLBENZENE
[ENTITY56]
ID=57
NAME=n-Hendecane
[ENTITY57]
ID=58
NAME=Dodecane
[ENTITY58]
ID=59
NAME=Default
[ENTITY59]
ID=60
NAME=Oxygen
[ENTITY60]
ID=61
NAME=Propane
[ENTITY61]
ID=62
NAME=m-Xylene
[ENTITY62]
ID=63
NAME=P-XYLENE
[ENTITY63]
ID=64
NAME=Methanol
[ENTITY64]
ID=65
NAME=Ethylbenzene
[ENTITY65]
ID=66
NAME=DIPENTENE
[ENTITY66]
ID=67
NAME=Acetaldehyde
\ No newline at end of file
VocsSetup/GC_Config/GC_DataPro/SpectralDefault.comp
View file @ 5587fca6
......@@ -2,8 +2,8 @@
ECOUNT=3
COEF=1
[ENTITY0]
ETXT=0,NMHC,0,0,0,0,255,0,0,100000,1,0,0
ETXT=0,NMHC,0.04,0.25,0,0,255,0,0,100000,1,0,0
[ENTITY1]
ETXT=0,THC,0.01,0.1,0,0,255,0,0,100000,1,0,0
ETXT=0,THC,0,0,0,0,255,0,0,100000,1,0,0
[ENTITY2]
ETXT=0,CH4,0.1,0.15,0,0,255,0,0,100000,1,0,0
ETXT=0,CH4,0.27,0.4,0,0,255,0,0,100000,1,0,0
VocsSetup/GC_Config/GC_Set/Startup/startup.ini
View file @ 5587fca6
[NetWorkConfig]
MAC地址=F8:02:78:60:74:58
网口=以太网 2
MAC地址=F8:02:78:60:70:76
网口=WLAN
搜索时间=60
[StartUp]
自启动=0
......@@ -11,6 +11,7 @@ space=500
Datetime=1
TdName=TVOC5.7
开机界面=1
启用云盒子=1
[DataFolder]
历史数据=D:\work\Vocs\VocsSetup\GC_Config\GC_Set\Historical Data
分级文件夹=0
......@@ -26,7 +27,7 @@ Name=admin
Password=123456
[SendData]
Thirdparty=1
Foreign=2
Foreign=1
SendType=Routine
[SaveData]
ZBSaveData=1
......@@ -37,3 +38,5 @@ ZBSaveData=1
反控模式=被控
反控进程名称=SmartSampler
开始停止触发=触发开始和停止
[NMHC]
测定方式=直测
VocsSetup/GC_Config/GC_Set/Startup/sys.ini
View file @ 5587fca6
......@@ -8,11 +8,12 @@ Count3=FALSE
[O2CpdCount]
O2value=21
[免登录]
锚点日期=2022/3/9
锚点日期=2022/3/22
勾选类型=2
[TempTrend]
启用网格X=FALSE
启用网格Y=FALSE
显示节点数据=FALSE
显示节点数据=TRUE
背景颜色=White
上次加载数据=
跟随分析启动=1
VocsSetup/GC_Config/GC_Set/tmpfile/58/DevStatus.iniᯘʾ纐¹ deleted 100644 → 0
View file @ 1961b0e8
Binary files "a/VocsSetup/GC_Config/GC_Set/tmpfile/58/DevStatus.ini\341\257\230\312\276\347\272\220\302\271" and /dev/null differ
dll/CKVocAlgorithm.dll
View file @ 5587fca6
No preview for this file type
dll/CKVocAnalyzer.dll
View file @ 5587fca6
No preview for this file type
dll/WindowsFormsControlLibrary_PopUp/Properties/AssemblyInfo.cs 0 → 100644
View file @ 5587fca6
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("WindowsFormsControlLibrary_PopUp")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("WindowsFormsControlLibrary_PopUp")]
[assembly: AssemblyCopyright("Copyright © 2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// 将 ComVisible 设置为 false 会使此程序集中的类型
//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
//请将此类型的 ComVisible 特性设置为 true。
[assembly: ComVisible(false)]
// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
[assembly: Guid("afc4ddc8-d40d-481e-ae7a-5afb73c88e78")]
// 程序集的版本信息由下列四个值组成:
//
// 主版本
// 次版本
// 生成号
// 修订号
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
dll/WindowsFormsControlLibrary_PopUp/UserControl_PopUp.Designer.cs 0 → 100644
View file @ 5587fca6
namespace WindowsFormsControlLibrary_PopUp
{
partial class UserControl_PopUp
{
/// <summary>
/// 必需的设计器变量。
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// 清理所有正在使用的资源。
/// </summary>
/// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region 组件设计器生成的代码
/// <summary>
/// 设计器支持所需的方法 - 不要修改
/// 使用代码编辑器修改此方法的内容。
/// </summary>
private void InitializeComponent()
{
this.lab_Close = new System.Windows.Forms.Label();
this.label_Suggerimenti = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer();
this.SuspendLayout();
//
// lab_Close
//
this.lab_Close.AutoSize = true;
this.lab_Close.BackColor = System.Drawing.Color.Transparent;
this.lab_Close.Dock = System.Windows.Forms.DockStyle.Top;
this.lab_Close.Location = new System.Drawing.Point(0, 0);
this.lab_Close.Name = "lab_Close";
this.lab_Close.Size = new System.Drawing.Size(53, 12);
this.lab_Close.TabIndex = 2;
this.lab_Close.Text = "我知道了";
this.lab_Close.Click += new System.EventHandler(this.lab_Close_Click);
//
// label_Suggerimenti
//
this.label_Suggerimenti.AutoSize = true;
this.label_Suggerimenti.BackColor = System.Drawing.Color.Transparent;
this.label_Suggerimenti.Location = new System.Drawing.Point(19, 27);
this.label_Suggerimenti.Name = "label_Suggerimenti";
this.label_Suggerimenti.Size = new System.Drawing.Size(23, 12);
this.label_Suggerimenti.TabIndex = 3;
this.label_Suggerimenti.Text = "cs2";
//
// timer1
//
this.timer1.Interval = 5000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// UserControl_PopUp
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
this.Controls.Add(this.label_Suggerimenti);
this.Controls.Add(this.lab_Close);
this.Name = "UserControl_PopUp";
this.Size = new System.Drawing.Size(251, 70);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Label label_Suggerimenti;
public System.Windows.Forms.Label lab_Close;
private System.Windows.Forms.Timer timer1;
}
}
dll/WindowsFormsControlLibrary_PopUp/UserControl_PopUp.cs 0 → 100644
View file @ 5587fca6
This diff is collapsed.
dll/WindowsFormsControlLibrary_PopUp/UserControl_PopUp.resx 0 → 100644
View file @ 5587fca6
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment