Commit 6d8fe00a authored by wangwanxh@sina.com's avatar wangwanxh@sina.com

7-27

parent 20ca384f
......@@ -36,22 +36,32 @@ namespace GcDevicePc.CK_UI
private void UserCtl_Load(object sender, EventArgs e)
{
Systemtype = CKVocAnalyzer.GlobalCKV.Systemtype;
switch (Systemtype)
try
{
default: //非甲烷总烃
InitZedgrap(zedGraphControl1);
data();
datadisp();
UIVisible(false);
break;
case 1:
InitZedgrapben(zedGraphControl1);
data2();
datadisp2();
Systemtype = CKVocAnalyzer.GlobalCKV.Systemtype;
switch (Systemtype)
{
default: //非甲烷总烃
InitZedgrap(zedGraphControl1);
data();
datadisp();
UIVisible(false);
break;
case 1:
InitZedgrapben(zedGraphControl1);
data2();
datadisp2();
break;
}
}
catch (Exception ex)
{
Trace.Write(ex);
}
}
......@@ -228,7 +238,10 @@ namespace GcDevicePc.CK_UI
{
if (myPaneNmoc == null || myPaneCh4 == null || myPaneThc == null|| listNmoc.Count<1||listCH4.Count<1||listTHC.Count<1)
{
// Trace.WriteLine("跳出", "sys");
// Trace.WriteLine(string.Format("NMHC-{0},ch4={1},thc-{2}",listNmoc.Count,listCH4.Count,listTHC.Count),"sys");
return;
}
textBox1.Text =Math.Round(listNmoc[listNmoc.Count - 1].Y,2).ToString() + "ppm";
textBox2.Text =Math.Round(listTHC[listTHC.Count - 1].Y,2).ToString() + "ppm";
......@@ -270,6 +283,7 @@ namespace GcDevicePc.CK_UI
zedGraphControl1.AxisChange();
zedGraphControl1.Refresh();
}
catch(Exception ex)
{
......@@ -417,6 +431,7 @@ namespace GcDevicePc.CK_UI
}
}
// Trace.WriteLine(string.Format("读取个数{0}",sql.ReturnData.Count),"sys");
}catch(Exception ex)
......@@ -493,19 +508,27 @@ namespace GcDevicePc.CK_UI
private void timer1_Tick(object sender, EventArgs e)
{
switch (Systemtype)
try
{
default: //非甲烷总烃
data();
datadisp();
UIVisible(false);
break;
case 1:
data2();
datadisp2();
break;
switch (Systemtype)
{
default: //非甲烷总烃
data();
datadisp();
UIVisible(false);
break;
case 1:
data2();
datadisp2();
break;
}
// Trace.WriteLine("绘图","sys");
}
catch(Exception ex)
{
Trace.Write(ex);
}
......
......@@ -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.01 {0}",Formstr);
this.Text = String.Format("VOCs在线监测-1.1.3.02 {0}",Formstr);
if (LandIn.Island)
{
HmiStatus.Text = String.Format("状态:{0}", statestr);
......
......@@ -20,6 +20,7 @@ namespace GcDevicePc
if (createNew)
{
Application.Run(new StartForm());
// Application.Run(new MDIBase());
}
else
{
......
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