Skip to content

G
GC_Branch
Commit 2dbcebfd authored by wangjunqiang's avatar wangjunqiang
Browse files
Options

Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master

parents fdd772d1 51461f48
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 13 deletions
GcDevicePc/CK_UI/UserCtl.cs
View file @ 2dbcebfd
......@@ -207,7 +207,7 @@ namespace GcDevicePc.CK_UI
myPaneT.YAxis.Scale.IsSkipLastLabel = true;
LineItem myCurve = myPaneT.AddCurve("",
null, rotator.NextColor, SymbolType.None);
null, Color.Black, SymbolType.None);
myCurve.Symbol.Fill = new Fill(Color.White);
//myPaneT.YAxis.MinSpace = 60;
......@@ -248,7 +248,7 @@ namespace GcDevicePc.CK_UI
myPaneNmoc.XAxis.CrossAuto = true;
myPaneNmoc.YAxis.CrossAuto = true;
LineItem myCurve = myPaneNmoc.AddCurve("",
listNmoc, rotator.NextColor, SymbolType.None);
listNmoc, Color.Black, SymbolType.None);
myCurve.Symbol.Fill = new Fill(Color.White);
mster.Add(myPaneNmoc);
// myPaneThc.XAxis.Scale.Min = minx;
......@@ -256,7 +256,7 @@ namespace GcDevicePc.CK_UI
myPaneThc.XAxis.CrossAuto = true;
myPaneThc.YAxis.CrossAuto = true;
LineItem myCurve1 = myPaneThc.AddCurve("",
listTHC, rotator.NextColor, SymbolType.None);
listTHC, Color.Black, SymbolType.None);
myCurve1.Symbol.Fill = new Fill(Color.White);
mster.Add(myPaneThc);
// myPaneCh4.XAxis.Scale.Min = minx;
......@@ -264,7 +264,7 @@ namespace GcDevicePc.CK_UI
myPaneCh4.XAxis.CrossAuto = true;
myPaneCh4.YAxis.CrossAuto = true;
LineItem myCurve2 = myPaneCh4.AddCurve("",
listCH4, rotator.NextColor, SymbolType.None);
listCH4, Color.Black, SymbolType.None);
myCurve2.Symbol.Fill = new Fill(Color.White);
mster.Add(myPaneCh4);
zedGraphControl1.AxisChange();
......@@ -311,7 +311,7 @@ namespace GcDevicePc.CK_UI
myPaneNmoc.XAxis.CrossAuto = true;
myPaneNmoc.YAxis.CrossAuto = true;
LineItem myCurve = myPaneNmoc.AddCurve("",
listNmoc, rotator.NextColor, SymbolType.None);
listNmoc, Color.Black, SymbolType.None);
myCurve.Symbol.Fill = new Fill(Color.White);
mster.Add(myPaneNmoc);
// myPaneThc.XAxis.Scale.Min = minx;
......@@ -319,7 +319,7 @@ namespace GcDevicePc.CK_UI
myPaneThc.XAxis.CrossAuto = true;
myPaneThc.YAxis.CrossAuto = true;
LineItem myCurve1 = myPaneThc.AddCurve("",
listTHC, rotator.NextColor, SymbolType.None);
listTHC, Color.Black, SymbolType.None);
myCurve1.Symbol.Fill = new Fill(Color.White);
mster.Add(myPaneThc);
// myPaneCh4.XAxis.Scale.Min = minx;
......@@ -327,7 +327,7 @@ namespace GcDevicePc.CK_UI
myPaneCh4.XAxis.CrossAuto = true;
myPaneCh4.YAxis.CrossAuto = true;
LineItem myCurve2 = myPaneCh4.AddCurve("",
listCH4, rotator.NextColor, SymbolType.None);
listCH4, Color.Black, SymbolType.None);
myCurve2.Symbol.Fill = new Fill(Color.White);
mster.Add(myPaneCh4);
......@@ -335,21 +335,21 @@ namespace GcDevicePc.CK_UI
myPaneben.XAxis.CrossAuto = true;
myPaneben.YAxis.CrossAuto = true;
LineItem myCurve3 = myPaneben.AddCurve("",
listben, rotator.NextColor, SymbolType.None);
listben, Color.Black, SymbolType.None);
myCurve3.Symbol.Fill = new Fill(Color.White);
mster.Add(myPaneben);
myPanejiaben.XAxis.CrossAuto = true;
myPanejiaben.YAxis.CrossAuto = true;
LineItem myCurve4 = myPanejiaben.AddCurve("",
listjiaben, rotator.NextColor, SymbolType.None);
listjiaben, Color.Black, SymbolType.None);
myCurve4.Symbol.Fill = new Fill(Color.White);
mster.Add(myPanejiaben);
myPaneerjiaben.XAxis.CrossAuto = true;
myPaneerjiaben.YAxis.CrossAuto = true;
LineItem myCurve5 = myPaneerjiaben.AddCurve("",
listerjiaben, rotator.NextColor, SymbolType.None);
listerjiaben, Color.Black, SymbolType.None);
myCurve5.Symbol.Fill = new Fill(Color.White);
mster.Add(myPaneerjiaben);
zedGraphControl1.AxisChange();
......
GcDevicePc/MDIBase.cs
View file @ 2dbcebfd
......@@ -363,7 +363,7 @@ namespace GcDevicePc
AuxToolMenu.Visible = true;
ParameterSettingMenu.Visible = true;
DebugMainMenu.Visible = true;
HmiStatus.Visible = true;
// HmiStatus.Visible = true;
SettingSeparator.Visible = true;
}else
......@@ -378,7 +378,7 @@ namespace GcDevicePc
AuxToolMenu.Visible = false;
ParameterSettingMenu.Visible = false;
DebugMainMenu.Visible = false;
HmiStatus.Visible = false;
// HmiStatus.Visible = false;
SettingSeparator.Visible = false;
}
......@@ -395,10 +395,27 @@ namespace GcDevicePc
/// <param name="sender"></param>
/// <param name="e"></param>
/// 1.0.2.3 添加了周期完成后，重新绘图功能
float fDetvalueold = 0.0f;
private void timer1_Tick(object sender, EventArgs e)
{
this.Text = String.Format("VOCs在线监测-1.0.2.7 {0}",Formstr);
this.Text = String.Format("VOCs在线监测-1.0.3.00 {0}",Formstr);
if (LandIn.Island)
{
HmiStatus.Text = String.Format("状态：{0}", statestr);
}else
{
float fDetvalue = 0.0f;
if (globaldata.m_signalbuffer.Draw_Port.Count > 1)
{
fDetvalue = globaldata.m_dpbuffer.ShowList.showDet.fDetValue;
if (fDetvalue != 0.0f)
fDetvalueold = fDetvalue;
}
HmiStatus.Text = String.Format("FID:{0:N3} mV", fDetvalueold);
}
// toolStripStatusLabeSystme.Text = String.Format("状态：{0}", statestr);
timespan = System.DateTime.Now - startTime;
......
dll/CKVocAnalyzer.dll
View file @ 2dbcebfd
No preview for this file type
说明/RM.txt
View file @ 2dbcebfd
......@@ -9,3 +9,9 @@
1，调整目录
2018-6-27
1.自动校准，时间值设定为0，只能输入整数
2018 7-5
1、修改了开机启动，配置丢失；
2、安装包文件覆盖提示；
3、增加了FID信号；
4、改变曲线颜色；
5、安装包增加了，开启自启动
\ No newline at end of file
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