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
3af52b47
Commit
3af52b47
authored
Apr 13, 2020
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev6.0' of
http://private.flyautomation.net:82/panruising/thick_public
into dev6.0
parents
2351e2a7
3cb9fe98
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
BorderSearch.cs
Project.FLY.Thick.Base/FLY.Thick.Base/Server/BorderSearch.cs
+3
-0
No files found.
Project.FLY.Thick.Base/FLY.Thick.Base/Server/BorderSearch.cs
View file @
3af52b47
...
...
@@ -604,6 +604,9 @@ namespace FLY.Thick.Base.Server
warningSystem
.
Add
(
BORDER_ERRNO_NOFILM
.
Code
,
BORDER_ERRNO_NOFILM
.
Descrption
,
OBJComponents
.
Common
.
ERR_STATE
.
ON
);
return
false
;
}
else
{
warningSystem
.
Add
(
BORDER_ERRNO_NOFILM
.
Code
,
BORDER_ERRNO_NOFILM
.
Descrption
,
OBJComponents
.
Common
.
ERR_STATE
.
OFF
);
}
//N2 只是用来判断一下膜够不够宽而已,没用
int
N2_grid
=
(
N2
*
3
+
SensorWidth
)
/
posOfGrid
;
...
...
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