Skip to content

G
GC_Branch
Commit e60a026a authored by wangwanxh@sina.com's avatar wangwanxh@sina.com
Browse files
Options

5

parent 60af091a
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 11 deletions
GcDevicePc/CK_UI/UserCtl.cs
View file @ e60a026a
......@@ -33,7 +33,7 @@ namespace GcDevicePc.CK_UI
/// <summary>
/// true ppm false mg/m³
/// </summary>
public bool isppm = false;
public bool isppm = true;
/// <summary>
/// 系统故障
......@@ -57,6 +57,7 @@ namespace GcDevicePc.CK_UI
try
{
Systemtype = CKVocAnalyzer.GlobalCKV.Systemtype;
switch (Systemtype)
{
......@@ -273,7 +274,7 @@ namespace GcDevicePc.CK_UI
}
else
{
textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
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³";
}
if (listNmoc[listNmoc.Count - 1].Y >= CKVocAnalyzer.GlobalCKV.vocparamlist[i].WaringValue)
......@@ -292,7 +293,7 @@ namespace GcDevicePc.CK_UI
}
else
{
textBox2.Text = Math.Round(listTHC[listTHC.Count - 1].Y * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
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³";
}
if (listTHC[listTHC.Count - 1].Y >= CKVocAnalyzer.GlobalCKV.vocparamlist[i].WaringValue)
......@@ -311,7 +312,7 @@ namespace GcDevicePc.CK_UI
}
else
{
textBox3.Text = Math.Round(listCH4[listCH4.Count - 1].Y * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
textBox3.Text = Math.Round(listCH4[listCH4.Count - 1].Y / (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 12) * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
}
if (listCH4[listCH4.Count - 1].Y >= CKVocAnalyzer.GlobalCKV.vocparamlist[i].WaringValue)
......@@ -402,7 +403,7 @@ namespace GcDevicePc.CK_UI
}
else
{
textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
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³";
}
if (listNmoc[listNmoc.Count - 1].Y >= CKVocAnalyzer.GlobalCKV.vocparamlist[i].WaringValue)
......@@ -421,7 +422,7 @@ namespace GcDevicePc.CK_UI
}
else
{
textBox2.Text = Math.Round(listTHC[listTHC.Count - 1].Y * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
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³";
}
if (listTHC[listTHC.Count - 1].Y >= CKVocAnalyzer.GlobalCKV.vocparamlist[i].WaringValue)
......@@ -440,7 +441,7 @@ namespace GcDevicePc.CK_UI
}
else
{
textBox3.Text = Math.Round(listCH4[listCH4.Count - 1].Y * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
textBox3.Text = Math.Round(listCH4[listCH4.Count - 1].Y / (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 12) * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
}
if (listCH4[listCH4.Count - 1].Y >= CKVocAnalyzer.GlobalCKV.vocparamlist[i].WaringValue)
......@@ -460,7 +461,7 @@ namespace GcDevicePc.CK_UI
}
else
{
textBox4.Text = Math.Round(listben[listben.Count - 1].Y * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
textBox4.Text = Math.Round(listben[listben.Count - 1].Y / (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 12) * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
}
if (listben[listben.Count - 1].Y >= CKVocAnalyzer.GlobalCKV.vocparamlist[i].WaringValue)
......@@ -479,7 +480,7 @@ namespace GcDevicePc.CK_UI
}
else
{
textBox5.Text = Math.Round(listjiaben[listjiaben.Count - 1].Y * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
textBox5.Text = Math.Round(listjiaben[listjiaben.Count - 1].Y / (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 12) * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
}
if (listjiaben[listjiaben.Count - 1].Y >= CKVocAnalyzer.GlobalCKV.vocparamlist[i].WaringValue)
......@@ -498,7 +499,7 @@ namespace GcDevicePc.CK_UI
}
else
{
textBox6.Text = Math.Round(listerjiaben[listerjiaben.Count - 1].Y * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
textBox6.Text = Math.Round(listerjiaben[listerjiaben.Count - 1].Y / (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 12) * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
}
if (listerjiaben[listerjiaben.Count - 1].Y >= CKVocAnalyzer.GlobalCKV.vocparamlist[i].WaringValue)
......
GcDevicePc/MDIBase.cs
View file @ e60a026a
......@@ -398,7 +398,7 @@ namespace GcDevicePc
float fDetvalueold = 0.0f;
private void timer1_Tick(object sender, EventArgs e)
{
this.Text = String.Format("VOCs在线监测-1.1.3.08 {0}",Formstr);
this.Text = String.Format("VOCs在线监测-1.1.3.09 {0}",Formstr);
if (LandIn.Island)
{
HmiStatus.Text = String.Format("状态：{0}", statestr);
......
dll/CKVocAlgorithm.dll
View file @ e60a026a
No preview for this file type
dll/CKVocAnalyzer.dll
View file @ e60a026a
No preview for this file type
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