Skip to content

Commit

Permalink
PartDesign: port to use FaceMaker
Browse files Browse the repository at this point in the history 
Minimalistic port. Only re-use code that was duplicate before.
  • Loading branch information
@DeepSOIC
DeepSOIC committed Oct 1, 2016
1 parent da52d8e commit 320763d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 199 deletions.
3 changes: 2 additions & 1 deletion src/Mod/PartDesign/App/FeatureLoft.cpp
View file
Expand Up @@ -42,6 +42,7 @@
#include <Base/Console.h>
#include <Base/Reader.h>
#include <App/Document.h>
#include <Mod/Part/App/FaceMakerCheese.h>

//#include "Body.h"
#include "FeatureLoft.h"
Expand Down Expand Up @@ -151,7 +152,7 @@ App::DocumentObjectExecReturn *Loft::execute(void)
for(std::vector<TopoDS_Wire>& wires : wiresections)
backwires.push_back(wires.back());

TopoDS_Shape back = makeFace(backwires);
TopoDS_Shape back = Part::FaceMakerCheese::makeFace(backwires);

BRepBuilderAPI_Sewing sewer;
sewer.SetTolerance(Precision::Confusion());
Expand Down
5 changes: 3 additions & 2 deletions src/Mod/PartDesign/App/FeaturePipe.cpp
View file
Expand Up @@ -63,6 +63,7 @@
#include <Base/Console.h>
#include <Base/Reader.h>
#include <App/Document.h>
#include <Mod/Part/App/FaceMakerCheese.h>

//#include "Body.h"
#include "FeaturePipe.h"
Expand Down Expand Up @@ -256,8 +257,8 @@ App::DocumentObjectExecReturn *Pipe::execute(void)
}

//build the top and bottom face, sew the shell and build the final solid
TopoDS_Shape front = makeFace(frontwires);
TopoDS_Shape back = makeFace(backwires);
TopoDS_Shape front = Part::FaceMakerCheese::makeFace(frontwires);
TopoDS_Shape back = Part::FaceMakerCheese::makeFace(backwires);

BRepBuilderAPI_Sewing sewer;
sewer.SetTolerance(Precision::Confusion());
Expand Down
192 changes: 2 additions & 190 deletions src/Mod/PartDesign/App/FeatureSketchBased.cpp
View file
Expand Up @@ -77,6 +77,7 @@
#include <App/OriginFeature.h>
#include <App/Document.h>
#include <Mod/Part/App/modelRefine.h>
#include <Mod/Part/App/FaceMakerCheese.h>
#include "FeatureSketchBased.h"
#include "DatumPlane.h"
#include "DatumLine.h"
Expand Down Expand Up @@ -203,7 +204,7 @@ TopoDS_Shape ProfileBased::getVerifiedFace(bool silent) const {
if (result->getTypeId().isDerivedFrom(Part::Part2DObject::getClassTypeId())) {

auto wires = getProfileWires();
return makeFace(wires);
return Part::FaceMakerCheese::makeFace(wires);
}
else if(result->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) {
if(Profile.getSubValues().empty())
Expand Down Expand Up @@ -373,195 +374,6 @@ void ProfileBased::onChanged(const App::Property* prop)
FeatureAddSub::onChanged(prop);
}

bool ProfileBased::isInside(const TopoDS_Wire& wire1, const TopoDS_Wire& wire2) const
{
Bnd_Box box1;
BRepBndLib::Add(wire1, box1);
box1.SetGap(0.0);

Bnd_Box box2;
BRepBndLib::Add(wire2, box2);
box2.SetGap(0.0);

if (box1.IsOut(box2))
return false;

double prec = Precision::Confusion();

BRepBuilderAPI_MakeFace mkFace(wire1);
if (!mkFace.IsDone())
Standard_Failure::Raise("Failed to create a face from wire in sketch");
TopoDS_Face face = validateFace(mkFace.Face());
BRepAdaptor_Surface adapt(face);
IntTools_FClass2d class2d(face, prec);
Handle_Geom_Surface surf = new Geom_Plane(adapt.Plane());
ShapeAnalysis_Surface as(surf);

TopExp_Explorer xp(wire2,TopAbs_VERTEX);
while (xp.More()) {
TopoDS_Vertex v = TopoDS::Vertex(xp.Current());
gp_Pnt p = BRep_Tool::Pnt(v);
gp_Pnt2d uv = as.ValueOfUV(p, prec);
if (class2d.Perform(uv) == TopAbs_IN)
return true;
// TODO: We can make a check to see if all points are inside or all outside
// because otherwise we have some intersections which is not allowed
else
return false;
xp.Next();
}

return false;
}

TopoDS_Face ProfileBased::validateFace(const TopoDS_Face& face) const
{
BRepCheck_Analyzer aChecker(face);
if (!aChecker.IsValid()) {
TopoDS_Wire outerwire = ShapeAnalysis::OuterWire(face);
TopTools_IndexedMapOfShape myMap;
myMap.Add(outerwire);

TopExp_Explorer xp(face,TopAbs_WIRE);
ShapeFix_Wire fix;
fix.SetFace(face);
fix.Load(outerwire);
fix.Perform();
BRepBuilderAPI_MakeFace mkFace(fix.WireAPIMake());
while (xp.More()) {
if (!myMap.Contains(xp.Current())) {
fix.Load(TopoDS::Wire(xp.Current()));
fix.Perform();
mkFace.Add(fix.WireAPIMake());
}
xp.Next();
}

aChecker.Init(mkFace.Face());
if (!aChecker.IsValid()) {
ShapeFix_Shape fix(mkFace.Face());
fix.SetPrecision(Precision::Confusion());
fix.SetMaxTolerance(Precision::Confusion());
fix.SetMaxTolerance(Precision::Confusion());
fix.Perform();
fix.FixWireTool()->Perform();
fix.FixFaceTool()->Perform();
TopoDS_Face fixedFace = TopoDS::Face(fix.Shape());
aChecker.Init(fixedFace);
if (!aChecker.IsValid())
Standard_Failure::Raise("Failed to validate broken face");
return fixedFace;
}
return mkFace.Face();
}

return face;
}

TopoDS_Shape ProfileBased::makeFace(std::list<TopoDS_Wire>& wires) const
{
BRepBuilderAPI_MakeFace mkFace(wires.front());
const TopoDS_Face& face = mkFace.Face();
if (face.IsNull())
return face;
gp_Dir axis(0,0,1);
BRepAdaptor_Surface adapt(face);
if (adapt.GetType() == GeomAbs_Plane) {
axis = adapt.Plane().Axis().Direction();
}

wires.pop_front();
for (std::list<TopoDS_Wire>::iterator it = wires.begin(); it != wires.end(); ++it) {
BRepBuilderAPI_MakeFace mkInnerFace(*it);
const TopoDS_Face& inner_face = mkInnerFace.Face();
if (inner_face.IsNull())
return inner_face; // failure
gp_Dir inner_axis(0,0,1);
BRepAdaptor_Surface adapt(inner_face);
if (adapt.GetType() == GeomAbs_Plane) {
inner_axis = adapt.Plane().Axis().Direction();
}
// It seems that orientation is always 'Forward' and we only have to reverse
// if the underlying plane have opposite normals.
if (axis.Dot(inner_axis) < 0)
it->Reverse();
mkFace.Add(*it);
}
return validateFace(mkFace.Face());
}

TopoDS_Shape ProfileBased::makeFace(const std::vector<TopoDS_Wire>& w) const
{
if (w.empty())
return TopoDS_Shape();

//FIXME: Need a safe method to sort wire that the outermost one comes last
// Currently it's done with the diagonal lengths of the bounding boxes
#if 1
std::vector<TopoDS_Wire> wires = w;
std::sort(wires.begin(), wires.end(), Wire_Compare());
std::list<TopoDS_Wire> wire_list;
wire_list.insert(wire_list.begin(), wires.rbegin(), wires.rend());
#else
//bug #0001133: try alternative sort algorithm
std::list<TopoDS_Wire> unsorted_wire_list;
unsorted_wire_list.insert(unsorted_wire_list.begin(), w.begin(), w.end());
std::list<TopoDS_Wire> wire_list;
Wire_Compare wc;
while (!unsorted_wire_list.empty()) {
std::list<TopoDS_Wire>::iterator w_ref = unsorted_wire_list.begin();
std::list<TopoDS_Wire>::iterator w_it = unsorted_wire_list.begin();
for (++w_it; w_it != unsorted_wire_list.end(); ++w_it) {
if (wc(*w_ref, *w_it))
w_ref = w_it;
}
wire_list.push_back(*w_ref);
unsorted_wire_list.erase(w_ref);
}
#endif

// separate the wires into several independent faces
std::list< std::list<TopoDS_Wire> > sep_wire_list;
while (!wire_list.empty()) {
std::list<TopoDS_Wire> sep_list;
TopoDS_Wire wire = wire_list.front();
wire_list.pop_front();
sep_list.push_back(wire);

std::list<TopoDS_Wire>::iterator it = wire_list.begin();
while (it != wire_list.end()) {
if (isInside(wire, *it)) {
sep_list.push_back(*it);
it = wire_list.erase(it);
}
else {
++it;
}
}

sep_wire_list.push_back(sep_list);
}

if (sep_wire_list.size() == 1) {
std::list<TopoDS_Wire>& wires = sep_wire_list.front();
return makeFace(wires);
}
else if (sep_wire_list.size() > 1) {
TopoDS_Compound comp;
BRep_Builder builder;
builder.MakeCompound(comp);
for (std::list< std::list<TopoDS_Wire> >::iterator it = sep_wire_list.begin(); it != sep_wire_list.end(); ++it) {
TopoDS_Shape aFace = makeFace(*it);
if (!aFace.IsNull())
builder.Add(comp, aFace);
}

return comp;
}
else {
return TopoDS_Shape(); // error
}
}

void ProfileBased::getUpToFaceFromLinkSub(TopoDS_Face& upToFace,
const App::PropertyLinkSub& refFace)
Expand Down
7 changes: 1 addition & 6 deletions src/Mod/PartDesign/App/FeatureSketchBased.h
View file
Expand Up @@ -151,14 +151,9 @@ class PartDesignExport ProfileBased : public PartDesign::FeatureAddSub
/// get Axis from ReferenceAxis
void getAxis(const App::DocumentObject* pcReferenceAxis, const std::vector<std::string>& subReferenceAxis,
Base::Vector3d& base, Base::Vector3d& dir);

TopoDS_Shape makeFace(const std::vector<TopoDS_Wire>&) const;


private:
void onChanged(const App::Property* prop);
TopoDS_Face validateFace(const TopoDS_Face&) const;
TopoDS_Shape makeFace(std::list<TopoDS_Wire>&) const; // for internal use only
bool isInside(const TopoDS_Wire&, const TopoDS_Wire&) const;
bool isParallelPlane(const TopoDS_Shape&, const TopoDS_Shape&) const;
bool isEqualGeometry(const TopoDS_Shape&, const TopoDS_Shape&) const;
bool isQuasiEqual(const TopoDS_Shape&, const TopoDS_Shape&) const;
Expand Down
7 changes: 7 additions & 0 deletions src/Mod/PartDesign/App/PreCompiled.h
View file
Expand Up @@ -37,6 +37,13 @@
# define MeshExport
#endif

#ifdef _MSC_VER
// disable warning triggered by use of Part::FaceMaker
// see forum thread "Warning C4275 non-dll class used as base for dll class"
// http://forum.freecadweb.org/viewtopic.php?f=10&t=17542
# pragma warning( disable : 4275)
#endif

#ifdef _PreComp_

// standard
Expand Down

0 comments on commit 320763d

Please sign in to comment.