kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Part/Toponaming: Transfer WireJoiner

Browse Source 
* Applied modifications to reduce the number of Lint warnings (round 3)
 * Added note about the WireJoiner class in Mod/CAM/App/Area.cpp
This commit is contained in:
CalligaroV
2024-03-19 09:41:51 +01:00
parent 11da8d9c0a
commit 6d9c49e454
3 changed files with 1649 additions and 1102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/CAM/App/Area.cpp
View File

@@ -756,7 +756,12 @@ static inline void getEndPoints(const TopoDS_Wire& wire, gp_Pnt& p1, gp_Pnt& p2)
p2 = BRep_Tool::Pnt(TopoDS::Vertex(xp.CurrentVertex()));
}
// Toponaming integration note: there's a new class called WireJoiner in Mod/Part/App/ that has been
// imported from RT's fork. Is's an improved version of the following struct, therefor
// probably at some point this struct should be replaced with the new imported class.
// See https://github.com/realthunder/FreeCAD/blob/LinkStable/src/Mod/Part/App/WireJoiner.h for the
// original implementation of the class and https://github.com/FreeCAD/FreeCAD/pull/12535 for the
// import conversation.
struct WireJoiner {
using Box = bg::model::box<gp_Pnt>;

2734
src/Mod/Part/App/WireJoiner.cpp
View File

File diff suppressed because it is too large Load Diff

10
src/Mod/Part/App/WireJoiner.h
View File

@@ -33,7 +33,7 @@ namespace Part{
class PartExport WireJoiner: public BRepBuilderAPI_MakeShape {
public:
WireJoiner();
virtual ~WireJoiner();
~WireJoiner() override;
void addShape(const TopoShape &shape);
void addShape(const std::vector<TopoShape> &shapes);
@@ -43,7 +43,7 @@ public:
void setTightBound(bool enable=true);
void setSplitEdges(bool enable=true);
void setMergeEdges(bool enable=true);
void setTolerance(double tolerance, double angularTol=0.0);
void setTolerance(double tolerance, double atol=0.0);
bool getOpenWires(TopoShape &shape, const char *op="", bool noOriginal=true);
bool getResultWires(TopoShape &shape, const char *op="");
@@ -53,9 +53,9 @@ public:
#else
void Build(const Message_ProgressRange& theRange = Message_ProgressRange()) override;
#endif
const TopTools_ListOfShape& Modified (const TopoDS_Shape& S) override;
const TopTools_ListOfShape& Generated (const TopoDS_Shape& S) override;
Standard_Boolean IsDeleted (const TopoDS_Shape& S) override;
const TopTools_ListOfShape& Modified (const TopoDS_Shape& SThatModifies) override;
const TopTools_ListOfShape& Generated (const TopoDS_Shape& SThatGenerates) override;
Standard_Boolean IsDeleted (const TopoDS_Shape& SDeleted) override;
private:
class WireJoinerP;