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

Try alternative sort method

Browse Source
This commit is contained in:
wmayer 2013-07-09 10:40:37 +02:00
parent 7e13921de4
commit f86c65644c
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Mod/PartDesign/App/FeatureSketchBased.cpp
View File

@ -23,6 +23,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <functional>
# include <Bnd_Box.hxx>
# include <BRep_Builder.hxx>
# include <BRepBndLib.hxx>
@ -70,7 +71,8 @@
using namespace PartDesign;
// sort bounding boxes according to diagonal length
class SketchBased::Wire_Compare {
class SketchBased::Wire_Compare : public std::binary_function<const TopoDS_Wire&,
const TopoDS_Wire&, bool> {
public:
bool operator() (const TopoDS_Wire& w1, const TopoDS_Wire& w2)
{
@ -362,10 +364,28 @@ TopoDS_Shape SketchBased::makeFace(const std::vector<TopoDS_Wire>& w) const
//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;