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
cda4d048
Commit
cda4d048
authored
Jun 22, 2020
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复 忘记解决 正常的边界查找, 得到的是拐点, 但需要推送的数据是斜波的中心
parent
1b325e17
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
BorderSearch.cs
Project.FLY.Thick.Base/FLY.Thick.Base/Server/BorderSearch.cs
+4
-1
BorderSearchPlastic.cs
...Y.Thick.Base/FLY.Thick.Base/Server/BorderSearchPlastic.cs
+8
-4
No files found.
Project.FLY.Thick.Base/FLY.Thick.Base/Server/BorderSearch.cs
View file @
cda4d048
...
@@ -656,7 +656,7 @@ namespace FLY.Thick.Base.Server
...
@@ -656,7 +656,7 @@ namespace FLY.Thick.Base.Server
border
.
isBeginOk
=
isBorderBeginOk
;
border
.
isBeginOk
=
isBorderBeginOk
;
border
.
isEndOk
=
isBorderEndOk
;
border
.
isEndOk
=
isBorderEndOk
;
getViewReponse
.
border
=
border
.
value
;
if
(
borders
.
All
(
b
=>
b
.
value
.
IsValid
))
if
(
borders
.
All
(
b
=>
b
.
value
.
IsValid
))
{
{
...
@@ -674,6 +674,9 @@ namespace FLY.Thick.Base.Server
...
@@ -674,6 +674,9 @@ namespace FLY.Thick.Base.Server
Border
.
Copy
(
border
.
real
);
Border
.
Copy
(
border
.
real
);
}
}
getViewReponse
.
border
=
border
.
real
;
Width
=
Border
.
Width
;
Width
=
Border
.
Width
;
Mid
=
Border
.
Mid
;
Mid
=
Border
.
Mid
;
return
true
;
return
true
;
...
...
Project.FLY.Thick.Base/FLY.Thick.Base/Server/BorderSearchPlastic.cs
View file @
cda4d048
...
@@ -128,16 +128,17 @@ namespace FLY.Thick.Base.Server
...
@@ -128,16 +128,17 @@ namespace FLY.Thick.Base.Server
int
idx
=
(
direction
==
DIRECTION
.
FORWARD
)
?
0
:
1
;
int
idx
=
(
direction
==
DIRECTION
.
FORWARD
)
?
0
:
1
;
var
border
=
borders
[
idx
];
var
border
=
borders
[
idx
];
//borderbegin_grid, borderend_grid 是实际边界位置,
//border.value 是空气与膜的拐点
//必须外扩
//转为 脉冲
//转为 脉冲
border
.
value
.
Begin
=
(
borderbegin_grid
+
gridBegin
)
*
posOfGrid
;
border
.
value
.
Begin
=
(
borderbegin_grid
+
gridBegin
)
*
posOfGrid
-
SensorWidth
/
2
;
border
.
value
.
End
=
(
borderend_grid
+
gridBegin
)
*
posOfGrid
;
border
.
value
.
End
=
(
borderend_grid
+
gridBegin
)
*
posOfGrid
+
SensorWidth
/
2
;
border
.
isBeginOk
=
true
;
border
.
isBeginOk
=
true
;
border
.
isEndOk
=
true
;
border
.
isEndOk
=
true
;
border
.
UpdateReal
(
SensorWidth
);
border
.
UpdateReal
(
SensorWidth
);
getViewReponse
.
border
=
border
.
value
;
if
(
borders
.
All
(
b
=>
b
.
value
.
IsValid
))
if
(
borders
.
All
(
b
=>
b
.
value
.
IsValid
))
{
{
Border
.
Begin
=
(
int
)
borders
.
Average
(
b
=>
b
.
real
.
Begin
);
Border
.
Begin
=
(
int
)
borders
.
Average
(
b
=>
b
.
real
.
Begin
);
...
@@ -147,6 +148,9 @@ namespace FLY.Thick.Base.Server
...
@@ -147,6 +148,9 @@ namespace FLY.Thick.Base.Server
{
{
Border
.
Copy
(
border
.
real
);
Border
.
Copy
(
border
.
real
);
}
}
getViewReponse
.
border
=
border
.
real
;
Width
=
Border
.
Width
;
Width
=
Border
.
Width
;
Mid
=
Border
.
Mid
;
Mid
=
Border
.
Mid
;
return
true
;
return
true
;
...
...
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