Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
49432c58
Commit
49432c58
authored
9 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
patch for embedded edges in OCC surfaces
parent
21014511
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Geo/GModelIO_OCC.cpp
+1
-1
1 addition, 1 deletion
Geo/GModelIO_OCC.cpp
Geo/OCCFace.cpp
+1
-1
1 addition, 1 deletion
Geo/OCCFace.cpp
Geo/OCCRegion.cpp
+9
-3
9 additions, 3 deletions
Geo/OCCRegion.cpp
with
11 additions
and
5 deletions
Geo/GModelIO_OCC.cpp
+
1
−
1
View file @
49432c58
...
@@ -108,7 +108,7 @@ void OCC_Internals::addShapeToLists(TopoDS_Shape _shape)
...
@@ -108,7 +108,7 @@ void OCC_Internals::addShapeToLists(TopoDS_Shape _shape)
if
(
fmap
.
FindIndex
(
face
)
<
1
){
if
(
fmap
.
FindIndex
(
face
)
<
1
){
fmap
.
Add
(
face
);
fmap
.
Add
(
face
);
for
(
exp3
.
Init
(
exp2
.
Current
(),
TopAbs_WIRE
);
exp3
.
More
();
exp3
.
Next
()){
for
(
exp3
.
Init
(
exp2
.
Current
()
.
Oriented
(
TopAbs_FORWARD
)
,
TopAbs_WIRE
);
exp3
.
More
();
exp3
.
Next
()){
TopoDS_Wire
wire
=
TopoDS
::
Wire
(
exp3
.
Current
());
TopoDS_Wire
wire
=
TopoDS
::
Wire
(
exp3
.
Current
());
if
(
wmap
.
FindIndex
(
wire
)
<
1
){
if
(
wmap
.
FindIndex
(
wire
)
<
1
){
wmap
.
Add
(
wire
);
wmap
.
Add
(
wire
);
...
...
This diff is collapsed.
Click to expand it.
Geo/OCCFace.cpp
+
1
−
1
View file @
49432c58
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
#endif
#endif
OCCFace
::
OCCFace
(
GModel
*
m
,
TopoDS_Face
_s
,
int
num
)
OCCFace
::
OCCFace
(
GModel
*
m
,
TopoDS_Face
_s
,
int
num
)
:
GFace
(
m
,
num
),
s
(
_s
)
:
GFace
(
m
,
num
),
s
(
TopoDS
::
Face
(
_s
.
Oriented
(
TopAbs_FORWARD
))
)
{
{
setup
();
setup
();
model
()
->
getOCCInternals
()
->
bind
(
s
,
num
);
model
()
->
getOCCInternals
()
->
bind
(
s
,
num
);
...
...
This diff is collapsed.
Click to expand it.
Geo/OCCRegion.cpp
+
9
−
3
View file @
49432c58
...
@@ -36,14 +36,20 @@ void OCCRegion::setup()
...
@@ -36,14 +36,20 @@ void OCCRegion::setup()
for
(
exp3
.
Init
(
shell
,
TopAbs_FACE
);
exp3
.
More
();
exp3
.
Next
()){
for
(
exp3
.
Init
(
shell
,
TopAbs_FACE
);
exp3
.
More
();
exp3
.
Next
()){
TopoDS_Face
face
=
TopoDS
::
Face
(
exp3
.
Current
());
TopoDS_Face
face
=
TopoDS
::
Face
(
exp3
.
Current
());
GFace
*
f
=
model
()
->
getOCCInternals
()
->
getOCCFaceByNativePtr
(
model
(),
face
);
GFace
*
f
=
model
()
->
getOCCInternals
()
->
getOCCFaceByNativePtr
(
model
(),
face
);
if
(
f
){
if
(
!
f
){
Msg
::
Error
(
"Unknown face in region %d"
,
tag
());
}
else
if
(
face
.
Orientation
()
==
TopAbs_INTERNAL
){
Msg
::
Info
(
"Adding embedded face %d"
,
f
->
tag
());
embedded_faces
.
push_back
(
f
);
}
else
{
l_faces
.
push_back
(
f
);
l_faces
.
push_back
(
f
);
f
->
addRegion
(
this
);
f
->
addRegion
(
this
);
}
}
else
Msg
::
Error
(
"Unknown face in region %d"
,
tag
());
}
}
}
}
Msg
::
Debug
(
"OCC Region %d with %d faces"
,
tag
(),
l_faces
.
size
());
Msg
::
Debug
(
"OCC Region %d with %d faces"
,
tag
(),
l_faces
.
size
());
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment