From 3ebd7d119b6192a2d2774bc8402e459b791df772 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 3 Feb 2021 16:10:38 +0100 Subject: [PATCH] Part: [skip ci] rename methods in TopoShape that override non-virtual functions of base class --- src/Mod/Part/App/TopoShape.cpp | 10 ++++++++-- src/Mod/Part/App/TopoShape.h | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index 847e0207e0..7ce4568f34 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -704,7 +704,10 @@ Base::Matrix4D TopoShape::getTransform(void) const return mtrx; } -void TopoShape::setPlacement(const Base::Placement& rclTrf) +/*! + * \obsolete + */ +void TopoShape::setShapePlacement(const Base::Placement& rclTrf) { const Base::Vector3d& pos = rclTrf.getPosition(); Base::Vector3d axis; @@ -718,7 +721,10 @@ void TopoShape::setPlacement(const Base::Placement& rclTrf) _Shape.Location(loc); } -Base::Placement TopoShape::getPlacemet(void) const +/*! + * \obsolete + */ +Base::Placement TopoShape::getShapePlacement(void) const { TopLoc_Location loc = _Shape.Location(); gp_Trsf trsf = loc.Transformation(); diff --git a/src/Mod/Part/App/TopoShape.h b/src/Mod/Part/App/TopoShape.h index 2ef6027191..4fd7a5b623 100644 --- a/src/Mod/Part/App/TopoShape.h +++ b/src/Mod/Part/App/TopoShape.h @@ -110,11 +110,11 @@ public: /// set the transformation of the CasCade Shape void setTransform(const Base::Matrix4D& rclTrf); /// set the transformation of the CasCade Shape - void setPlacement(const Base::Placement& rclTrf); + void setShapePlacement(const Base::Placement& rclTrf); + /// get the transformation of the CasCade Shape + Base::Placement getShapePlacement(void) const; /// get the transformation of the CasCade Shape Base::Matrix4D getTransform(void) const; - /// get the transformation of the CasCade Shape - Base::Placement getPlacemet(void) const; /// Bound box from the CasCade shape Base::BoundBox3d getBoundBox(void)const; virtual bool getCenterOfGravity(Base::Vector3d& center) const;