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

Improved chamfer behavior when faces are selected

Browse Source 
Improved chamfer behavior when faces are selected and non equal chamfer types are used
This commit is contained in:
troyp76
2021-09-18 01:03:09 +10:00
parent 7a1f16774d
commit b3dbcd9ff8
3 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Mod/PartDesign/App/FeatureChamfer.cpp
View File

@@ -115,7 +115,9 @@ App::DocumentObjectExecReturn *Chamfer::execute(void)
}
std::vector<std::string> SubNames = std::vector<std::string>(Base.getSubValues());
getContinuousEdges(TopShape, SubNames);
std::vector<std::string> FaceNames;
getContinuousEdges(TopShape, SubNames, FaceNames);
if (SubNames.size() == 0)
return new App::DocumentObjectExecReturn("No edges specified");
@@ -138,16 +140,35 @@ App::DocumentObjectExecReturn *Chamfer::execute(void)
try {
BRepFilletAPI_MakeChamfer mkChamfer(baseShape.getShape());
TopTools_IndexedMapOfShape mapOfEdges;
TopTools_IndexedDataMapOfShapeListOfShape mapEdgeFace;
TopExp::MapShapesAndAncestors(baseShape.getShape(), TopAbs_EDGE, TopAbs_FACE, mapEdgeFace);
TopExp::MapShapes(baseShape.getShape(), TopAbs_EDGE, mapOfEdges);
for (std::vector<std::string>::const_iterator it=SubNames.begin(); it != SubNames.end(); ++it) {
TopoDS_Edge edge = TopoDS::Edge(baseShape.getSubShape(it->c_str()));
const TopoDS_Face& face = (chamferType != 0 && flipDirection) ?
TopoDS::Face(mapEdgeFace.FindFromKey(edge).Last()) :
TopoDS::Face(mapEdgeFace.FindFromKey(edge).First());
for (const auto &itSN : SubNames) {
TopoDS_Edge edge = TopoDS::Edge(baseShape.getSubShape(itSN.c_str()));
const TopoDS_Shape& faceLast = mapEdgeFace.FindFromKey(edge).Last();
const TopoDS_Shape& faceFirst = mapEdgeFace.FindFromKey(edge).First();
// Set the face based on flipDirection for all edges by default. Note for chamferType==0 it does not matter which face is used.
TopoDS_Face face = TopoDS::Face( flipDirection ? faceLast : faceFirst );
// for chamfer types otherthan Equal (type = 0) check if one of the faces associated with the edge
// is one of the originally selected faces. If so use the other face by default or the selected face if "flipDirection" is set
if (chamferType != 0) {
// for each selected face
for (const auto &itFN : FaceNames) {
const TopoDS_Shape selFace = baseShape.getSubShape(itFN.c_str());
if ( faceLast.IsEqual(selFace) )
face = TopoDS::Face( flipDirection ? faceFirst : faceLast );
else if ( faceFirst.IsEqual(selFace) )
face = TopoDS::Face( flipDirection ? faceLast : faceFirst );
}
}
switch (chamferType) {
case 0: // Equal distance
mkChamfer.Add(size, size, edge, face);

8
src/Mod/PartDesign/App/FeatureDressUp.cpp
View File

@@ -99,6 +99,13 @@ Part::Feature *DressUp::getBaseObject(bool silent) const
void DressUp::getContinuousEdges(Part::TopoShape TopShape, std::vector< std::string >& SubNames) {
std::vector< std::string > FaceNames;
getContinuousEdges(TopShape, SubNames, FaceNames);
}
void DressUp::getContinuousEdges(Part::TopoShape TopShape, std::vector< std::string >& SubNames, std::vector< std::string >& FaceNames) {
TopTools_IndexedMapOfShape mapOfEdges;
TopTools_IndexedDataMapOfShapeListOfShape mapEdgeFace;
TopExp::MapShapesAndAncestors(TopShape.getShape(), TopAbs_EDGE, TopAbs_FACE, mapEdgeFace);
@@ -153,6 +160,7 @@ void DressUp::getContinuousEdges(Part::TopoShape TopShape, std::vector< std::str
}
FaceNames.push_back(aSubName.c_str());
SubNames.erase(SubNames.begin()+i);
}
// empty name or any other sub-element

2
src/Mod/PartDesign/App/FeatureDressUp.h
View File

@@ -59,6 +59,8 @@ public:
/// extracts all edges from the subshapes (including face edges) and furthermore adds
/// all C0 continuous edges to the vector
void getContinuousEdges(Part::TopoShape, std::vector< std::string >&);
// add argument to return the selected face that edges were derived from
void getContinuousEdges(Part::TopoShape, std::vector< std::string >&, std::vector< std::string >&);
virtual void getAddSubShape(Part::TopoShape &addShape, Part::TopoShape &subShape);