-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
OCC: add fillet, removeFaces, fillHole
- Loading branch information
Showing
9 changed files
with
411 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* | ||
| Copyright 2013-2024 Onera. | ||
| This file is part of Cassiopee. | ||
| Cassiopee is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation, either version 3 of the License, or | ||
| (at your option) any later version. | ||
| Cassiopee is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
| You should have received a copy of the GNU General Public License | ||
| along with Cassiopee. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| // Add fillet from edges | ||
| #include "occ.h" | ||
|
|
||
| #include "TopoDS.hxx" | ||
| #include "BRep_Tool.hxx" | ||
| #include "TopExp.hxx" | ||
| #include "TopExp_Explorer.hxx" | ||
| #include "TopTools_IndexedMapOfShape.hxx" | ||
| #include "ShapeBuild_ReShape.hxx" | ||
| #include "BRep_Builder.hxx" | ||
| #include "BRepFilletAPI_MakeFillet.hxx" | ||
|
|
||
| //===================================================================== | ||
| // Remove some faces and rebuild compound | ||
| //===================================================================== | ||
| PyObject* K_OCC::addFillet(PyObject* self, PyObject* args) | ||
| { | ||
| PyObject* hook; PyObject* listEdges; E_Float radius; | ||
| if (!PYPARSETUPLE_(args, OO_ R_, &hook, &listEdges, &radius)) return NULL; | ||
|
|
||
| void** packet = NULL; | ||
| #if (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 7) || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 1) | ||
| packet = (void**) PyCObject_AsVoidPtr(hook); | ||
| #else | ||
| packet = (void**) PyCapsule_GetPointer(hook, NULL); | ||
| #endif | ||
|
|
||
| // get top shape | ||
| TopoDS_Shape* shp = (TopoDS_Shape*)packet[0]; | ||
| TopTools_IndexedMapOfShape& edges = *(TopTools_IndexedMapOfShape*)packet[2]; | ||
| TopTools_IndexedMapOfShape& surfaces = *(TopTools_IndexedMapOfShape*)packet[1]; | ||
|
|
||
| // get edges | ||
| BRepFilletAPI_MakeFillet mkFillet(*shp); | ||
| for (E_Int no = 0; no < PyList_Size(listEdges); no++) | ||
| { | ||
| PyObject* noEdgeO = PyList_GetItem(listEdges, no); | ||
| E_Int noEdge = PyInt_AsLong(noEdgeO); | ||
| const TopoDS_Edge& E = TopoDS::Edge(edges(noEdge)); | ||
| mkFillet.Add(radius, E); | ||
| } | ||
| TopoDS_Shape shc = mkFillet.Shape(); | ||
|
|
||
| // export | ||
| delete shp; | ||
| TopoDS_Shape* newshp = new TopoDS_Shape(shc); | ||
|
|
||
| // Export | ||
| packet[0] = newshp; | ||
| TopTools_IndexedMapOfShape* ptr = (TopTools_IndexedMapOfShape*)packet[1]; | ||
| delete ptr; | ||
| TopTools_IndexedMapOfShape* sf = new TopTools_IndexedMapOfShape(); | ||
| TopExp::MapShapes(*newshp, TopAbs_FACE, *sf); | ||
| packet[1] = sf; | ||
| TopTools_IndexedMapOfShape* ptr2 = (TopTools_IndexedMapOfShape*)packet[2]; | ||
| delete ptr2; | ||
| TopTools_IndexedMapOfShape* se = new TopTools_IndexedMapOfShape(); | ||
| TopExp::MapShapes(*newshp, TopAbs_EDGE, *se); | ||
| packet[2] = se; | ||
| printf("INFO: after removeFaces: Nb edges=%d\n", se->Extent()); | ||
| printf("INFO: after removeFaces: Nb faces=%d\n", sf->Extent()); | ||
|
|
||
| Py_INCREF(Py_None); | ||
| return Py_None; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /* | ||
| Copyright 2013-2024 Onera. | ||
| This file is part of Cassiopee. | ||
| Cassiopee is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation, either version 3 of the License, or | ||
| (at your option) any later version. | ||
| Cassiopee is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
| You should have received a copy of the GNU General Public License | ||
| along with Cassiopee. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| // Fill hole from edges | ||
| #include "occ.h" | ||
|
|
||
| #include "TopoDS.hxx" | ||
| #include "BRep_Tool.hxx" | ||
| #include "TopExp.hxx" | ||
| #include "TopExp_Explorer.hxx" | ||
| #include "TopTools_IndexedMapOfShape.hxx" | ||
| #include "ShapeBuild_ReShape.hxx" | ||
| #include "BRep_Builder.hxx" | ||
| #include "BRepBuilderAPI_MakeWire.hxx" | ||
| #include "BRepBuilderAPI_MakeFace.hxx" | ||
|
|
||
| //===================================================================== | ||
| // Remove some faces and rebuild compound | ||
| //===================================================================== | ||
| PyObject* K_OCC::fillHole(PyObject* self, PyObject* args) | ||
| { | ||
| PyObject* hook; PyObject* listEdges; | ||
| if (!PYPARSETUPLE_(args, OO_, &hook, &listEdges)) return NULL; | ||
|
|
||
| void** packet = NULL; | ||
| #if (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 7) || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 1) | ||
| packet = (void**) PyCObject_AsVoidPtr(hook); | ||
| #else | ||
| packet = (void**) PyCapsule_GetPointer(hook, NULL); | ||
| #endif | ||
|
|
||
| // get top shape | ||
| TopoDS_Shape* shp = (TopoDS_Shape*)packet[0]; | ||
| TopTools_IndexedMapOfShape& edges = *(TopTools_IndexedMapOfShape*)packet[2]; | ||
| TopTools_IndexedMapOfShape& surfaces = *(TopTools_IndexedMapOfShape*)packet[1]; | ||
|
|
||
| // get edges and make a wire | ||
| BRepBuilderAPI_MakeWire wireMaker; | ||
| for (E_Int no = 0; no < PyList_Size(listEdges); no++) | ||
| { | ||
| PyObject* noEdgeO = PyList_GetItem(listEdges, no); | ||
| E_Int noEdge = PyInt_AsLong(noEdgeO); | ||
| const TopoDS_Edge& E = TopoDS::Edge(edges(noEdge)); | ||
| wireMaker.Add(E); | ||
| } | ||
| TopoDS_Wire myWire = wireMaker.Wire(); | ||
|
|
||
| // Build face on wire | ||
| BRepBuilderAPI_MakeFace faceMaker(myWire); | ||
| //faceMaker.Add(myWire); | ||
| TopoDS_Face F = faceMaker.Face(); | ||
|
|
||
| // Add face to shape | ||
| //ShapeBuild_ReShape reshaper; | ||
| //reshaper.Add(F); // no add | ||
| //TopoDS_Shape shc = reshaper.Apply(*shp); | ||
|
|
||
| TopoDS_Compound shc; | ||
| BRep_Builder aBuilder; | ||
| aBuilder.MakeCompound(shc); | ||
| aBuilder.Add(shc, *shp); | ||
| aBuilder.Add(shc, F); | ||
|
|
||
| // export | ||
| delete shp; | ||
| TopoDS_Shape* newshp = new TopoDS_Shape(shc); | ||
|
|
||
| // Export | ||
| packet[0] = newshp; | ||
| TopTools_IndexedMapOfShape* ptr = (TopTools_IndexedMapOfShape*)packet[1]; | ||
| delete ptr; | ||
| TopTools_IndexedMapOfShape* sf = new TopTools_IndexedMapOfShape(); | ||
| TopExp::MapShapes(*newshp, TopAbs_FACE, *sf); | ||
| packet[1] = sf; | ||
| TopTools_IndexedMapOfShape* ptr2 = (TopTools_IndexedMapOfShape*)packet[2]; | ||
| delete ptr2; | ||
| TopTools_IndexedMapOfShape* se = new TopTools_IndexedMapOfShape(); | ||
| TopExp::MapShapes(*newshp, TopAbs_EDGE, *se); | ||
| packet[2] = se; | ||
| printf("INFO: after removeFaces: Nb edges=%d\n", se->Extent()); | ||
| printf("INFO: after removeFaces: Nb faces=%d\n", sf->Extent()); | ||
|
|
||
| Py_INCREF(Py_None); | ||
| return Py_None; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.