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

PD: rename getUpToFaceFromLinkSub to getFaceFromLinkSub

Browse Source
This commit is contained in:
wmayer
2022-07-16 15:59:54 +02:00
parent eec258ab37
commit 423aaccd3f
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/PartDesign/App/FeaturePad.cpp
View File

@@ -154,7 +154,7 @@ App::DocumentObjectExecReturn *Pad::execute()
// Find a valid face or datum plane to extrude up to
TopoDS_Face upToFace;
if (method == "UpToFace") {
getUpToFaceFromLinkSub(upToFace, UpToFace);
getFaceFromLinkSub(upToFace, UpToFace);
upToFace.Move(invObjLoc);
}
getUpToFace(upToFace, base, supportface, sketchshape, method, dir);

2
src/Mod/PartDesign/App/FeaturePocket.cpp
View File

@@ -164,7 +164,7 @@ App::DocumentObjectExecReturn *Pocket::execute()
// Find a valid face or datum plane to extrude up to
TopoDS_Face upToFace;
if (method == "UpToFace") {
getUpToFaceFromLinkSub(upToFace, UpToFace);
getFaceFromLinkSub(upToFace, UpToFace);
upToFace.Move(invObjLoc);
}
getUpToFace(upToFace, base, supportface, profileshape, method, dir);

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

@@ -333,7 +333,6 @@ const TopoDS_Face ProfileBased::getSupportFace() const {
}
}
return TopoDS::Face(Feature::makeShapeFromPlane(sketch));
}
int ProfileBased::getSketchAxisCount(void) const
@@ -396,14 +395,13 @@ void ProfileBased::onChanged(const App::Property* prop)
}
void ProfileBased::getUpToFaceFromLinkSub(TopoDS_Face& upToFace,
const App::PropertyLinkSub& refFace)
void ProfileBased::getFaceFromLinkSub(TopoDS_Face& upToFace, const App::PropertyLinkSub& refFace)
{
App::DocumentObject* ref = refFace.getValue();
std::vector<std::string> subStrings = refFace.getSubValues();
if (ref == nullptr)
throw Base::ValueError("SketchBased: Up to face: No face selected");
throw Base::ValueError("SketchBased: No face selected");
if (ref->getTypeId().isDerivedFrom(App::Plane::getClassTypeId())) {
upToFace = TopoDS::Face(makeShapeFromPlane(ref));
@@ -416,16 +414,16 @@ void ProfileBased::getUpToFaceFromLinkSub(TopoDS_Face& upToFace,
}
if (!ref->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId()))
throw Base::TypeError("SketchBased: Up to face: Must be face of a feature");
throw Base::TypeError("SketchBased: Must be face of a feature");
Part::TopoShape baseShape = static_cast<Part::Feature*>(ref)->Shape.getShape();
if (subStrings.empty() || subStrings[0].empty())
throw Base::ValueError("SketchBased: Up to face: No face selected");
throw Base::ValueError("SketchBased: No face selected");
// TODO: Check for multiple UpToFaces?
upToFace = TopoDS::Face(baseShape.getSubShape(subStrings[0].c_str()));
if (upToFace.IsNull())
throw Base::ValueError("SketchBased: Up to face: Failed to extract face");
throw Base::ValueError("SketchBased: Failed to extract face");
}
void ProfileBased::getUpToFace(TopoDS_Face& upToFace,

4
src/Mod/PartDesign/App/FeatureSketchBased.h
View File

@@ -125,8 +125,8 @@ protected:
void remapSupportShape(const TopoDS_Shape&);
/// Extract a face from a given LinkSub
static void getUpToFaceFromLinkSub(TopoDS_Face& upToFace,
const App::PropertyLinkSub& refFace);
static void getFaceFromLinkSub(TopoDS_Face& upToFace,
const App::PropertyLinkSub& refFace);
/// Find a valid face to extrude up to
static void getUpToFace(TopoDS_Face& upToFace,