From 423aaccd3f8c9efaea5df07669800060f74f98f6 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 16 Jul 2022 15:59:54 +0200 Subject: [PATCH] PD: rename getUpToFaceFromLinkSub to getFaceFromLinkSub --- src/Mod/PartDesign/App/FeaturePad.cpp | 2 +- src/Mod/PartDesign/App/FeaturePocket.cpp | 2 +- src/Mod/PartDesign/App/FeatureSketchBased.cpp | 12 +++++------- src/Mod/PartDesign/App/FeatureSketchBased.h | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/Mod/PartDesign/App/FeaturePad.cpp b/src/Mod/PartDesign/App/FeaturePad.cpp index 6e5ad701f1..e8cc92f7f5 100644 --- a/src/Mod/PartDesign/App/FeaturePad.cpp +++ b/src/Mod/PartDesign/App/FeaturePad.cpp @@ -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); diff --git a/src/Mod/PartDesign/App/FeaturePocket.cpp b/src/Mod/PartDesign/App/FeaturePocket.cpp index 2499fb41ef..ce56376098 100644 --- a/src/Mod/PartDesign/App/FeaturePocket.cpp +++ b/src/Mod/PartDesign/App/FeaturePocket.cpp @@ -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); diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.cpp b/src/Mod/PartDesign/App/FeatureSketchBased.cpp index 17a4860755..59e804fbc2 100644 --- a/src/Mod/PartDesign/App/FeatureSketchBased.cpp +++ b/src/Mod/PartDesign/App/FeatureSketchBased.cpp @@ -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 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(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, diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.h b/src/Mod/PartDesign/App/FeatureSketchBased.h index fd1e4af0be..c93900e6d0 100644 --- a/src/Mod/PartDesign/App/FeatureSketchBased.h +++ b/src/Mod/PartDesign/App/FeatureSketchBased.h @@ -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,