From 9f8d752cc095bb7537e930f81d6a641d9f5778d8 Mon Sep 17 00:00:00 2001 From: tetektoza Date: Mon, 29 Sep 2025 19:58:40 +0200 Subject: [PATCH] Sketcher: Remove isSet checks that were replaced by hasFinishedEditing --- src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h | 5 ++--- src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h | 5 ++--- src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h | 10 ++++------ src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h | 10 ++++------ src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h | 5 ++--- src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h | 8 +++----- 6 files changed, 17 insertions(+), 26 deletions(-) diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h index f97793f3a1..90cdb653cc 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h @@ -613,9 +613,8 @@ void DSHArcControllerBase::doEnforceControlParameters(Base::Vector2d& onSketchPo if (fourthParam->isSet) { onSketchPos.y = fourthParam->getValue(); } - if (thirdParam->isSet && fourthParam->isSet - && (onSketchPos - handler->firstPoint).Length() < Precision::Confusion() - && thirdParam->hasFinishedEditing && fourthParam->hasFinishedEditing) { + if (thirdParam->hasFinishedEditing && fourthParam->hasFinishedEditing + && (onSketchPos - handler->firstPoint).Length() < Precision::Confusion()) { unsetOnViewParameter(thirdParam.get()); unsetOnViewParameter(fourthParam.get()); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h index 29ef65ff74..c128ee51db 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h @@ -1057,9 +1057,8 @@ void DSHBSplineControllerBase::doEnforceControlParameters(Base::Vector2d& onSket onSketchPos.y = prevPoint.y + sin(angle) * length; } - if (thirdParam->isSet && fourthParam->isSet - && (onSketchPos - prevPoint).Length() < Precision::Confusion() - && thirdParam->hasFinishedEditing && fourthParam->hasFinishedEditing) { + if (thirdParam->hasFinishedEditing && fourthParam->hasFinishedEditing + && (onSketchPos - prevPoint).Length() < Precision::Confusion()) { unsetOnViewParameter(thirdParam.get()); unsetOnViewParameter(fourthParam.get()); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h index a2e0b4cf96..440f3371f1 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h @@ -508,9 +508,8 @@ void DSHCircleControllerBase::doEnforceControlParameters(Base::Vector2d& onSketc onSketchPos.y = fourthParam->getValue(); } - if (thirdParam->isSet && fourthParam->isSet - && (onSketchPos - handler->firstPoint).Length() < Precision::Confusion() - && thirdParam->hasFinishedEditing && fourthParam->hasFinishedEditing) { + if (thirdParam->hasFinishedEditing && fourthParam->hasFinishedEditing + && (onSketchPos - handler->firstPoint).Length() < Precision::Confusion()) { unsetOnViewParameter(thirdParam.get()); unsetOnViewParameter(fourthParam.get()); } @@ -527,9 +526,8 @@ void DSHCircleControllerBase::doEnforceControlParameters(Base::Vector2d& onSketc if (sixthParam->isSet) { onSketchPos.y = sixthParam->getValue(); } - if (fifthParam->isSet && sixthParam->isSet - && areCollinear(handler->firstPoint, handler->secondPoint, onSketchPos) - && fifthParam->hasFinishedEditing && sixthParam->hasFinishedEditing) { + if (fifthParam->hasFinishedEditing && sixthParam->hasFinishedEditing + && areCollinear(handler->firstPoint, handler->secondPoint, onSketchPos)) { unsetOnViewParameter(fifthParam.get()); unsetOnViewParameter(sixthParam.get()); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h index 634758e80e..9408beab2d 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h @@ -581,9 +581,8 @@ void DSHEllipseControllerBase::doEnforceControlParameters(Base::Vector2d& onSket onSketchPos.y = fourthParam->getValue(); } - if (thirdParam->isSet && fourthParam->isSet - && (onSketchPos - handler->apoapsis).Length() < Precision::Confusion() - && thirdParam->hasFinishedEditing && fourthParam->hasFinishedEditing) { + if (thirdParam->hasFinishedEditing && fourthParam->hasFinishedEditing + && (onSketchPos - handler->apoapsis).Length() < Precision::Confusion()) { unsetOnViewParameter(thirdParam.get()); unsetOnViewParameter(fourthParam.get()); } @@ -613,9 +612,8 @@ void DSHEllipseControllerBase::doEnforceControlParameters(Base::Vector2d& onSket onSketchPos.y = sixthParam->getValue(); } - if (fifthParam->isSet && sixthParam->isSet - && areCollinear(handler->apoapsis, handler->periapsis, onSketchPos) - && fifthParam->hasFinishedEditing && sixthParam->hasFinishedEditing) { + if (fifthParam->hasFinishedEditing && sixthParam->hasFinishedEditing + && areCollinear(handler->apoapsis, handler->periapsis, onSketchPos)) { unsetOnViewParameter(fifthParam.get()); unsetOnViewParameter(sixthParam.get()); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h index cf33374366..5ff0a6238c 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h @@ -486,9 +486,8 @@ void DSHLineControllerBase::doEnforceControlParameters(Base::Vector2d& onSketchP } } - if (thirdParam->isSet && fourthParam->isSet - && (onSketchPos - handler->startPoint).Length() < Precision::Confusion() - && thirdParam->hasFinishedEditing && fourthParam->hasFinishedEditing) { + if (thirdParam->hasFinishedEditing && fourthParam->hasFinishedEditing + && (onSketchPos - handler->startPoint).Length() < Precision::Confusion()) { unsetOnViewParameter(thirdParam.get()); unsetOnViewParameter(fourthParam.get()); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h index cd6d916c5d..679007857d 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h @@ -2048,11 +2048,9 @@ void DSHRectangleControllerBase::doEnforceControlParameters(Base::Vector2d& onSk if (onViewParameters[OnViewParameter::Fourth]->isSet) { onSketchPos.y = onViewParameters[OnViewParameter::Fourth]->getValue(); } - if (onViewParameters[OnViewParameter::Third]->isSet - && onViewParameters[OnViewParameter::Fourth]->isSet - && (onSketchPos - handler->center).Length() < Precision::Confusion() - && onViewParameters[OnViewParameter::Third]->hasFinishedEditing - && onViewParameters[OnViewParameter::Fourth]->hasFinishedEditing) { + if (onViewParameters[OnViewParameter::Third]->hasFinishedEditing + && onViewParameters[OnViewParameter::Fourth]->hasFinishedEditing + && (onSketchPos - handler->center).Length() < Precision::Confusion()) { unsetOnViewParameter(onViewParameters[OnViewParameter::Third].get()); unsetOnViewParameter(onViewParameters[OnViewParameter::Fourth].get()); }