kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Sketcher: Remove isSet checks that were replaced by hasFinishedEditing

Browse Source
This commit is contained in:
tetektoza
2025-09-29 19:58:40 +02:00
parent aadb436b0e
commit 9f8d752cc0
6 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h
View File

@@ -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());
}

5
src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h
View File

@@ -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());
}

10
src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h
View File

@@ -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());
}

10
src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h
View File

@@ -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());
}

5
src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h
View File

@@ -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());
}

8
src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h
View File

@@ -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());
}