Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Thick-Common
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
潘栩锋
Thick-Common
Commits
e3a046aa
Commit
e3a046aa
authored
Apr 16, 2021
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复 gageinfo 异常
parent
4fe9dfa2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
PgGageInfo.xaml.cs
Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgGageInfo.xaml.cs
+8
-2
GM_GageInfo.cs
Project.FLY.Thick.Base/FLY.Thick.Base/Server/GM_GageInfo.cs
+1
-0
No files found.
Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgGageInfo.xaml.cs
View file @
e3a046aa
...
@@ -88,7 +88,10 @@ namespace FLY.Thick.Base.UI
...
@@ -88,7 +88,10 @@ namespace FLY.Thick.Base.UI
var
reponse
=
retData
as
GetGageInfoResponse
;
var
reponse
=
retData
as
GetGageInfoResponse
;
int
index
=
(
int
)
asyncContext
;
int
index
=
(
int
)
asyncContext
;
SeriesInfos
[
index
].
Datas
.
Clear
();
SeriesInfos
[
index
].
Datas
.
Clear
();
SeriesInfos
[
index
].
Datas
.
AddRange
(
reponse
.
Data
);
if
(
reponse
.
Data
!=
null
)
{
SeriesInfos
[
index
].
Datas
.
AddRange
(
reponse
.
Data
);
}
SeriesInfos
[
index
].
UpdateTime
=
reponse
.
UpdateTime
;
SeriesInfos
[
index
].
UpdateTime
=
reponse
.
UpdateTime
;
DataBindAll
();
DataBindAll
();
...
@@ -159,7 +162,10 @@ namespace FLY.Thick.Base.UI
...
@@ -159,7 +162,10 @@ namespace FLY.Thick.Base.UI
var
reponse
=
retData
as
GetGageInfoResponse
;
var
reponse
=
retData
as
GetGageInfoResponse
;
int
index
=
(
int
)
asyncContext
;
int
index
=
(
int
)
asyncContext
;
SeriesInfos
[
index
].
Datas
.
Clear
();
SeriesInfos
[
index
].
Datas
.
Clear
();
SeriesInfos
[
index
].
Datas
.
AddRange
(
reponse
.
Data
);
if
(
reponse
.
Data
!=
null
)
{
SeriesInfos
[
index
].
Datas
.
AddRange
(
reponse
.
Data
);
}
SeriesInfos
[
index
].
UpdateTime
=
reponse
.
UpdateTime
;
SeriesInfos
[
index
].
UpdateTime
=
reponse
.
UpdateTime
;
DataBindAll
();
DataBindAll
();
...
...
Project.FLY.Thick.Base/FLY.Thick.Base/Server/GM_GageInfo.cs
View file @
e3a046aa
...
@@ -81,6 +81,7 @@ namespace FLY.Thick.Base.Server
...
@@ -81,6 +81,7 @@ namespace FLY.Thick.Base.Server
scanMotion
.
EndEvent
+=
GM_GageInfo_EndEvent
;
scanMotion
.
EndEvent
+=
GM_GageInfo_EndEvent
;
scanMotion
.
PropertyChanged
+=
GM_GageInfo_PropertyChanged
;
scanMotion
.
PropertyChanged
+=
GM_GageInfo_PropertyChanged
;
UpdateTimes
=
new
DateTime
[
2
];
updateDataOK
();
updateDataOK
();
initParam
.
PropertyChanged
+=
new
PropertyChangedEventHandler
(
initParam_PropertyChanged
);
initParam
.
PropertyChanged
+=
new
PropertyChangedEventHandler
(
initParam_PropertyChanged
);
...
...
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