Skip to content

G
GC_Branch
Commit 5c4fe95d authored by liu's avatar liu
Browse files
Options

修改校准部分添加自定义校准公式，修改状态对应等

parent f6ca5940
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 62566 additions and 652 deletions
GcDevicePc/AboutForm.cs
View file @ 5c4fe95d
......@@ -42,7 +42,7 @@ namespace GcDevicePc
this.fid1ver.Text = this.FID1version;
this.fid2ver.Text = this.FID2version;
this.tcdver.Text = this.TCD1version;
this.PCver.Text = this.Hmiversion + "/1.5.9";
this.PCver.Text = this.Hmiversion + "/1.6.1";
}
}
}
GcDevicePc/AppInit.cs
View file @ 5c4fe95d
......@@ -460,6 +460,113 @@ namespace GcDevicePc
}
}
public void InitFileCompleteness()
{
try
{
string file = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.StartupPath), "GC_Config\\GC_Set\\启动参数\\startup.ini");
if (File.Exists(file))
{
IniFile ini = new IniFile(file);
int opensys = ini.ReadInteger("StartUp", "打开系统");
int runtype = ini.ReadInteger("StartUp", "运行类型");
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.DataFolder = ini.ReadString("DataFolder", "历史数据");
int Version = ini.ReadInteger("Version", "VersionType");
string uname = ini.ReadString("User", "Name");
string upwd = ini.ReadString("User", "Password");
int dsf = ini.ReadInteger("SendData", "Thirdparty");
int dw = ini.ReadInteger("SendData", "Foreign");
int sdzb = ini.ReadInteger("SaveData", "ZBSaveData");
string apname = ini.ReadString("Version", "AppName");
int fi = ini.ReadInteger("StartUp", "Forceintegral");
string unit = ini.ReadString("StartUp", "Unit");
globaldata.UserName = uname;
globaldata.UserPwd = upwd;
globaldata.CurrentVersion = Version;
globaldata.Foreign = dw;
globaldata.ZbDataSave = sdzb == 0 ? false : true;
globaldata.AppName = apname;
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.hmimac = ini.ReadString("NetWorkConfig", "MAC地址");
CKVocAnalyzer.GlobalCKV.vocAlgorithm.Forceintegral = fi == 1 ? true : false;
if (opensys == 1)
{
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType = (ushort)runtype;
}
else
{
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType = 0;
}
if (dsf == 0)
{
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw = true;
}
else if (dsf == 1)
{
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtoZb = true;
}
else if (dsf == 2)
{
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtoSP = true;
}
else
{
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw = false;
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtoZb = false;
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtoSP = false;
}
string info_log = ini.ReadString("Logs", "InfoLog");
string err_log = ini.ReadString("Logs", "ErrLog");
string hmi_log = ini.ReadString("Logs", "HmiLog");
string gc485 = ini.ReadString("GC485", "COM");
if (!String.IsNullOrEmpty(gc485))
{
globaldata.m_pcbuffer.gcpcinfo.outputinfo.port = Convert.ToByte(gc485);
}
if (!String.IsNullOrEmpty(info_log))
{
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.info_log = info_log.Equals("1") ? true : false;
}
if (!String.IsNullOrEmpty(err_log))
{
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.error_log = err_log.Equals("1") ? true : false;
}
if (!String.IsNullOrEmpty(hmi_log))
{
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.hmi_log = hmi_log.Equals("1") ? true : false;
}
}
else
{
//globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType = 0;
//globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw = false;
//globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtoZb = false;
//globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtoSP = false;
//globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.DataFolder = null;
}
}
catch (Exception e)
{
Log.Error(e.Message);
}
}
#region
/// <summary>
/// 创建本地必要目录
......
GcDevicePc/CK_UI/LandIn.cs
View file @ 5c4fe95d
......@@ -12,7 +12,7 @@ namespace GcDevicePc.CK_UI
public partial class LandIn : Form
{
private string user = globaldata.UserName;
private string superuser = "superadmin";
private string superuser = "admin17";
public static bool Island = false;
public static bool Issa = false;
private string dt;
......@@ -39,7 +39,7 @@ namespace GcDevicePc.CK_UI
Island = false;
}
if (textBox1.Text == superuser&& textBox2.Text == "tt62436458")
if (textBox1.Text == superuser&& textBox2.Text == "62436458")
{
Island = true;
Issa = true;
......
GcDevicePc/CK_UI/UserCtl.Designer.cs
View file @ 5c4fe95d
......@@ -44,6 +44,7 @@
this.label1 = new System.Windows.Forms.Label();
this.textBox2 = new System.Windows.Forms.TextBox();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
......@@ -68,7 +69,7 @@
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(7, 39);
this.label2.Location = new System.Drawing.Point(7, 47);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(114, 20);
this.label2.TabIndex = 2;
......@@ -78,7 +79,7 @@
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.Location = new System.Drawing.Point(42, 102);
this.label3.Location = new System.Drawing.Point(42, 110);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(54, 21);
this.label3.TabIndex = 3;
......@@ -88,7 +89,7 @@
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.Location = new System.Drawing.Point(42, 167);
this.label4.Location = new System.Drawing.Point(42, 175);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(54, 21);
this.label4.TabIndex = 4;
......@@ -98,7 +99,7 @@
//
this.textBox1.BackColor = System.Drawing.SystemColors.Window;
this.textBox1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox1.Location = new System.Drawing.Point(6, 67);
this.textBox1.Location = new System.Drawing.Point(6, 75);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(116, 29);
this.textBox1.TabIndex = 5;
......@@ -106,7 +107,7 @@
// textBox3
//
this.textBox3.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox3.Location = new System.Drawing.Point(6, 194);
this.textBox3.Location = new System.Drawing.Point(6, 202);
this.textBox3.Name = "textBox3";
this.textBox3.Size = new System.Drawing.Size(116, 29);
this.textBox3.TabIndex = 7;
......@@ -114,6 +115,7 @@
// groupBox1
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.comboBox1);
this.groupBox1.Controls.Add(this.textBox6);
this.groupBox1.Controls.Add(this.label6);
this.groupBox1.Controls.Add(this.textBox5);
......@@ -137,7 +139,7 @@
// textBox6
//
this.textBox6.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox6.Location = new System.Drawing.Point(6, 376);
this.textBox6.Location = new System.Drawing.Point(6, 384);
this.textBox6.Name = "textBox6";
this.textBox6.Size = new System.Drawing.Size(116, 29);
this.textBox6.TabIndex = 14;
......@@ -146,7 +148,7 @@
//
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.Location = new System.Drawing.Point(30, 352);
this.label6.Location = new System.Drawing.Point(30, 360);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(76, 21);
this.label6.TabIndex = 13;
......@@ -155,7 +157,7 @@
// textBox5
//
this.textBox5.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox5.Location = new System.Drawing.Point(6, 316);
this.textBox5.Location = new System.Drawing.Point(6, 324);
this.textBox5.Name = "textBox5";
this.textBox5.Size = new System.Drawing.Size(116, 29);
this.textBox5.TabIndex = 12;
......@@ -164,7 +166,7 @@
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.Location = new System.Drawing.Point(38, 290);
this.label5.Location = new System.Drawing.Point(38, 298);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(54, 21);
this.label5.TabIndex = 11;
......@@ -173,7 +175,7 @@
// textBox4
//
this.textBox4.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox4.Location = new System.Drawing.Point(6, 255);
this.textBox4.Location = new System.Drawing.Point(6, 263);
this.textBox4.Name = "textBox4";
this.textBox4.Size = new System.Drawing.Size(116, 29);
this.textBox4.TabIndex = 10;
......@@ -182,7 +184,7 @@
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(46, 231);
this.label1.Location = new System.Drawing.Point(46, 239);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(32, 21);
this.label1.TabIndex = 9;
......@@ -191,7 +193,7 @@
// textBox2
//
this.textBox2.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox2.Location = new System.Drawing.Point(6, 131);
this.textBox2.Location = new System.Drawing.Point(6, 139);
this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(116, 29);
this.textBox2.TabIndex = 6;
......@@ -202,6 +204,15 @@
this.timer1.Interval = 60000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// comboBox1
//
this.comboBox1.FormattingEnabled = true;
this.comboBox1.Location = new System.Drawing.Point(6, 20);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(116, 24);
this.comboBox1.TabIndex = 15;
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.ComboBox1_SelectedIndexChanged);
//
// UserCtl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......@@ -234,5 +245,6 @@
private System.Windows.Forms.TextBox textBox4;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox textBox2;
private System.Windows.Forms.ComboBox comboBox1;
}
}
GcDevicePc/CK_UI/UserCtl.cs
View file @ 5c4fe95d
......@@ -57,7 +57,16 @@ namespace GcDevicePc.CK_UI
try
{
Systemtype = CKVocAnalyzer.GlobalCKV.Systemtype;
if (CKVocAnalyzer.GlobalCKV.cpdExpressions != null)
{
List<string> s = CKVocAnalyzer.GlobalCKV.cpdExpressions.GroupBy(x => x.OUnit).Select(y => y.Key).ToList();
foreach (string item in s)
{
comboBox1.Items.Add(item);
}
comboBox1.SelectedIndex = 0;
}
isppm = false;
groupBox1.Text = "结果浓度";
switch (Systemtype)
......@@ -637,23 +646,42 @@ namespace GcDevicePc.CK_UI
listTHC.Clear();
for (int i = 0; i < sql.ReturnData.Count; ++i)
{
List<CKVocAnalyzer.CompoundExpression> cpde = CKVocAnalyzer.GlobalCKV.cpdExpressions.Where(s => s.Name == sql.ReturnData[i].name&& s.OUnit == unti).ToList();
double times = (double)new XDate(Convert.ToDateTime(sql.ReturnData[i].Time));
int indexTWO = CKVocAnalyzer.GlobalCKV.adjustTwo.FindIndex(s => s.name == sql.ReturnData[i].name);
double v = 0;
if (cpde != null && cpde.Count > 0)
{
v = CKVocAnalyzer.Utility.Calculation(cpde[0].OExpression, sql.ReturnData[i].value);
}
else
{
v = sql.ReturnData[i].value;
}
if (indexTWO > -1)
{
v = v * CKVocAnalyzer.GlobalCKV.adjustTwo[indexTWO].BValue + CKVocAnalyzer.GlobalCKV.adjustTwo[indexTWO].CValue;
}
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;
//double times = (double)new XDate(Convert.ToDateTime(sql.ReturnData[i].Time));
//v = sql.ReturnData[i].value;
listNmoc.Add(times,v);
}
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);
//double times1 = (double)new XDate(Convert.ToDateTime(sql.ReturnData[i].Time));
//double v1 = sql.ReturnData[i].value;
listTHC.Add(times, v);
}
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;
listCH4.Add(times2, v2);
//double times2 = (double)new XDate(Convert.ToDateTime(sql.ReturnData[i].Time));
//double v2 = sql.ReturnData[i].value;
listCH4.Add(times, v);
}
}
......@@ -736,6 +764,23 @@ namespace GcDevicePc.CK_UI
{
try
{
if (CKVocAnalyzer.GlobalCKV.cpdExpressions != null)
{
int cmbindex = comboBox1.SelectedIndex;
comboBox1.Items.Clear();
List<string> s = CKVocAnalyzer.GlobalCKV.cpdExpressions.GroupBy(x => x.OUnit).Select(y => y.Key).ToList();
foreach (string item in s)
{
comboBox1.Items.Add(item);
}
if (comboBox1.Items.Count > 0)
{
comboBox1.SelectedIndex = cmbindex;
}
}
switch (Systemtype)
{
default: //非甲烷总烃
......@@ -760,6 +805,16 @@ namespace GcDevicePc.CK_UI
}
string unti;
private void ComboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
unti = comboBox1.Text;
data();
datadisp();
UIVisible(false);
}
//private void textBox1_DoubleClick(object sender, EventArgs e)
//{
// isppm = !isppm;
......
GcDevicePc/Common/NModbusSlave.cs
View file @ 5c4fe95d
......@@ -618,40 +618,6 @@ namespace GcDevicePc.Common
public static void executefuncation()
{
//if (globaldata.m_hmibuffer.gcadjust.funrun==1)
//{
// switch (globaldata.m_hmibuffer.gcadjust.executefun)
// {
// case 0x02:
// case 0x03:
// case 0x00:
// CKVocAnalyzer.AutoAdjust.Af_Option = CKVocAnalyzer.AutoAdjust.AdjustFromSet.AF_Ling;
// break;
// case 0x0A:
// case 0x0E:
// case 0x0B:
// case 0x0F:
// case 0x08:
// case 0x0C:
// CKVocAnalyzer.AutoAdjust.Af_Option = CKVocAnalyzer.AutoAdjust.AdjustFromSet.AF_Xiao;
// break;
// case 0x06:
// case 0x07:
// case 0x04:
// CKVocAnalyzer.AutoAdjust.Af_Option = CKVocAnalyzer.AutoAdjust.AdjustFromSet.AF_Biao;
// break;
// default:
// CKVocAnalyzer.AutoAdjust.Af_Option = CKVocAnalyzer.AutoAdjust.AdjustFromSet.AF_Default;
// break;
// }
//}
//else
//{
// CKVocAnalyzer.AutoAdjust.Af_Option = CKVocAnalyzer.AutoAdjust.AdjustFromSet.AF_fang;
//}
switch (globaldata.m_hmibuffer.gcadjust.funrun)
{
case 1:
......@@ -769,10 +735,35 @@ namespace GcDevicePc.Common
{
if (address < 6 && listnum>0)
{
int index = -1;
if (address == 0 || address == 1)
{
index = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "NMHC");
}
if (address == 2 || address == 3)
{
index = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "THC");
}
if (address == 4 || address == 5)
{
index = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "CH4");
}
int readnum = (address - baseaddress) / 2;
if (readnum <= listnum - 1)
{
f[0] = float.Parse(SharedSpace.Data.listValue[readnum].vale.ToString());
if (index >-1)
{
f[0] = float.Parse(SharedSpace.Data.listValue[index].vale.ToString());
}
else
{
f[0] = 0;
}
Buffer.BlockCopy(f, 2, s, 0, 2);
Buffer.BlockCopy(f, 0, s, 2, 2);
value = s[(address - baseaddress) % 2];
......@@ -781,6 +772,7 @@ namespace GcDevicePc.Common
{
value = 0;
}
}
else
{
......
GcDevicePc/ConfigMethod/AuxTabs.cs
View file @ 5c4fe95d
......@@ -78,13 +78,13 @@ namespace GcDevicePc.ConfigMethod
m_iPPIP[0].TopLevel = false;
m_iPPIP[0].Show();
tabControlDet.TabPages[index].Controls.Add(m_iPPIP[0]);
m_iPPIP[0].freflashContent(0);
m_iPPIP[0].freflashContent(type);
break;
case 1:
m_iPPIP[1].TopLevel = false;
m_iPPIP[1].Show();
tabControlDet.TabPages[index].Controls.Add(m_iPPIP[1]);
m_iPPIP[1].freflashContent(1);
m_iPPIP[1].freflashContent(type);
break;
//case 2:
// m_iPPIP[0].TopLevel = false;
......
GcDevicePc/ConfigMethod/FID.Designer.cs
View file @ 5c4fe95d
......@@ -272,6 +272,7 @@
this.cBox加热器.TabIndex = 1;
this.cBox加热器.Text = "加热器";
this.cBox加热器.UseVisualStyleBackColor = true;
this.cBox加热器.Visible = false;
//
// label16
//
......
GcDevicePc/ConfigMethod/FID.cs
View file @ 5c4fe95d
......@@ -100,10 +100,10 @@ namespace GcDevicePc.ConfigMethod
else
cBox自动调零.CheckState = CheckState.Unchecked;
if (this.methodconfig.fid[index].u16KeyHeater == 1)
cBox加热器.CheckState = CheckState.Checked;
else
cBox加热器.CheckState = CheckState.Unchecked;
//if (this.methodconfig.fid[index].u16KeyHeater == 1)
// cBox加热器.CheckState = CheckState.Checked;
//else
// cBox加热器.CheckState = CheckState.Unchecked;
......@@ -154,10 +154,10 @@ namespace GcDevicePc.ConfigMethod
else
this.methodconfig.fid[index].u16Zero = 0;
if (cBox加热器.CheckState == CheckState.Checked)
this.methodconfig.fid[index].u16KeyHeater = 1;
else
this.methodconfig.fid[index].u16KeyHeater = 0;
//if (cBox加热器.CheckState == CheckState.Checked)
this.methodconfig.fid[index].u16KeyHeater = 1;
//else
// this.methodconfig.fid[index].u16KeyHeater = 0;
if (cBox氢气.CheckState == CheckState.Checked)
this.methodconfig.fid[index].u16KeyH2Flow = 1;
......
GcDevicePc/ConfigMethod/TCD.Designer.cs
View file @ 5c4fe95d
......@@ -177,6 +177,7 @@
this.cBox加热器.TabIndex = 1;
this.cBox加热器.Text = "加热器";
this.cBox加热器.UseVisualStyleBackColor = true;
this.cBox加热器.Visible = false;
//
// label描述
//
......
GcDevicePc/ConfigMethod/TCD.cs
View file @ 5c4fe95d
......@@ -102,14 +102,14 @@ namespace GcDevicePc.ConfigMethod
// cBox调零.CheckState = CheckState.Unchecked;
//}
if (this.methodconfig.tcd[index].u16HeaterSel == 1)
{
cBox加热器.CheckState = CheckState.Checked;
}
else
{
cBox加热器.CheckState = CheckState.Unchecked;
}
//if (this.methodconfig.tcd[index].u16HeaterSel == 1)
//{
// cBox加热器.CheckState = CheckState.Checked;
//}
//else
//{
// cBox加热器.CheckState = CheckState.Unchecked;
//}
......@@ -148,7 +148,7 @@ namespace GcDevicePc.ConfigMethod
this.methodconfig.tcd[index].u16Polarity = cb极性.SelectedIndex == 0 ? (ushort)0 : (ushort)1;
//this.methodconfig.tcd[index].u16AutoZeroSet = cBox调零.CheckState == CheckState.Checked ? (ushort)1 : (ushort)0;
this.methodconfig.tcd[index].u16HeaterSel = cBox加热器.CheckState == CheckState.Checked ? (ushort)1 : (ushort)0;
this.methodconfig.tcd[index].u16HeaterSel = 1;
this.methodconfig.tcd[index].u16TaiGasSel = cBox参比气流.CheckState == CheckState.Checked ? (ushort)1 : (ushort)0;
//this.methodconfig.tcd[index].u16AutoZeroSet = cBox调零.CheckState == CheckState.Checked ? (ushort)1 : (ushort)0;
......
GcDevicePc/ConfigMethod/injectionport/IPPIP.Designer.cs
View file @ 5c4fe95d
......@@ -81,6 +81,7 @@
this.cbHeater.TabIndex = 3;
this.cbHeater.Text = "加热器";
this.cbHeater.UseVisualStyleBackColor = true;
this.cbHeater.Visible = false;
//
// txtHeater
//
......@@ -97,9 +98,8 @@
this.lblSamplePortType.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblSamplePortType.Location = new System.Drawing.Point(137, 34);
this.lblSamplePortType.Name = "lblSamplePortType";
this.lblSamplePortType.Size = new System.Drawing.Size(55, 15);
this.lblSamplePortType.Size = new System.Drawing.Size(0, 15);
this.lblSamplePortType.TabIndex = 5;
this.lblSamplePortType.Text = "label4";
//
// txtFlow
//
......@@ -193,7 +193,7 @@
//
this.label21.AutoSize = true;
this.label21.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label21.Location = new System.Drawing.Point(41, 64);
this.label21.Location = new System.Drawing.Point(37, 64);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(97, 15);
this.label21.TabIndex = 28;
......
GcDevicePc/ConfigMethod/injectionport/IPPIP.cs
View file @ 5c4fe95d
......@@ -78,10 +78,10 @@ namespace GcDevicePc.ConfigMethod.injectionport
{
}
if (this.methodconfig.port[index].Heater == 1)
cbHeater.CheckState = CheckState.Checked;
else
cbHeater.CheckState = CheckState.Unchecked;
//if (this.methodconfig.port[index].Heater == 1)
// cbHeater.CheckState = CheckState.Checked;
//else
// cbHeater.CheckState = CheckState.Unchecked;
//if (this.methodconfig.port[index].pipSeptumBlowFlow == 1)
// cbSeptumBlowingflow.CheckState = CheckState.Checked;
......@@ -197,60 +197,57 @@ namespace GcDevicePc.ConfigMethod.injectionport
/// <param name="v"></param>
public void freflashContent(int index)
{
this.methodconfig.GetDevAuxs();
label1.Text = "辅助名：";
label21.Text = "辅助载气类型：";
switch (index)
{
case 0:
configTemp = globaldata.m_hwconfig.hwconfiginfo.u16AuxHeaterPTemp1;
break;
case 1:
configTemp = globaldata.m_hwconfig.hwconfiginfo.u16AuxHeaterPTemp2;
break;
default:
break;
}
if (this.hwconfig.hwconfiginfo.u16StartType == 1 || this.hwconfig.hwconfiginfo.u16StartType == 3)
if (this.hwconfig.hwconfiginfo.u16AuxHeaterNum >= 1)
{
txtFlow.Text = this.methodconfig.auxs[index].pipFlowActual.ToString();
txtPressure.Text = this.methodconfig.auxs[index].pipPressureActual.ToString();
txtSeptumBlowingflow.Text = this.methodconfig.auxs[index].pipSeptumBlowFlowActual.ToString();
this.methodconfig.GetDevAuxs();
switch (index)
{
case 0:
configTemp = globaldata.m_hwconfig.hwconfiginfo.u16AuxHeaterPTemp1;
break;
case 1:
configTemp = globaldata.m_hwconfig.hwconfiginfo.u16AuxHeaterPTemp2;
break;
default:
break;
}
if (this.hwconfig.hwconfiginfo.u16StartType == 1 || this.hwconfig.hwconfiginfo.u16StartType == 3)
{
txtFlow.Text = this.methodconfig.auxs[index].pipFlowActual.ToString();
txtPressure.Text = this.methodconfig.auxs[index].pipPressureActual.ToString();
txtSeptumBlowingflow.Text = this.methodconfig.auxs[index].pipSeptumBlowFlowActual.ToString();
}
else
{
txtFlow.Enabled = false;
txtPressure.Enabled = false;
txtSeptumBlowingflow.Enabled = false;
}
textBox1.Text = configTemp.ToString();
txtHeater.Text = this.methodconfig.auxs[index].HeaterTmpActual.ToString();
lblSamplePortType.Text = (index == 0 ? this.hwconfig.hwconfiginfo.u16AuxHeaterName1 : this.hwconfig.hwconfiginfo.u16AuxHeaterName2);
combSampleCarrierGas.SelectedIndex = this.methodconfig.auxs[index].CarrierGasType;
}
else
{
txtFlow.Enabled = false;
txtPressure.Enabled = false;
txtSeptumBlowingflow.Enabled = false;
}
textBox1.Enabled = false;
txtHeater.Enabled = false;
lblSamplePortType.Enabled = false;
combSampleCarrierGas.Enabled = false;
textBox1.Text = configTemp.ToString();
//txtFlow.Text = this.methodconfig.auxs[index].pipFlowActual.ToString();
txtHeater.Text = this.methodconfig.auxs[index].HeaterTmpActual.ToString();
//txtPressure.Text = this.methodconfig.auxs[index].pipPressureActual.ToString();
lblSamplePortType.Text = (index == 0 ? this.hwconfig.hwconfiginfo.u16AuxHeaterName1 : this.hwconfig.hwconfiginfo.u16AuxHeaterName2);
//txtSeptumBlowingflow.Text = this.methodconfig.auxs[index].pipSeptumBlowFlowActual.ToString();
//txtSampleProtecttemp.Text = this.methodconfig.auxs[index].Protecttemp.ToString();
//combControlMode.SelectedIndex = this.methodconfig.auxs[index].ControlMode;
combSampleCarrierGas.SelectedIndex = this.methodconfig.auxs[index].CarrierGasType;
if (this.methodconfig.auxs[index].Heater == 1)
cbHeater.CheckState = CheckState.Checked;
else
cbHeater.CheckState = CheckState.Unchecked;
}
//if (this.methodconfig.auxs[index].pipSeptumBlowFlow == 1)
// cbSeptumBlowingflow.CheckState = CheckState.Checked;
//else
// cbSeptumBlowingflow.CheckState = CheckState.Unchecked;
//txtPressure.Enabled = combControlMode.SelectedIndex == 0 ? true : false;
//txtFlow.Enabled = combControlMode.SelectedIndex == 1 ? true : false;
}
/// <summary>
/// 辅助设置
......@@ -258,6 +255,7 @@ namespace GcDevicePc.ConfigMethod.injectionport
/// <param name="v"></param>
public void frecordCurData(int index)
{
this.methodconfig.auxs[index].pipFlowSet = string2float(txtFlow.Text);
this.methodconfig.auxs[index].HeaterTmpSet = string2float(txtHeater.Text);
this.methodconfig.auxs[index].pipPressureSet = string2float(txtPressure.Text);
......@@ -267,10 +265,10 @@ namespace GcDevicePc.ConfigMethod.injectionport
//this.methodconfig.auxs[index].Protecttemp =
if (cbHeater.CheckState == CheckState.Checked)
this.methodconfig.auxs[index].Heater = 1;
else
this.methodconfig.auxs[index].Heater = 0;
//if (cbHeater.CheckState == CheckState.Checked)
this.methodconfig.auxs[index].Heater = 1;
//else
// this.methodconfig.auxs[index].Heater = 0;
//if (cbSeptumBlowingflow.CheckState == CheckState.Checked)
// this.methodconfig.auxs[index].pipSeptumBlowFlow = 1;
......@@ -314,10 +312,10 @@ namespace GcDevicePc.ConfigMethod.injectionport
this.methodconfig.port[index].SamplePortType = "0";
this.methodconfig.port[index].CarrierGasType = (ushort)combSampleCarrierGas.SelectedIndex;
if (cbHeater.CheckState == CheckState.Checked)
this.methodconfig.port[index].Heater = 1;
else
this.methodconfig.port[index].Heater = 0;
//if (cbHeater.CheckState == CheckState.Checked)
this.methodconfig.port[index].Heater = 1;
//else
// this.methodconfig.port[index].Heater = 0;
//if (cbSeptumBlowingflow.CheckState == CheckState.Checked)
// this.methodconfig.port[index].pipSeptumBlowFlow = 1;
......
GcDevicePc/DataState.cs
View file @ 5c4fe95d
......@@ -1141,7 +1141,7 @@ namespace GcDevicePc
//errinfo = null;
if (globaldata.m_hmibuffer.gcinfo.HmiAbnormal[0] != 0 || globaldata.m_hmibuffer.gcinfo.HmiAbnormal[1] != 0 || globaldata.m_hmibuffer.gcinfo.HmiAbnormal[2] != 0)
if (globaldata.m_hmibuffer.gcinfo.HmiAbnormal[0] != 0 || globaldata.m_hmibuffer.gcinfo.HmiAbnormal[1] != 0 || globaldata.m_hmibuffer.gcinfo.HmiAbnormal[2] != 0 || globaldata.m_hmibuffer.gcinfo.HmiAbnormal[3] != 0)
{
tempshow = new ListViewItem();
tempshow.Text = "异常";
......@@ -1152,7 +1152,7 @@ namespace GcDevicePc
if (globaldata.m_hmibuffer.gcinfo.HmiAbnormal[0] != 0)
{
tempshow = new ListViewItem();
tempshow.Text = "温度异常";
tempshow.Text = "异常代码";
tempshow.SubItems.Add("XA00" + globaldata.m_hmibuffer.gcinfo.HmiAbnormal[0].ToString());
tempshow.BackColor = Color.LightYellow;
this.datalist.Items.Add(tempshow);
......@@ -1164,14 +1164,38 @@ namespace GcDevicePc
tempshow.BackColor = Color.LightYellow;
this.datalist.Items.Add(tempshow);
}
if (globaldata.m_hmibuffer.gcinfo.HmiAbnormal[3] != 0)
{
tempshow = new ListViewItem();
tempshow.Text = "";
tempshow.SubItems.Add("XD00" + globaldata.m_hmibuffer.gcinfo.HmiAbnormal[3].ToString());
tempshow.BackColor = Color.LightYellow;
this.datalist.Items.Add(tempshow);
}
}
else if (globaldata.m_hmibuffer.gcinfo.HmiAbnormal[1] != 0)
{
tempshow = new ListViewItem();
tempshow.Text = "温度异常";
tempshow.Text = "异常代码";
tempshow.SubItems.Add("XB00" + globaldata.m_hmibuffer.gcinfo.HmiAbnormal[1].ToString());
tempshow.BackColor = Color.LightYellow;
this.datalist.Items.Add(tempshow);
if (globaldata.m_hmibuffer.gcinfo.HmiAbnormal[3] != 0)
{
tempshow = new ListViewItem();
tempshow.Text = "";
tempshow.SubItems.Add("XD00" + globaldata.m_hmibuffer.gcinfo.HmiAbnormal[3].ToString());
tempshow.BackColor = Color.LightYellow;
this.datalist.Items.Add(tempshow);
}
}
else if (globaldata.m_hmibuffer.gcinfo.HmiAbnormal[3] != 0)
{
tempshow = new ListViewItem();
tempshow.Text = "异常代码";
tempshow.SubItems.Add("XD00" + globaldata.m_hmibuffer.gcinfo.HmiAbnormal[3].ToString());
tempshow.BackColor = Color.LightYellow;
this.datalist.Items.Add(tempshow);
}
if (globaldata.m_hmibuffer.gcinfo.HmiAbnormal[2] != 0)
......@@ -2189,11 +2213,11 @@ namespace GcDevicePc
tempshow = new ListViewItem();
tempshow.Text = GettempName("前进样口");
tempshow.SubItems.Add(Getpower(globaldata.m_dpbuffer.ShowList.pwmInfo.fSPower));
tempshow.SubItems.Add(Getpower(globaldata.m_dpbuffer.ShowList.pwmInfo.bSPower));
this.datalist.Items.Add(tempshow);
tempshow = new ListViewItem();
tempshow.Text = GettempName("后进样口");
tempshow.SubItems.Add(Getpower(globaldata.m_dpbuffer.ShowList.pwmInfo.bSPower));
tempshow.SubItems.Add(Getpower(globaldata.m_dpbuffer.ShowList.pwmInfo.fSPower));
this.datalist.Items.Add(tempshow);
tempshow = new ListViewItem();
tempshow.Text = GettempName("柱箱功率");
......
GcDevicePc/DeviceConfigUI/ConfigDevice.Designer.cs
View file @ 5c4fe95d
......@@ -144,6 +144,7 @@
this.resetbtn.TabIndex = 3;
this.resetbtn.Text = "重置";
this.resetbtn.UseVisualStyleBackColor = true;
this.resetbtn.Visible = false;
this.resetbtn.Click += new System.EventHandler(this.resetbtn_Click);
//
// savebtn
......@@ -164,6 +165,7 @@
this.button5.TabIndex = 5;
this.button5.Text = "取消";
this.button5.UseVisualStyleBackColor = true;
this.button5.Click += new System.EventHandler(this.Button5_Click);
//
// updateHMIbtn
//
......
GcDevicePc/DeviceConfigUI/ConfigDevice.cs
View file @ 5c4fe95d
......@@ -413,6 +413,7 @@ namespace GcDevicePc.DeviceConfigUI
catch
{
}
MessageBox.Show("更新配置成功！");
this.Close();
}
else
......@@ -479,6 +480,11 @@ namespace GcDevicePc.DeviceConfigUI
}
}
private void Button5_Click(object sender, EventArgs e)
{
this.Close();
}
}
}
GcDevicePc/FormUser.cs
View file @ 5c4fe95d
......@@ -11,6 +11,7 @@ using System.Diagnostics;
namespace GcDevicePc
{
public delegate void Fireport(int flag,ushort futime,ushort hvtime); //点火委托
public delegate void ReallyAdjust(int flag); //点火委托
public partial class FormUser : Form
{
public FormUser()
......@@ -61,6 +62,7 @@ namespace GcDevicePc
}
public CKVocAnalyzer.AutoAdjust auto;
public event ReallyAdjust Radjust;
//自动校准
private void buttonauto_Click(object sender, EventArgs e)
......@@ -75,6 +77,7 @@ namespace GcDevicePc
if (auto == null)
{
auto = new CKVocAnalyzer.AutoAdjust();
auto.aareally += Auto_aareally;
auto.Isadmin = false;
auto.Show();
}
......@@ -82,6 +85,7 @@ namespace GcDevicePc
{
auto = null;
auto = new CKVocAnalyzer.AutoAdjust();
auto.aareally += Auto_aareally;
auto.Isadmin = false;
auto.Show();
......@@ -119,6 +123,10 @@ namespace GcDevicePc
}
private void Auto_aareally(int t)
{
Radjust(t);
}
}
}
GcDevicePc/GCBuffer/HMIBuffer.cs
View file @ 5c4fe95d
......@@ -88,7 +88,7 @@ namespace GcDevicePc.GCBuffer
gcinfo.hmioffline = false;
gcinfo.HMIMac = new ushort[3] { 0, 0, 0 };
gcinfo.EPCStatus = new ushort[16] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
gcinfo.HmiAbnormal = new ushort[3] { 0, 0, 0 };
gcinfo.HmiAbnormal = new ushort[4] { 0, 0, 0 ,0};
gcadjust.executefun = 0;
gcadjust.executestat = 0;
......
GcDevicePc/GCBuffer/PCBuffer.cs
View file @ 5c4fe95d
......@@ -159,6 +159,9 @@ namespace GcDevicePc.GCBuffer
int sdzb = ini.ReadInteger("SaveData", "ZBSaveData");
string apname = ini.ReadString("Version", "AppName");
int fi = ini.ReadInteger("StartUp", "Forceintegral");
//string unit = ini.ReadString("StartUp", "Unit");
string zbname = ini.ReadString("StartUp", "TdName");
globaldata.ZbName = zbname;
globaldata.UserName = uname;
globaldata.UserPwd = upwd;
globaldata.CurrentVersion = Version;
......
GcDevicePc/MDIBase.cs
View file @ 5c4fe95d
This diff is collapsed.
GcDevicePc/MainForm.Designer.cs
View file @ 5c4fe95d
......@@ -39,7 +39,7 @@
this.ClientSize = new System.Drawing.Size(1008, 730);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "MainForm";
this.Text = "用户界面";
this.Text = "-1.5.9 用户界面";
this.ResumeLayout(false);
this.PerformLayout();
......
GcDevicePc/ProThread/GcDataTh.cs
View file @ 5c4fe95d
......@@ -522,7 +522,7 @@ namespace GcDevicePc.ProThread
int ret = -1;
try
{
ret = GetHmiAbnormalHoldingReg(1101, 3, ref data);
ret = GetHmiAbnormalHoldingReg(1101, 4, ref data);
}
catch (Exception e)
{
......@@ -769,7 +769,7 @@ namespace GcDevicePc.ProThread
byte[] tenstate = new byte[2] { 0, 0 };
ushort[] firestatus = new ushort[4] { 0, 0, 0, 0 };
ushort[] dacstatus = new ushort[6] { 0, 0, 0, 0, 0, 0 };
ushort[] hmiabnormal = new ushort[3];
ushort[] hmiabnormal = new ushort[4];
ushort[] hmipower = new ushort[6] { 0,0,0,0,0,0};
//ushort[] epcdata = new ushort[36];
......@@ -1022,7 +1022,7 @@ namespace GcDevicePc.ProThread
globaldata.m_dpbuffer.ShowList.pwmInfo.fDPower = hmipower[0];
globaldata.m_dpbuffer.ShowList.pwmInfo.iDPower = hmipower[1];
globaldata.m_dpbuffer.ShowList.pwmInfo.bDPower = hmipower[2];
globaldata.m_dpbuffer.ShowList.pwmInfo.fSPower = hmipower[3];
globaldata.m_dpbuffer.ShowList.pwmInfo.bSPower = hmipower[3];
globaldata.m_dpbuffer.ShowList.pwmInfo.fSPower = hmipower[4];
globaldata.m_dpbuffer.ShowList.pwmInfo.CbPower = hmipower[5];
}
......
GcDevicePc/ProThread/HMIControl.cs
View file @ 5c4fe95d
......@@ -446,54 +446,79 @@ namespace GcDevicePc.ProThread
}
public bool Adjust_ling_biao(int type,ushort oc)
public bool Adjust_ling_biao(int type)
{
int lret = 0;
int bret = 0;
int count = 0;
if (type == 0)
switch (type)
{
bret = m_modbus.WriteSingleCoil(26, oc, this.strIP, this.netPost);
while (bret != 0)
{
count++;
bret = m_modbus.WriteSingleCoil(26, oc, this.strIP, this.netPost);
Thread.Sleep(100);
if (count == 3)
break;
}
case 0:
bret = m_modbus.WriteSingleCoil(26, (ushort)65280, this.strIP, this.netPost);
while (bret != 0)
{
count++;
bret = m_modbus.WriteSingleCoil(26, (ushort)65280, this.strIP, this.netPost);
Thread.Sleep(100);
if (count == 3)
break;
}
lret = m_modbus.WriteSingleCoil(27, oc, this.strIP, this.netPost);
while (lret != 0)
{
count++;
lret = m_modbus.WriteSingleCoil(27, oc, this.strIP, this.netPost);
Thread.Sleep(100);
if (count == 3)
break;
}
}
else if (type == 1)
{
bret = m_modbus.WriteSingleCoil(27, oc, this.strIP, this.netPost);
while (bret != 0)
{
count++;
bret = m_modbus.WriteSingleCoil(27, oc, this.strIP, this.netPost);
Thread.Sleep(100);
if (count == 3)
break;
}
lret = m_modbus.WriteSingleCoil(27, (ushort)65280, this.strIP, this.netPost);
while (lret != 0)
{
count++;
lret = m_modbus.WriteSingleCoil(27, (ushort)65280, this.strIP, this.netPost);
Thread.Sleep(100);
if (count == 3)
break;
}
break;
case 1:
lret = m_modbus.WriteSingleCoil(26, 0, this.strIP, this.netPost);
while (lret != 0)
{
count++;
lret = m_modbus.WriteSingleCoil(26, 0, this.strIP, this.netPost);
Thread.Sleep(100);
if (count == 3)
break;
}
lret = m_modbus.WriteSingleCoil(26, 0, this.strIP, this.netPost);
while (lret != 0)
{
count++;
bret = m_modbus.WriteSingleCoil(27, (ushort)65280, this.strIP, this.netPost);
while (bret != 0)
{
count++;
bret = m_modbus.WriteSingleCoil(27, (ushort)65280, this.strIP, this.netPost);
Thread.Sleep(100);
if (count == 3)
break;
}
break;
case 2:
lret = m_modbus.WriteSingleCoil(26, 0, this.strIP, this.netPost);
Thread.Sleep(100);
if (count == 3)
break;
}
while (lret != 0)
{
count++;
lret = m_modbus.WriteSingleCoil(26, 0, this.strIP, this.netPost);
Thread.Sleep(100);
if (count == 3)
break;
}
bret = m_modbus.WriteSingleCoil(27, 0, this.strIP, this.netPost);
while (bret != 0)
{
count++;
bret = m_modbus.WriteSingleCoil(27, 0, this.strIP, this.netPost);
Thread.Sleep(100);
if (count == 3)
break;
}
break;
default:
break;
}
if (lret == 0 && bret == 0)
......
GcDevicePc/Program.cs
View file @ 5c4fe95d
......@@ -12,7 +12,7 @@ namespace GcDevicePc
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
bool createNew;
//Application.Run(new SysConfig());
//Application.Run(new TestForm());
{
using (System.Threading.Mutex mutex = new System.Threading.Mutex(true, Application.ProductName, out createNew))
{
......
GcDevicePc/RunTables.cs
View file @ 5c4fe95d
......@@ -387,6 +387,68 @@ namespace GcDevicePc
this.rtbox.Text = "";
this.rcbox.Text = "";
this.rdbox.Text = "";
this.tabrun.Enabled = false;
if (!File.Exists(globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.config_RunTab))
{
StreamWriter sw = new StreamWriter(globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.config_RunTab, false, System.Text.Encoding.Unicode);
sw.WriteLine("[运行表]");
sw.Close();
}
string file = globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.config_RunTab;
INIOperation runtable = new INIOperation(file);
string subkey;
runtable.INIEmptySection(file, "运行表");
runtable.INIEmptySection(file, "循环");
runtable.INIEmptySection(file, "运行时间");
runtable.INIWriteValue(file, "运行表", "0", "开机");
runtable.INIWriteValue(file, "循环", "0", "1");
runtable.INIWriteValue(file, "运行时间", "0", "1");
runtable.INIWriteValue(file, "间隔时间", "0", "1");
bool rbet;
FileServerClient rtclient = null;
if (!String.IsNullOrEmpty(globaldata.connection_ip))
{
rtclient = new FileServerClient();
rtclient.WtClientInit(globaldata.connection_ip, globaldata.fileserverport);
}
string lfilename;
string rfilename;
for (int i = 0; i < RunTableView.RowCount; i++)
{
subkey = (Convert.ToInt32(RunTableView.Rows[i].Cells[0].Value) + 1).ToString();
rbet = runtable.INIWriteValue(file, "运行表", subkey, RunTableView.Rows[i].Cells[1].Value.ToString());
if (RunTableView.Rows[i].Cells[3].Value.ToString() == "-1")
rbet = runtable.INIWriteValue(file, "循环", subkey, "-1");
else if (RunTableView.Rows[i].Cells[3].Value.ToString() == "0")
rbet = runtable.INIWriteValue(file, "循环", subkey, "0");
else
rbet = runtable.INIWriteValue(file, "循环", subkey, RunTableView.Rows[i].Cells[3].Value.ToString());
rbet = runtable.INIWriteValue(file, "运行时间", subkey, RunTableView.Rows[i].Cells[2].Value.ToString());
rbet = runtable.INIWriteValue(file, "间隔时间", subkey, RunTableView.Rows[i].Cells[4].Value.ToString());
lfilename = null;
rfilename = null;
rfilename = RunTableView.Rows[i].Cells[1].Value.ToString();
lfilename = Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder, rfilename);
if (rtclient != null)
rtclient.WtClientCopytoServer(rfilename, lfilename, globaldata.remoteFolder + "仪器方法\\");
}
if (rtclient != null)
rtclient.WtClientClose();
string message = "运行表保存成功";
MessageBox.Show(message, "提示信息", MessageBoxButtons.OK, MessageBoxIcon.Information);
this.tabrun.Enabled = true;
}
......@@ -442,7 +504,7 @@ namespace GcDevicePc
private void tabrun_Click(object sender, EventArgs e)
{
this.tabrun.Enabled = false;
Thread.Sleep(1000);
if (!File.Exists(globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.config_RunTab))
{
StreamWriter sw = new StreamWriter(globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.config_RunTab, false, System.Text.Encoding.Unicode);
......
GcDevicePc/SysConfig.Designer.cs
View file @ 5c4fe95d
This diff is collapsed.
GcDevicePc/SysConfig.cs
View file @ 5c4fe95d
This diff is collapsed.
GcDevicePc/SysConfig.resx
View file @ 5c4fe95d
......@@ -117,4 +117,28 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="CmsDeletRow.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>
\ No newline at end of file
GcDevicePc/TestForm.Designer.cs
View file @ 5c4fe95d
This diff is collapsed.
GcDevicePc/TestForm.cs
View file @ 5c4fe95d
......@@ -186,22 +186,137 @@ namespace GcDevicePc
private void Button13_Click(object sender, EventArgs e)
{
dataToZB.testzbb(1, 0, 3);
hmiopt.Adjust_ling_biao(0);
}
private void Button14_Click(object sender, EventArgs e)
{
dataToZB.testzbb(1, 0, 4);
}
private void Button15_Click(object sender, EventArgs e)
{
dataToZB.testzbb(0, 1, 3);
hmiopt.Adjust_ling_biao(2);
}
HMIControl hmiopt = new HMIControl("192.168.10.58",502);
private void Button16_Click(object sender, EventArgs e)
{
dataToZB.testzbb(0, 1, 4);
hmiopt.Adjust_ling_biao(1);
}
public void Data_Load()
{
string file = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.StartupPath), "GC_Config\\GC_Set\\启动参数\\CpdExpression.ini");
if (File.Exists(file))
{
IniFile iniFile = new IniFile(file);
int sum = iniFile.ReadInteger("CpdCount", "Count");
for (int i = 0; i < sum; i++)
{
DataGridViewRow row = new DataGridViewRow();
DataGridViewTextBoxCell textboxcell = new DataGridViewTextBoxCell();
textboxcell.Value = iniFile.ReadString("Compound"+i, "Name");//化合物名称
row.Cells.Add(textboxcell);
textboxcell.ReadOnly = false;
textboxcell.Style.BackColor = SystemColors.Control;
textboxcell = new DataGridViewTextBoxCell();
textboxcell.Value = iniFile.ReadString("Compound" + i, "IUnit");//单位
row.Cells.Add(textboxcell);
textboxcell.ReadOnly = false;
textboxcell.Style.BackColor = SystemColors.Control;
textboxcell = new DataGridViewTextBoxCell();
textboxcell.Value = iniFile.ReadString("Compound" + i, "OUnit");//单位
row.Cells.Add(textboxcell);
textboxcell.ReadOnly = false;
textboxcell.Style.BackColor = SystemColors.Control;
textboxcell = new DataGridViewTextBoxCell();
textboxcell.Value = iniFile.ReadString("Compound" + i, "UExpression");//单位公式换算
row.Cells.Add(textboxcell);
textboxcell.ReadOnly = false;
textboxcell.Style.BackColor = SystemColors.Control;
textboxcell = new DataGridViewTextBoxCell();
textboxcell.Value = iniFile.ReadString("Compound" + i, "IExpression");//内部结果浓度公式
row.Cells.Add(textboxcell);
textboxcell.ReadOnly = false;
textboxcell.Style.BackColor = SystemColors.Control;
textboxcell = new DataGridViewTextBoxCell();
textboxcell.Value = iniFile.ReadString("Compound" + i, "OExpression");//外部结果浓度公式
row.Cells.Add(textboxcell);
textboxcell.ReadOnly = false;
textboxcell.Style.BackColor = SystemColors.Control;
this.dataGridView1.Rows.Add(row);
}
}
}
public double Calculation(string formula,double x)
{
try
{
string expression = string.Empty;
if (formula.Contains('X'))
{
expression = formula.Replace("X", x.ToString());
}
if (formula.Contains('x'))
{
expression = formula.Replace("x", x.ToString());
}
object result = new DataTable().Compute(expression, "");
return double.Parse(result.ToString());
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
return 0;
}
}
private void Data_Save()
{
try
{
string file = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.StartupPath), "GC_Config\\GC_Set\\启动参数\\CpdExpression.ini");
if (File.Exists(file))
{
IniFile iniFile = new IniFile(file);
iniFile.WriteInteger("CpdCount", "Count", this.dataGridView1.RowCount);
for (int i = 0; i < this.dataGridView1.RowCount; i++)
{
iniFile.WriteString("Compound" + i, "Name", this.dataGridView1.Rows[i].Cells["Column1"].Value.ToString());
iniFile.WriteString("Compound" + i, "IUnit", this.dataGridView1.Rows[i].Cells["Column2"].Value.ToString());
iniFile.WriteString("Compound" + i, "OUnit", this.dataGridView1.Rows[i].Cells["Column3"].Value.ToString());
iniFile.WriteString("Compound" + i, "UExpression", this.dataGridView1.Rows[i].Cells["Column4"].Value.ToString());
iniFile.WriteString("Compound" + i, "IExpression", this.dataGridView1.Rows[i].Cells["Column5"].Value.ToString());
iniFile.WriteString("Compound" + i, "OExpression", this.dataGridView1.Rows[i].Cells["Column6"].Value.ToString());
}
}
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
}
}
private void Button17_Click(object sender, EventArgs e)
{
//int a = (short)Encoding.ASCII.GetBytes()
double s = Calculation("X+1*(2-4)/2", 5);
}
}
}
GcDevicePc/globaldata.cs
View file @ 5c4fe95d
......@@ -79,11 +79,12 @@ namespace GcDevicePc
public static int Foreign;//对外通信
public static bool ZbDataSave;//zb数据保存
public static string AppName;//应用程序名称
//public static bool system_Statue; //系统开启状态
//public static ushort work_Statue; //系统工作状态
//public static ushort RunType = 0; //运行类型 0 打开运行 1 智能运行 2 批处理
//public static bool system_Statue; //系统开启状态
//public static ushort work_Statue; //系统工作状态
//public static ushort RunType = 0; //运行类型 0 打开运行 1 智能运行 2 批处理
public static bool IsWorkProgress = false;
public static string ZbName;
public static ushort MethodRun_Statue; //方法运行状态
public static ushort RunTime_Now; //运行时间
public static ushort RunTotal_Now; //运行总时间
......
VocsSetup/GC_Config/GC_DataPro/AutoAdjust.ini 0 → 100644
View file @ 5c4fe95d
[SYSINFO]
ECOUNT=3
[ENTITY0]
ECC=NMHC,1,0,0,1
[ENTITY1]
ECC=THC,1,0,0,1
[ENTITY2]
ECC=CH4,1,0,0,1
\ No newline at end of file
VocsSetup/GC_Config/GC_DataPro/Calibrationdel.std 0 → 100644
View file @ 5c4fe95d
[SYSINFO]
ECOUNT=3
[ENTITY0]
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
\ No newline at end of file
VocsSetup/GC_Config/GC_DataPro/ExteCfg.config 0 → 100644
View file @ 5c4fe95d
<GCCPC>
<Cfg>
<PARAMETER>
<DEBUG>True</DEBUG>
<fid>True</fid>
<file1></file1>
<file2></file2>
<file3></file3>
<adjust1>3</adjust1>
<adjust2>3</adjust2>
<adjust3>0</adjust3>
<systemtype>0</systemtype>
<spacesize>500</spacesize>
<spacetimes>3</spacetimes>
<cyname></cyname>
<zeroname></zeroname>
<bqname></bqname>
<RSD>3</RSD>
<MethodType>1</MethodType>
<AutoTimes>30</AutoTimes>
<UnitType>0</UnitType>
<Kmax>0</Kmax>
<Kmin>0</Kmin>
<Bmax>0</Bmax>
<Bmin>0</Bmin>
</PARAMETER>
<NMHCcfgSave>
<name>
</name>
<vlue>0</vlue>
</NMHCcfgSave>
</Cfg>
</GCCPC>
\ No newline at end of file
VocsSetup/GC_Config/GC_DataPro/Ingredient.ini 0 → 100644
View file @ 5c4fe95d
[SYSINFO]
ECOUNT=63
[ENTITY0]
ID=1
NAME=NMHC
[ENTITY1]
ID=2
NAME=THC
[ENTITY2]
ID=3
NAME=CH4
[ENTITY3]
ID=4
NAME=굵
[ENTITY4]
ID=5
NAME=솖굵
[ENTITY5]
ID=6
NAME=랗솖굵
[ENTITY6]
ID=7
NAME=깩嶇홉
[ENTITY7]
ID=8
NAME=菉骨
[ENTITY8]
ID=9
NAME=菉嶇
[ENTITY9]
ID=10
NAME=깩嶇
[ENTITY10]
ID=11
NAME=嫩땀骨
[ENTITY11]
ID=12
NAME=攣땀骨
[ENTITY12]
ID=13
NAME=菉황
[ENTITY13]
ID=14
NAME=럽-2-땀嶇
[ENTITY14]
ID=15
NAME=1-땀嶇
[ENTITY15]
ID=16
NAME=糠-2-땀嶇
[ENTITY16]
ID=17
NAME=뻔矯骨
[ENTITY17]
ID=18
NAME=嫩矯骨
[ENTITY18]
ID=19
NAME=攣矯骨
[ENTITY19]
ID=20
NAME=럽-2-矯嶇
[ENTITY20]
ID=21
NAME=1-矯嶇
[ENTITY21]
ID=22
NAME=糠-2-矯嶇
[ENTITY22]
ID=23
NAME=2,2-랗솖샘땀骨
[ENTITY23]
ID=24
NAME=2,3-랗솖샘땀骨
[ENTITY24]
ID=25
NAME=2-솖샘矯骨
[ENTITY25]
ID=26
NAME=3-솖샘矯骨
[ENTITY26]
ID=27
NAME=嫩矯랗嶇
[ENTITY27]
ID=28
NAME=攣성骨
[ENTITY28]
ID=29
NAME=1-성嶇
[ENTITY29]
ID=30
NAME=솖샘뻔矯骨
[ENTITY30]
ID=31
NAME=2,4-랗솖샘矯骨
[ENTITY31]
ID=32
NAME=뻔성骨
[ENTITY32]
ID=33
NAME=2-솖샘성骨
[ENTITY33]
ID=34
NAME=2,3-랗솖샘矯骨
[ENTITY34]
ID=35
NAME=3-솖샘성骨
[ENTITY35]
ID=36
NAME=2,2,4-힛솖샘矯骨
[ENTITY36]
ID=37
NAME=攣뫙骨
[ENTITY37]
ID=38
NAME=솖샘뻔성骨
[ENTITY38]
ID=39
NAME=2,3,4-힛솖샘矯骨
[ENTITY39]
ID=40
NAME=2-솖샘뫙骨
[ENTITY40]
ID=41
NAME=3-솖샘뫙骨
[ENTITY41]
ID=42
NAME=攣僅骨
[ENTITY42]
ID=43
NAME=굵菉嶇
[ENTITY43]
ID=44
NAME=줅-랗솖굵
[ENTITY44]
ID=45
NAME=攣훔骨
[ENTITY45]
ID=46
NAME=嫩깩굵
[ENTITY46]
ID=47
NAME=攣깩굵(깩샘굵)
[ENTITY47]
ID=48
NAME=쇌菉샘솖굵
[ENTITY48]
ID=49
NAME=뚤菉샘솖굵
[ENTITY49]
ID=50
NAME=1,3,5-힛솖샘굵
[ENTITY50]
ID=51
NAME=1,2,4-힛솖샘굵
[ENTITY51]
ID=52
NAME=1.2,3-힛솖샘굵(젬힛솖굵)
[ENTITY52]
ID=53
NAME=줅菉샘솖굵
[ENTITY53]
ID=54
NAME=攣뱄骨
[ENTITY54]
ID=55
NAME=쇌랗菉샘굵
[ENTITY55]
ID=56
NAME=뚤랗菉샘굵
[ENTITY56]
ID=57
NAME=攣枷寧骨
[ENTITY57]
ID=58
NAME=攣枷랗骨
[ENTITY58]
ID=59
NAME=Default
[ENTITY59]
ID=60
NAME=南
[ENTITY60]
ID=61
NAME=깩骨
[ENTITY61]
ID=62
NAME=쇌랗솖굵
[ENTITY62]
ID=63
NAME=뚤랗솖굵
VocsSetup/GC_Config/GC_DataPro/SpectralDefault.comp 0 → 100644
View file @ 5c4fe95d
[SYSINFO]
ECOUNT=3
COEF=1
[ENTITY0]
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
\ No newline at end of file
VocsSetup/GC_Config/GC_Set/启动参数/CpdExpression.ini 0 → 100644
View file @ 5c4fe95d
[CpdCount]
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
TranUnit=ppm
[Compound1]
Name=CH4
IUnit=mg/m3
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
OExpression=x
[Compound12]
Name=NMHC
IUnit=mg/m3
OUnit=ppm(CH4单标）
TranUnit=ppm
UExpression=x*16/22.4
IExpression=x*22.4/16
OExpression=x
[Compound13]
Name=NMHC
IUnit=mg/m3
OUnit=ppm(混标）
TranUnit=ppm
UExpression=x*44/22.4
IExpression=x*22.4/44
OExpression=x
[Compound14]
Name=THC
IUnit=mg/m3
OUnit=mg/m3以丙烷计
TranUnit=ppm
UExpression=x
IExpression=x
OExpression=x
[Compound15]
Name=THC
IUnit=mg/m3
OUnit=mg/m3以甲烷计（混标）
TranUnit=ppm
UExpression=x
IExpression=x
OExpression=x
[Compound16]
Name=THC
IUnit=mg/m3
OUnit=mg/m3以甲烷计（CH4单标）
TranUnit=ppm
UExpression=x
IExpression=x*22.4/16
OExpression=x*22.4/16
[Compound17]
Name=THC
IUnit=mg/m3
OUnit=mg/m3以碳计(混标）
TranUnit=ppm
UExpression=x
IExpression=x
OExpression=x
[Compound18]
Name=THC
IUnit=mg/m3
OUnit=ppm（CH4单标）
TranUnit=ppm
UExpression=x
IExpression=x*22.4/16
OExpression=x*22.4/16
[Compound19]
Name=THC
IUnit=mg/m3
OUnit=mg/m3以碳计（CH4单标）
TranUnit=ppm
UExpression=x
IExpression=x
OExpression=x
[Compound20]
Name=THC
IUnit=mg/m3
OUnit=ppm(混标）
TranUnit=ppm
UExpression=x
IExpression=x
OExpression=x
VocsSetup/GC_Config/GC_Set/启动参数/startup.ini 0 → 100644
View file @ 5c4fe95d
[NetWorkConfig]
MAC地址=
网口=本地连接
[StartUp]
自启动=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
VocsSetup/GC_Control/CKVocSystem.config 0 → 100644
View file @ 5c4fe95d
<WuHanChenKe>
<VOCAnalyzer>
<FilePath>
<DllConfPath>F:\worksrc\PCApplication\Vocs\GcDevicePc\bin\x86\Debug\algorithm.ini</DllConfPath>
<SysConfPath>
</SysConfPath>
<FolderConfHist>F:\worksrc\PCApplication\Vocs\GcDevicePc\bin\x86\Debug\CarLine</FolderConfHist>
<EccConfPath>
</EccConfPath>
<FolderLog>F:\worksrc\PCApplication\Vocs\GcDevicePc\bin\x86\Debug\Logs</FolderLog>
<HistDataPath>F:\worksrc\PCApplication\Vocs\GcDevicePc\bin\x86\Debug\RowData</HistDataPath>
<DataBasePath>F:\worksrc\PCApplication\Vocs\GcDevicePc\bin\x86\Debug\DBase</DataBasePath>
</FilePath>
</VOCAnalyzer>
</WuHanChenKe>
\ No newline at end of file
VocsSetup/GC_Control/ExteCfg.config 0 → 100644
View file @ 5c4fe95d
<GCCPC>
<Cfg>
<PARAMETER>
<DEBUG>True</DEBUG>
<fid>True</fid>
<file1>
</file1>
<file2>
</file2>
<file3>
</file3>
<adjust1>2</adjust1>
<adjust2>3</adjust2>
<adjust3>20</adjust3>
<systemtype>0</systemtype>
<spacesize>500</spacesize>
<spacetimes>3</spacetimes>
<cyname>
</cyname>
<zeroname>
</zeroname>
<bqname>
</bqname>
</PARAMETER>
</Cfg>
</GCCPC>
\ No newline at end of file
VocsSetup/GC_Control/GcDevicePc.exe.config 0 → 100644
View file @ 5c4fe95d
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<runtime>
<legacyUnhandledExceptionPolicy enabled="true" />
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.104.0" newVersion="1.0.104.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<log4net>
<logger name="Log">
<level value="INFO" />
<appender-ref ref="RollingLog" />
</logger>
<logger name="Err">
<level value="ERROR" />
<appender-ref ref="RollingErr" />
</logger>
<logger name="HmiInfo">
<level value="INFO" />
<appender-ref ref="HmiRollingLog" />
</logger>
<appender name="RollingLog" type="log4net.Appender.RollingFileAppender">
<file value="..\GC_User\Logs\InfoLog_" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyyMMdd'.txt'" />
<staticLogFileName value="false" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="Record Time：%d Thread ID:[%thread]- Info：%m%n" />
</layout>
<filter type="log4net.Filter.LevelRangeFilter">
<param name="LevelMin" value="INFO" />
<param name="LevelMax" value="INFO" />
</filter>
</appender>
<appender name="HmiRollingLog" type="log4net.Appender.RollingFileAppender">
<file value="..\GC_User\Logs\HmiLog_" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyyMMdd'.txt'" />
<staticLogFileName value="false" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="Record Time：%d Info：%m%n" />
</layout>
<filter type="log4net.Filter.LevelRangeFilter">
<param name="LevelMin" value="INFO" />
<param name="LevelMax" value="INFO" />
</filter>
</appender>
<appender name="RollingErr" type="log4net.Appender.RollingFileAppender">
<file value="..\GC_User\Logs\ErrLog_" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyyMMdd'.txt'" />
<staticLogFileName value="false" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="Record Time：%d Thread ID:[%thread]- Error：%m%n" />
</layout>
<filter type="log4net.Filter.LevelRangeFilter">
<param name="LevelMin" value="ERROR" />
<param name="LevelMax" value="ERROR" />
</filter>
</appender>
</log4net>
</configuration>
VocsSetup/GC_Control/NModbus4.xml 0 → 100644
View file @ 5c4fe95d
This diff is collapsed.
VocsSetup/GC_Control/Switch.ini 0 → 100644
View file @ 5c4fe95d
[PortSet]
Ports=COM1
Baud=19200
Databits=8
Parity=None
StopBits=1
;----------------------------------------------------------------------------------------
[Command]
Command=G,H,I,J,L,N,Q,R,T,U,V,W,X,Z
;----------------------------------------------------------------------------------------
[ControllerSet]
kT= 10 3 40 100 1 20 1300 500
kR= 1
kQ= 2 1 0 0 0 0 0 0
;----------------------------------------------------------------------------------------
[RTUMasterSet]
uport=3
ubaudrate=9600
parity=0
utimeout=2000
VocsSetup/GC_Control/VisionLogs.txt 0 → 100644
View file @ 5c4fe95d
软件版本更新日志V1.5.9更新到V1.6.1
本次更新包括HMI V3.4更新到V3.5
• 补充温控保护逻辑，应对更多可能会出现的故障
• 修改了单位转换问题（更多功能须获得超级管理权限）
• 用户可在外部校准界面，通过选定单位来完成切换，它会影响的地方有：
• 用户界面浓度单位
• 外部校准界面单位
• 上位机传输默认单位ppm（若需要更改请联系厂家）
• 外部校准显示单位
• 优化状态切换
• 现在切换状态进度条结束前，新加的状态切换无效，避免频繁切换导致卡顿等异常状态；状态切换使用过程中约有1S延迟，为正常现象
• 新增历史谱图实时刷新按钮
• 修改批处理（智能运行）的updata，点击后会如实保存参数设定（以前是不点击启动运行，即使点击updata也不会保存参数设定），并反馈成功
• 软件默认绑定网络连接名称为“本地连接”，在用户更改为“网桥”后，请到“通讯设置”进行对应修改，否则无法正常联机
VocsSetup/GC_Control/ZedGraph.xml 0 → 100644
View file @ 5c4fe95d
This diff is collapsed.
VocsSetup/GC_Control/log4net.xml 0 → 100644
View file @ 5c4fe95d
This diff is collapsed.
VocsSetup/GC_Control/化合物列表.csv 0 → 100644
View file @ 5c4fe95d
,组分中文名,组分英文名,CAS NO.,化学式,分子量,碳原子数
1,甲烷,Methane,74-82-8,CH4,16.04,1
2,乙烷,Ethane,74-84-0,C2H6,30.069,2
3,乙烯,Ethylene,74-85-1,C2H4,28.053,2
4,丙烷,Propane,74-98-6,C3H8,44.0956,3
5,丙烯,Propylene,115-07-1,C3H6,42.0797,3
6,异丁烷,iso -Butane,75-28-5,C4H10,58.122,4
7,正丁烷,n-Butane,106-97-8,C4H10,58.122,4
8,乙炔,Acetylene,74-86-2,C2H2,26.037,2
9,反-2-丁烯,trans-2-Butene,624-64-6,C4H8,56.1063,4
10,1-丁烯,1-Butene,106-98-9,C4H8,56.106,4
11,顺-2-丁烯,cis-2-Butene,590-18-1,C4H8,56.1063,4
12,环戊烷,Cyclopentane,287-92-3,C5H10,70.133,5
13,异戊烷,iso -Pentane,78-78-4,C5H12,72.1488,5
14,正戊烷,n -Pentane,109-66-0,C5H12,72.149,5
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
18,顺-2-戊烯,2，2-Dimethylbutane,75-83-2,C6H14,86.175,6
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
22,异戊二烯,Isoprene,78-79-5,C5H8,68.117,5
23,正己烷,n -Hexane,110-54-3,C6H14,86.175,6
24,1-己烯,1-Hexene,592-41-6,C6H12,84.16,6
25,甲基环戊烷,Methylcyclopentane,96-37-7,C6H12,84.1595,6
26,2，4-二甲基戊烷,2，4-Dimethylpentane,108-08-7,C7H16,100.202,7
27,苯,Benzene,71-43-2,C6H6,78.112,6
28,环己烷,Cyclohexane,110-82-7,C6H12,84.16,6
29,2-甲基己烷,2-Methylhexane,591-76-4,C7H16,100.202,7
30,2，3-二甲基戊烷,2，3-Dimethylpentane,565-59-3,C7H16,100.202,7
31,3-甲基己烷,3-Methylhexane,589-34-4,C7H16,100.202,7
32,2，2，4-三甲基戊烷,2，2，4-Trimethylpentane,540-84-1,C8H18,114.229,8
33,正庚烷,n -Heptane,142-82-5,C7H16,100.202,7
34,甲基环己烷,Methylcyclohexane,108-87-2,C7H14,98.186,7
35,2，3，4-三甲基戊烷,2，3，4-Trimethylpentane|,565-75-3,C8H18,114.229,8
36,甲苯,Toluene,108-88-3,C7H8,92.138,7
37,2-甲基庚烷,2-Methylheptane,592-27-8,C8H18,114.229,8
38,3-甲基庚烷,3-Methylheptane,589-81-1,C8H18,114.229,8
39,正辛烷,n-Octane,111-65-9,C8H18,114.229,8
40,乙苯,Ethylbenzene,100-41-4,C8H10,106.165,8
41,间二甲苯,m，p-Xylene,100-41-4,C8H10,106.165,8
42,对二甲苯,m，p-Xylene,106-42-3,C8H10,106.165,8
43,苯乙烯,Styrene,100-42-5,C8H8,104.149,8
44,邻-二甲苯,o-Xylene,95-47-6,C8H10,106.165,8
45,正壬烷,n-Nonane,111-84-2,C9H20,128.255,9
46,异丙苯,iso-Propylbenzene,98-82-8,C9H12,120.192,9
47,正丙苯(丙基苯),n -Propylbenzene,103-65-1,C9H12,120.192,9
48,间乙基甲苯,m -Ethyltoluene,620-14-4,C9H12,120.192,9
49,对乙基甲苯,p -Ethyltoluene,622-96-8,C9H12,120.192,9
50,1，3，5-三甲基苯,1，3，5-Tri-m-benzene,108-67-8,C9H12,120.192,9
51,1，2，4-三甲基苯,1，2，4-Tri-m-benzene,95-63-6,C9H12,120.192,9
52,1.2，3-三甲基苯(联三甲苯),1，2，3-Tri-m-benzene,526-73-8,C9H12,120.192,9
53,邻乙基甲苯,o-Ethyltoluene,611-14-3,C9H12,120.192,9
54,正癸烷,n-Decane,124-18-5,C10H22,142.282,10
55,间二乙基苯,m -Diethylbenzene,141-93-5,C10H14,134.218,10
56,对二乙基苯,p-Diethylbenzene,105-05-5,C10H14,134.218,10
57,正十一烷,Undecane,1120-21-4,C11H24,156.308,11
58,正十二烷,Dodecane,112-40-3,C12H26,170.335,12
59,氧,Oxygen,7782-44-7,O2,32,0
VocsSetup/Vocs_1.0.2.iss 0 → 100644
View file @ 5c4fe95d
; 脚本由 Inno Setup 脚本向导 生成！
; 有关创建 Inno Setup 脚本文件的详细资料请查阅帮助文档！
#define MyAppName "色谱软件"
#define MyAppVersion "1.6.1"
#define MyAppPublisher "TT"
#define MyAppURL ""
#define MyAppExeName "GcDevicePc.exe"
[Setup]
; 注: AppId的值为单独标识该应用程序。
; 不要为其他安装程序使用相同的AppId值。
; (若要生成新的 GUID，可在菜单中点击 "工具|生成 GUID"。)
AppId={{0704C0A6-E009-491C-97A5-E1ECD7FE4FCE}
AppName={#MyAppName}
AppVersion={#MyAppVersion}
;AppVerName={#MyAppName} {#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={autopf}\{#MyAppName}
DisableProgramGroupPage=yes
; [Icons] 的“quicklaunchicon”条目使用 {userappdata}，而其 [Tasks] 条目具有适合 IsAdminInstallMode 的检查。
UsedUserAreasWarning=no
; 以下行取消注释，以在非管理安装模式下运行（仅为当前用户安装）。
;PrivilegesRequired=lowest
PrivilegesRequired=admin
PrivilegesRequiredOverridesAllowed=dialog
OutputDir=C:\Users\刘妙灵\Desktop\新建文件夹\Vocs_opt\VocsSetup\Setup
OutputBaseFilename=色谱软件_1.6.1
SetupIconFile=C:\Users\刘妙灵\Desktop\新建文件夹\Vocs_opt\GcDevicePc\logo.ico
Compression=lzma
SolidCompression=yes
WizardStyle=modern
[Languages]
Name: "chinesesimp"; MessagesFile: "compiler:Default.isl"
[Tasks]
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: checkablealone
Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 6.1; Check: not IsAdminInstallMode
[Files]
Source: "C:\Users\刘妙灵\Desktop\新建文件夹\Vocs_opt\VocsSetup\GC_Control\GcDevicePc.exe"; DestDir: "{app}\GC_Control"; Flags: ignoreversion
Source: "C:\Users\刘妙灵\Desktop\新建文件夹\Vocs_opt\VocsSetup\GC_Config\*"; DestDir: "{app}\GC_Config"; Flags: ignoreversion recursesubdirs createallsubdirs onlyifdoesntexist uninsneveruninstall
Source: "C:\Users\刘妙灵\Desktop\新建文件夹\Vocs_opt\VocsSetup\GC_Control\*"; DestDir: "{app}\GC_Control"; Flags: ignoreversion recursesubdirs createallsubdirs
; 注意: 不要在任何共享系统文件上使用“Flags: ignoreversion”
;Source: "C:\Users\刘妙灵\Desktop\新建文件夹\Vocs_opt\VocsSetup\GC_Config\GC_DataPro\*"; DestDir: "{app}\GC_Config\GC_DataPro"; Flags: confirmoverwrite
;Source: "C:\Users\刘妙灵\Desktop\新建文件夹\Vocs_opt\VocsSetup\GC_Config\GC_Set\*"; DestDir: "{app}\GC_Config\GC_Set"; Flags: confirmoverwrite
[Icons]
Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\GC_Control\{#MyAppExeName}"
Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\GC_Control\{#MyAppExeName}"; Tasks: desktopicon
Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\GC_Control\{#MyAppExeName}"; Tasks: quicklaunchicon
[Run]
;Filename: "{app}\GC_Control\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
[Code]
Vocs_opt @ 8b057b8b
Subproject commit 8b057b8be3e9d2cfe65998055ac07c9bd9b76113
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