Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hemei
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
潘栩锋
hemei
Commits
15a7c792
Commit
15a7c792
authored
Jun 18, 2019
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决界面 initparam 不会更新
parent
60f737c7
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
34 deletions
+31
-34
Page_Main.xaml.cs
...Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_Main.xaml.cs
+12
-14
TDGage.cs
...Y.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/TDGage.cs
+1
-0
BlowingScanAnaylze.cs
...can/FLY.Thick.BlowingScan.UI.Client/BlowingScanAnaylze.cs
+1
-1
Page_Main.xaml.cs
...ingScan/FLY.Thick.BlowingScan.UI.Client/Page_Main.xaml.cs
+12
-19
TDGage.cs
...ick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/TDGage.cs
+1
-0
VERSION.md
脚本/VERSION.md
+4
-0
No files found.
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_Main.xaml.cs
View file @
15a7c792
...
@@ -122,24 +122,22 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
...
@@ -122,24 +122,22 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
System
.
Windows
.
Application
.
Current
.
Dispatcher
.
Invoke
(
new
Action
(()
=>
System
.
Windows
.
Application
.
Current
.
Dispatcher
.
Invoke
(
new
Action
(()
=>
{
{
gage
.
mDynArea
.
PropertyChanged
+=
(
s
,
e
)
=>
Misc
.
BindingOperations
.
SetBinding
(
gage
.
mDynArea
,
"ControllerState"
,
UpdateControllerState
);
{
DynArea
dynarea
=
s
as
DynArea
;
if
(
e
.
PropertyName
==
"ControllerState"
)
{
var
st
=
mLayout
.
ControllerStates
.
Find
(
_st
=>
_st
.
ControllerState
==
dynarea
.
ControllerState
.
ToString
());
if
(
st
!=
null
)
{
if
(
st
.
No
>=
0
&&
st
.
No
<
this
.
tabControl1
.
Items
.
Count
)
this
.
tabControl1
.
SelectedIndex
=
st
.
No
;
}
}
};
lp
.
Progress
=
100
;
lp
.
Progress
=
100
;
}));
}));
System
.
Threading
.
Thread
.
Sleep
(
10
);
System
.
Threading
.
Thread
.
Sleep
(
10
);
}
}
void
UpdateControllerState
()
{
var
st
=
mLayout
.
ControllerStates
.
Find
(
_st
=>
_st
.
ControllerState
==
gage
.
mDynArea
.
ControllerState
.
ToString
());
if
(
st
!=
null
)
{
if
(
st
.
No
>=
0
&&
st
.
No
<
this
.
tabControl1
.
Items
.
Count
)
this
.
tabControl1
.
SelectedIndex
=
st
.
No
;
}
}
BlowingFixProfileServiceClient
mProfile
;
BlowingFixProfileServiceClient
mProfile
;
void
Init_Border_Profile
()
void
Init_Border_Profile
()
...
...
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/TDGage.cs
View file @
15a7c792
...
@@ -102,6 +102,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
...
@@ -102,6 +102,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
mFixService
.
ID
,
mFixService
.
ID
,
mPasswordService
.
ID
,
mPasswordService
.
ID
,
mRenZiJiaService
.
ID
,
mRenZiJiaService
.
ID
,
mInitParamService
.
ID
,
mBDetect
.
ID
mBDetect
.
ID
};
};
...
...
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/BlowingScanAnaylze.cs
View file @
15a7c792
...
@@ -433,7 +433,7 @@ namespace FLY.Thick.BlowingScan.UI.Client
...
@@ -433,7 +433,7 @@ namespace FLY.Thick.BlowingScan.UI.Client
}
}
mGagedata
.
PosOfGrid
=
posOfGrid
;
mGagedata
.
PosOfGrid
=
posOfGrid
;
mGagedata
.
Border
.
Copy
(
border
)
;
mGagedata
.
Border
=
border
;
for
(
int
i
=
0
;
i
<
gage_sum
.
Count
();
i
++)
for
(
int
i
=
0
;
i
<
gage_sum
.
Count
();
i
++)
{
{
if
(
gage_cnt
[
i
]
>
0
)
if
(
gage_cnt
[
i
]
>
0
)
...
...
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Page_Main.xaml.cs
View file @
15a7c792
...
@@ -119,30 +119,23 @@ namespace FLY.Thick.BlowingScan.UI.Client
...
@@ -119,30 +119,23 @@ namespace FLY.Thick.BlowingScan.UI.Client
System
.
Threading
.
Thread
.
Sleep
(
10
);
System
.
Threading
.
Thread
.
Sleep
(
10
);
System
.
Windows
.
Application
.
Current
.
Dispatcher
.
Invoke
(
new
Action
(()=>
System
.
Windows
.
Application
.
Current
.
Dispatcher
.
Invoke
(
new
Action
(()
=>
{
{
gage
.
mDynArea
.
PropertyChanged
+=
(
s
,
e
)
=>
Misc
.
BindingOperations
.
SetBinding
(
gage
.
mDynArea
,
"ControllerState"
,
UpdateControllerState
);
{
DynArea
dynarea
=
s
as
DynArea
;
if
(
e
.
PropertyName
==
"ControllerState"
)
{
foreach
(
TabItem
tabitem
in
this
.
tabControl1
.
Items
)
{
List
<
string
>
states
=
tabitem
.
Tag
as
List
<
string
>;
if
(
states
.
Contains
(
dynarea
.
ControllerState
.
ToString
()))
{
this
.
tabControl1
.
SelectedItem
=
tabitem
;
break
;
}
}
}
};
lp
.
Progress
=
100
;
lp
.
Progress
=
100
;
}));
}));
System
.
Threading
.
Thread
.
Sleep
(
10
);
System
.
Threading
.
Thread
.
Sleep
(
10
);
}
}
void
UpdateControllerState
()
{
var
st
=
mLayout
.
ControllerStates
.
Find
(
_st
=>
_st
.
ControllerState
==
gage
.
mDynArea
.
ControllerState
.
ToString
());
if
(
st
!=
null
)
{
if
(
st
.
No
>=
0
&&
st
.
No
<
this
.
tabControl1
.
Items
.
Count
)
this
.
tabControl1
.
SelectedIndex
=
st
.
No
;
}
}
BlowingScanServiceClient
mRenZiJiaService
;
BlowingScanServiceClient
mRenZiJiaService
;
...
...
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/TDGage.cs
View file @
15a7c792
...
@@ -102,6 +102,7 @@ namespace FLY.Thick.BlowingScan.UI.Client
...
@@ -102,6 +102,7 @@ namespace FLY.Thick.BlowingScan.UI.Client
mFixService
.
ID
,
mFixService
.
ID
,
mPasswordService
.
ID
,
mPasswordService
.
ID
,
mRenZiJiaService
.
ID
,
mRenZiJiaService
.
ID
,
mInitParamService
.
ID
,
mBDetect
.
ID
mBDetect
.
ID
};
};
...
...
脚本/VERSION.md
0 → 100644
View file @
15a7c792
# v2.0.0
1.
添加 吹膜扫描测厚仪模块
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