suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace BRepTools_ReShape with BRepBuilderAPI_MakeSolid in refinement algorithm

Browse Source
This commit is contained in:
wmayer 2013-08-23 15:25:17 +02:00
parent 723d034cf0
commit 48f8d67b50
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/OpenSCAD/OpenSCADFeatures.py
View File

@ -274,10 +274,7 @@ class RefineShape:
def execute(self, fp):
if fp.Base and fp.Base.Shape.isValid():
sh=fp.Base.Shape.removeSplitter()
if sh.Placement.isNull():
fp.Shape=sh
else:
fp.Shape=sh.transformGeometry(sh.Placement.toMatrix())
fp.Shape=sh
class GetWire:
'''return the first wire from a given shape'''

6
src/Mod/Part/App/TopoShape.cpp
View File

@ -1970,7 +1970,7 @@ TopoDS_Shape TopoShape::removeSplitter() const
if (_Shape.ShapeType() == TopAbs_SOLID) {
const TopoDS_Solid &solid = TopoDS::Solid(_Shape);
BRepTools_ReShape reshape;
BRepBuilderAPI_MakeSolid mkSolid;
TopExp_Explorer it;
for (it.Init(solid, TopAbs_SHELL); it.More(); it.Next()) {
const TopoDS_Shell &currentShell = TopoDS::Shell(it.Current());
@ -1978,7 +1978,7 @@ TopoDS_Shape TopoShape::removeSplitter() const
if (uniter.process()) {
if (uniter.isModified()) {
const TopoDS_Shell &newShell = uniter.getShell();
reshape.Replace(currentShell, newShell);
mkSolid.Add(newShell);
}
}
else {
@ -1986,7 +1986,7 @@ TopoDS_Shape TopoShape::removeSplitter() const
return _Shape;
}
}
return reshape.Apply(solid);
return mkSolid.Solid();
}
else if (_Shape.ShapeType() == TopAbs_SHELL) {
const TopoDS_Shell& shell = TopoDS::Shell(_Shape);

7
src/Mod/Part/App/modelRefine.cpp
View File

@ -39,6 +39,7 @@
#include <BRepLib_MakeWire.hxx>
#include <BRepLib_FuseEdges.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
#include <BRepBuilderAPI_MakeSolid.hxx>
#include <BRepBuilderAPI_Sewing.hxx>
#include <ShapeBuild_ReShape.hxx>
#include <ShapeFix_Face.hxx>
@ -698,7 +699,7 @@ void Part::BRepBuilderAPI_RefineModel::Build()
if (myShape.ShapeType() == TopAbs_SOLID) {
const TopoDS_Solid &solid = TopoDS::Solid(myShape);
BRepTools_ReShape reshape;
BRepBuilderAPI_MakeSolid mkSolid;
TopExp_Explorer it;
for (it.Init(solid, TopAbs_SHELL); it.More(); it.Next()) {
const TopoDS_Shell &currentShell = TopoDS::Shell(it.Current());
@ -706,7 +707,7 @@ void Part::BRepBuilderAPI_RefineModel::Build()
if (uniter.process()) {
if (uniter.isModified()) {
const TopoDS_Shell &newShell = uniter.getShell();
reshape.Replace(currentShell, newShell);
mkSolid.Add(newShell);
LogModifications(uniter);
}
}
@ -714,7 +715,7 @@ void Part::BRepBuilderAPI_RefineModel::Build()
Standard_Failure::Raise("Removing splitter failed");
}
}
myShape = reshape.Apply(solid);
myShape = mkSolid.Solid();
}
else if (myShape.ShapeType() == TopAbs_SHELL) {
const TopoDS_Shell& shell = TopoDS::Shell(myShape);