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

Line DSH : syntax and remove potential issues. For example in width+length mode, if user input 0 and 0, instead of validating it will unset the spinboxes. Preventing creation of null lines.

Browse Source
This commit is contained in:
Paddle
2023-11-03 18:27:19 +01:00
committed by abdullahtahiriyo
parent 386467e685
commit 48c5a413a3
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -336,20 +336,19 @@ void DSHLineControllerBase::doEnforceControlParameters(Base::Vector2d& onSketchP
else if (handler->constructionMethod() == ConstructionMethod::OnePointLengthAngle) {
Base::Vector2d dir = onSketchPos - handler->startPoint;
if (dir.Length() < Precision::Confusion()) {
dir.x = 1.0; // if direction null, default to (1,0)
}
double length = dir.Length();
if (onViewParameters[OnViewParameter::Third]->isSet) {
length = onViewParameters[OnViewParameter::Third]->getValue();
if (length < Precision::Confusion()) {
unsetOnViewParameter(onViewParameters[OnViewParameter::Third].get());
return;
}
else {
if (dir.Length() < Precision::Confusion()) {
dir.x = 1; // if direction cannot be determined, default to (1,0)
}
onSketchPos = handler->startPoint + length * dir.Normalize();
}
onSketchPos = handler->startPoint + length * dir.Normalize();
}
if (onViewParameters[OnViewParameter::Fourth]->isSet) {
@@ -367,6 +366,13 @@ void DSHLineControllerBase::doEnforceControlParameters(Base::Vector2d& onSketchP
onSketchPos.y = onViewParameters[OnViewParameter::Fourth]->getValue();
}
}
if (onViewParameters[OnViewParameter::Third]->isSet
&& onViewParameters[OnViewParameter::Fourth]->isSet
&& (onSketchPos - handler->startPoint).Length() < Precision::Confusion()) {
unsetOnViewParameter(onViewParameters[OnViewParameter::Third].get());
unsetOnViewParameter(onViewParameters[OnViewParameter::Fourth].get());
}
} break;
default:
break;