From 11c709d4df08953a70144b2d8bc1901b4473de1e Mon Sep 17 00:00:00 2001 From: PaddleStroke Date: Wed, 7 Jan 2026 19:49:39 +0100 Subject: [PATCH] Merge pull request #26720 from PaddleStroke/patch-971612 Measure: Fix build failure of new MeasureDiameter --- src/Mod/Fem/Gui/TaskCreateElementSet.cpp | 15 +++++++-------- src/Mod/Measure/App/MeasureDiameter.cpp | 2 +- src/Mod/Measure/App/MeasureDiameter.h | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/Mod/Fem/Gui/TaskCreateElementSet.cpp b/src/Mod/Fem/Gui/TaskCreateElementSet.cpp index 75b5d19514..ab357390d1 100644 --- a/src/Mod/Fem/Gui/TaskCreateElementSet.cpp +++ b/src/Mod/Fem/Gui/TaskCreateElementSet.cpp @@ -488,14 +488,13 @@ TaskCreateElementSet::TaskCreateElementSet(Fem::FemSetElementNodesObject* pcObje QMetaObject::connectSlotsByName(this); this->groupLayout()->addWidget(proxy); QObject::connect(ui->toolButton_Poly, &QToolButton::clicked, this, &TaskCreateElementSet::Poly); - QObject::connect(ui->toolButton_Restore, - &QToolButton::clicked, - this, - &TaskCreateElementSet::Restore); - QObject::connect(ui->toolButton_Rename, - &QToolButton::clicked, - this, - &TaskCreateElementSet::CopyResultsMesh); + QObject::connect(ui->toolButton_Restore, &QToolButton::clicked, this, &TaskCreateElementSet::Restore); + QObject::connect( + ui->toolButton_Rename, + &QToolButton::clicked, + this, + &TaskCreateElementSet::CopyResultsMesh + ); // check if the Link to the FemMesh is defined assert(pcObject->FemMesh.getValue()); MeshViewProvider = freecad_cast( diff --git a/src/Mod/Measure/App/MeasureDiameter.cpp b/src/Mod/Measure/App/MeasureDiameter.cpp index 8131250ae0..ae7b0d4d26 100644 --- a/src/Mod/Measure/App/MeasureDiameter.cpp +++ b/src/Mod/Measure/App/MeasureDiameter.cpp @@ -126,7 +126,7 @@ void MeasureDiameter::onChanged(const App::Property* prop) MeasureBase::onChanged(prop); } -Base::Placement MeasureDiameter::getPlacement() +Base::Placement MeasureDiameter::getPlacement() const { auto loc = getMeasureInfoFirst()->pointOnCurve; auto p = Base::Placement(); diff --git a/src/Mod/Measure/App/MeasureDiameter.h b/src/Mod/Measure/App/MeasureDiameter.h index 85d177960a..3acf5c5659 100644 --- a/src/Mod/Measure/App/MeasureDiameter.h +++ b/src/Mod/Measure/App/MeasureDiameter.h @@ -68,7 +68,7 @@ public: return &this->Diameter; } - Base::Placement getPlacement() override; + Base::Placement getPlacement() const override; Base::Vector3d getPointOnCurve() const; std::vector getSubject() const override;