From 8f8eda9fa2b140661824e240099d9fd115bb007e Mon Sep 17 00:00:00 2001 From: hlorus Date: Thu, 4 Jan 2024 11:07:59 +0100 Subject: [PATCH] MeasureRadius: Display label on curve rather than curve center --- src/Mod/Measure/App/MeasureBase.h | 1 - src/Mod/Measure/App/MeasureRadius.cpp | 5 ++++- src/Mod/Measure/App/MeasureRadius.h | 13 ------------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/Mod/Measure/App/MeasureBase.h b/src/Mod/Measure/App/MeasureBase.h index c9daa52076512..1bce8c9dd2382 100644 --- a/src/Mod/Measure/App/MeasureBase.h +++ b/src/Mod/Measure/App/MeasureBase.h @@ -38,7 +38,6 @@ #include -// TODO: this is the base for the MeasureXXXXX classes. It should be renamed to MeasureBase and moved to Mod/Measure/App namespace Measure { diff --git a/src/Mod/Measure/App/MeasureRadius.cpp b/src/Mod/Measure/App/MeasureRadius.cpp index fb0ce29ef7192..0d454073cc94f 100644 --- a/src/Mod/Measure/App/MeasureRadius.cpp +++ b/src/Mod/Measure/App/MeasureRadius.cpp @@ -176,7 +176,10 @@ void MeasureRadius::onChanged(const App::Property* prop) //! return a placement (location + orientation) for the first element Base::Placement MeasureRadius::getPlacement() { - return getMeasureInfoFirst().placement; + auto loc = getMeasureInfoFirst().pointOnCurve; + auto p = Base::Placement(); + p.setPosition(loc); + return p; } diff --git a/src/Mod/Measure/App/MeasureRadius.h b/src/Mod/Measure/App/MeasureRadius.h index ded73b3ec3ec8..272f306461f29 100644 --- a/src/Mod/Measure/App/MeasureRadius.h +++ b/src/Mod/Measure/App/MeasureRadius.h @@ -26,25 +26,12 @@ #include -/*#include */ -/*#include */ -/*#include */ -/*#include */ - -/*#include */ -/*#include */ -/*#include */ -/*#include */ -/*#include */ - #include #include #include #include #include -//#include - #include "MeasureBase.h" namespace Measure