Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
G
GC_Branch
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
周磊
GC_Branch
Commits
6d8fe00a
Commit
6d8fe00a
authored
Jul 27, 2018
by
wangwanxh@sina.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
7-27
parent
20ca384f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
50 additions
and
26 deletions
+50
-26
UserCtl.cs
GcDevicePc/CK_UI/UserCtl.cs
+48
-25
MDIBase.cs
GcDevicePc/MDIBase.cs
+1
-1
Program.cs
GcDevicePc/Program.cs
+1
-0
No files found.
GcDevicePc/CK_UI/UserCtl.cs
View file @
6d8fe00a
...
...
@@ -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
);
}
...
...
GcDevicePc/MDIBase.cs
View file @
6d8fe00a
...
...
@@ -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.0
1
{0}"
,
Formstr
);
this
.
Text
=
String
.
Format
(
"VOCs在线监测-1.1.3.0
2
{0}"
,
Formstr
);
if
(
LandIn
.
Island
)
{
HmiStatus
.
Text
=
String
.
Format
(
"状态:{0}"
,
statestr
);
...
...
GcDevicePc/Program.cs
View file @
6d8fe00a
...
...
@@ -20,6 +20,7 @@ namespace GcDevicePc
if
(
createNew
)
{
Application
.
Run
(
new
StartForm
());
// Application.Run(new MDIBase());
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment