From 0c1ef0c77fbcf59ef1530458397b78f063af83e1 Mon Sep 17 00:00:00 2001 From: PaddleStroke Date: Thu, 18 Dec 2025 14:04:32 +0100 Subject: [PATCH] Measure: getPlacement const (#26216) * Measure: getPlacement const * Update MeasureBase.h * Update MeasureBase.cpp * Update MeasureArea.h * Update MeasureArea.cpp * Update MeasureLength.h * Update MeasurePosition.cpp * Update MeasureLength.cpp * Update MeasureRadius.cpp * Update MeasurePosition.cpp * Update MeasurePosition.h * Update MeasureRadius.h * Update MeasurePosition.h --- src/Mod/Measure/App/MeasureArea.cpp | 2 +- src/Mod/Measure/App/MeasureArea.h | 2 +- src/Mod/Measure/App/MeasureBase.cpp | 6 ------ src/Mod/Measure/App/MeasureBase.h | 1 - src/Mod/Measure/App/MeasureLength.cpp | 2 +- src/Mod/Measure/App/MeasureLength.h | 2 +- src/Mod/Measure/App/MeasurePosition.cpp | 2 +- src/Mod/Measure/App/MeasurePosition.h | 2 +- src/Mod/Measure/App/MeasureRadius.cpp | 2 +- src/Mod/Measure/App/MeasureRadius.h | 2 +- 10 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/Mod/Measure/App/MeasureArea.cpp b/src/Mod/Measure/App/MeasureArea.cpp index bc2ee93a55..78fbfc6b0c 100644 --- a/src/Mod/Measure/App/MeasureArea.cpp +++ b/src/Mod/Measure/App/MeasureArea.cpp @@ -139,7 +139,7 @@ void MeasureArea::onChanged(const App::Property* prop) } -Base::Placement MeasureArea::getPlacement() +Base::Placement MeasureArea::getPlacement() const { const std::vector& objects = Elements.getValues(); const std::vector& subElements = Elements.getSubValues(); diff --git a/src/Mod/Measure/App/MeasureArea.h b/src/Mod/Measure/App/MeasureArea.h index 0e6298f09a..60c7231958 100644 --- a/src/Mod/Measure/App/MeasureArea.h +++ b/src/Mod/Measure/App/MeasureArea.h @@ -74,7 +74,7 @@ public: } // Return a placement for the viewprovider, just use the first element for now - Base::Placement getPlacement() override; + Base::Placement getPlacement() const override; // Return the object we are measuring std::vector getSubject() const override; diff --git a/src/Mod/Measure/App/MeasureBase.cpp b/src/Mod/Measure/App/MeasureBase.cpp index 4eb3e06e23..127dbe48c5 100644 --- a/src/Mod/Measure/App/MeasureBase.cpp +++ b/src/Mod/Measure/App/MeasureBase.cpp @@ -198,12 +198,6 @@ void MeasureBase::onDocumentRestored() recompute(); } -Base::Placement MeasureBase::getPlacement() -{ - return this->Placement.getValue(); -} - - // Python Drawing feature --------------------------------------------------------- namespace App diff --git a/src/Mod/Measure/App/MeasureBase.h b/src/Mod/Measure/App/MeasureBase.h index 75b84bd218..f9eae63d3e 100644 --- a/src/Mod/Measure/App/MeasureBase.h +++ b/src/Mod/Measure/App/MeasureBase.h @@ -74,7 +74,6 @@ public: { return {}; } - virtual Base::Placement getPlacement(); // Return the objects that are measured virtual std::vector getSubject() const; diff --git a/src/Mod/Measure/App/MeasureLength.cpp b/src/Mod/Measure/App/MeasureLength.cpp index 0a6743557b..c4c3ffad79 100644 --- a/src/Mod/Measure/App/MeasureLength.cpp +++ b/src/Mod/Measure/App/MeasureLength.cpp @@ -134,7 +134,7 @@ void MeasureLength::onChanged(const App::Property* prop) } -Base::Placement MeasureLength::getPlacement() +Base::Placement MeasureLength::getPlacement() const { const std::vector& objects = Elements.getValues(); const std::vector& subElements = Elements.getSubValues(); diff --git a/src/Mod/Measure/App/MeasureLength.h b/src/Mod/Measure/App/MeasureLength.h index eccd68f256..f25e6c0a70 100644 --- a/src/Mod/Measure/App/MeasureLength.h +++ b/src/Mod/Measure/App/MeasureLength.h @@ -71,7 +71,7 @@ public: } // Return a placement for the viewprovider, just use the first element for now - Base::Placement getPlacement() override; + Base::Placement getPlacement() const override; // Return the object we are measuring std::vector getSubject() const override; diff --git a/src/Mod/Measure/App/MeasurePosition.cpp b/src/Mod/Measure/App/MeasurePosition.cpp index 97f2611305..8d57f32a18 100644 --- a/src/Mod/Measure/App/MeasurePosition.cpp +++ b/src/Mod/Measure/App/MeasurePosition.cpp @@ -142,7 +142,7 @@ QString MeasurePosition::getResultString() } -Base::Placement MeasurePosition::getPlacement() +Base::Placement MeasurePosition::getPlacement() const { Base::Placement placement; placement.setPosition(Position.getValue()); diff --git a/src/Mod/Measure/App/MeasurePosition.h b/src/Mod/Measure/App/MeasurePosition.h index 216ecc10bd..047ce62e3f 100644 --- a/src/Mod/Measure/App/MeasurePosition.h +++ b/src/Mod/Measure/App/MeasurePosition.h @@ -74,7 +74,7 @@ public: } QString getResultString() override; - Base::Placement getPlacement() override; + Base::Placement getPlacement() const override; // Return the object we are measuring std::vector getSubject() const override; diff --git a/src/Mod/Measure/App/MeasureRadius.cpp b/src/Mod/Measure/App/MeasureRadius.cpp index ad78eb0b39..09203bd163 100644 --- a/src/Mod/Measure/App/MeasureRadius.cpp +++ b/src/Mod/Measure/App/MeasureRadius.cpp @@ -143,7 +143,7 @@ void MeasureRadius::onChanged(const App::Property* prop) //! return a placement (location + orientation) for the first element -Base::Placement MeasureRadius::getPlacement() +Base::Placement MeasureRadius::getPlacement() const { auto loc = getMeasureInfoFirst()->pointOnCurve; auto p = Base::Placement(); diff --git a/src/Mod/Measure/App/MeasureRadius.h b/src/Mod/Measure/App/MeasureRadius.h index 4b72679187..41687094ff 100644 --- a/src/Mod/Measure/App/MeasureRadius.h +++ b/src/Mod/Measure/App/MeasureRadius.h @@ -74,7 +74,7 @@ public: } // Return a placement for the viewprovider, just use the first element for now - Base::Placement getPlacement() override; + Base::Placement getPlacement() const override; // Return a point on curve for the viewprovider Base::Vector3d getPointOnCurve() const;