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
5a2fce42
Commit
5a2fce42
authored
Jun 07, 2018
by
wangjunqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复一些bug
parent
ccb3e4a3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
25 deletions
+3
-25
AppInit.cs
GcDevicePc/AppInit.cs
+0
-12
CurveDisPlay.cs
GcDevicePc/CK_UI/CurveDisPlay.cs
+1
-0
MDIBase.cs
GcDevicePc/MDIBase.cs
+2
-2
MainBase.cs
GcDevicePc/MainBase.cs
+0
-7
CKvocUpdata.cs
GcDevicePc/ProThread/CKvocUpdata.cs
+0
-4
No files found.
GcDevicePc/AppInit.cs
View file @
5a2fce42
...
...
@@ -123,13 +123,6 @@ namespace GcDevicePc
{
ret
=
mainclient
.
WtClientCopyfromServer
(
filename
[
i
],
getfile
,
foldername
[
i
]);
Thread
.
Sleep
(
500
);
//checkflag = filecheck.IsUse(getfile);
//while (checkflag != 0)
//{
// Thread.Sleep(200);
// checkflag = filecheck.IsUse(getfile);
//}
if
(
ret
==
0
)
{
Log
.
Info
(
filename
[
i
].
ToString
()
+
" 同步成功"
);
...
...
@@ -271,10 +264,5 @@ namespace GcDevicePc
}
}
public
void
InitDB
()
{
}
}
}
GcDevicePc/CK_UI/CurveDisPlay.cs
View file @
5a2fce42
...
...
@@ -27,6 +27,7 @@ namespace GcDevicePc
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Left
)
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Right
)));
this
.
Controls
.
Add
(
curdisp
);
CheckForIllegalCrossThreadCalls
=
false
;
}
}
}
GcDevicePc/MDIBase.cs
View file @
5a2fce42
...
...
@@ -400,7 +400,7 @@ namespace GcDevicePc
public
void
WaitHMIFree
()
{
if
(
globaldata
.
m_hmibuffer
.
gcinfo
.
hmistatus
!=
0
)
//
if (globaldata.m_hmibuffer.gcinfo.hmistatus != 0)
{
this
.
backgroundWorker1
.
RunWorkerAsync
();
WaitForm
form
=
new
WaitForm
(
this
.
backgroundWorker1
,
"Free"
);
...
...
@@ -465,7 +465,7 @@ namespace GcDevicePc
}
public
void
WaitHMIWork
()
{
if
(
globaldata
.
m_hmibuffer
.
gcinfo
.
methodstatus
<
0
||
globaldata
.
m_hmibuffer
.
gcinfo
.
methodstatus
>
5
)
//
if (globaldata.m_hmibuffer.gcinfo.methodstatus < 0 || globaldata.m_hmibuffer.gcinfo.methodstatus > 5)
{
this
.
backgroundWorker2
.
RunWorkerAsync
();
WaitForm
form
=
new
WaitForm
(
this
.
backgroundWorker2
,
"Work"
);
...
...
GcDevicePc/MainBase.cs
View file @
5a2fce42
using
System
;
using
System.Collections.Generic
;
using
System.ComponentModel
;
using
System.Data
;
using
System.Drawing
;
using
System.Linq
;
using
System.Text
;
using
System.Threading
;
using
System.Windows.Forms
;
using
WeifenLuo.WinFormsUI.Docking
;
using
GcDevicePc.IniParam
;
using
System.IO
;
using
System.Runtime.InteropServices
;
using
GcDevicePc.ProThread
;
using
System.Security.Cryptography
;
using
System.Diagnostics
;
using
GcDevicePc.Common
;
...
...
GcDevicePc/ProThread/CKvocUpdata.cs
View file @
5a2fce42
...
...
@@ -100,7 +100,6 @@ namespace GcDevicePc.ProThread
globaldata
.
starttimer
=
globaldata
.
m_hmibuffer
.
gcinfo
.
NowStartTime
;
NowTimeOld
=
globaldata
.
m_hmibuffer
.
gcinfo
.
NowStartTime
;
CurveDisPlay
.
curdisp
.
cleardata
();
}
else
...
...
@@ -191,9 +190,6 @@ namespace GcDevicePc.ProThread
{
listPoint
.
Add
(
new
double
[]
{
Math
.
Round
(
time
,
4
),
Math
.
Round
(
value
,
6
)
});
listRaw
.
Add
(
new
double
[]
{((
SignalBuffer
.
Channel_XY
)
globaldata
.
m_signalbuffer
.
Draw_Port
[
i
]).
ctimer
,
Math
.
Round
(
value
,
6
)
});
}
...
...
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