electron-rare/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sketcher: Dimension tool: don't update distance type based on position for horizontal/vert

Browse Source
This commit is contained in:
PaddleStroke
2026-03-11 05:36:10 +01:00
committed by Benjamin Nauck
parent 065315d7a4
commit 76a84f63ab
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Mod/Sketcher/Gui/CommandConstraints.cpp
+14 -6
View File
@@ -3065,13 +3065,23 @@ protected:
pnt2 = Obj->getPoint(selPoints[1].GeoId, selPoints[1].PosId);
}
bool isHorizontal = std::abs(pnt1.y - pnt2.y) < Precision::Confusion();
bool isVertical = std::abs(pnt1.x - pnt2.x) < Precision::Confusion();
double minX, minY, maxX, maxY;
minX = min(pnt1.x, pnt2.x);
maxX = max(pnt1.x, pnt2.x);
minY = min(pnt1.y, pnt2.y);
maxY = max(pnt1.y, pnt2.y);
if (onSketchPos.x > minX && onSketchPos.x < maxX
&& (onSketchPos.y < minY || onSketchPos.y > maxY) && type != Sketcher::DistanceX) {
bool isInDistanceXZone = onSketchPos.x > minX && onSketchPos.x < maxX
&& (onSketchPos.y < minY || onSketchPos.y > maxY);
bool isInDistanceYZone = onSketchPos.y > minY && onSketchPos.y < maxY
&& (onSketchPos.x < minX || onSketchPos.x > maxX);
bool isInDistanceZone = ((onSketchPos.y < minY || onSketchPos.y > maxY) && (onSketchPos.x < minX || onSketchPos.x > maxX))
|| (onSketchPos.y > minY && onSketchPos.y < maxY && onSketchPos.x > minX && onSketchPos.x < maxX);
if ((isHorizontal || isInDistanceXZone) && type != Sketcher::DistanceX) {
restartCommand(QT_TRANSLATE_NOOP("Command", "Add DistanceX constraint"));
specialConstraint = SpecialConstraint::LineOr2PointsDistance;
if (selLine.size() == 1) {
@@ -3081,8 +3091,7 @@ protected:
createDistanceXYConstrain(Sketcher::DistanceX, selPoints[0].GeoId, selPoints[0].PosId, selPoints[1].GeoId, selPoints[1].PosId, onSketchPos);
}
}
else if (onSketchPos.y > minY && onSketchPos.y < maxY
&& (onSketchPos.x < minX || onSketchPos.x > maxX) && type != Sketcher::DistanceY) {
else if ((isVertical || isInDistanceYZone) && type != Sketcher::DistanceY) {
restartCommand(QT_TRANSLATE_NOOP("Command", "Add DistanceY constraint"));
specialConstraint = SpecialConstraint::LineOr2PointsDistance;
if (selLine.size() == 1) {
@@ -3092,8 +3101,7 @@ protected:
createDistanceXYConstrain(Sketcher::DistanceY, selPoints[0].GeoId, selPoints[0].PosId, selPoints[1].GeoId, selPoints[1].PosId, onSketchPos);
}
}
else if ((((onSketchPos.y < minY || onSketchPos.y > maxY) && (onSketchPos.x < minX || onSketchPos.x > maxX))
|| (onSketchPos.y > minY && onSketchPos.y < maxY && onSketchPos.x > minX && onSketchPos.x < maxX)) && type != Sketcher::Distance) {
else if (isInDistanceZone && !isHorizontal && !isVertical && type != Sketcher::Distance) {
restartCommand(QT_TRANSLATE_NOOP("Command", "Add Distance constraint"));
if (selLine.size() == 1) {
createDistanceConstrain(selLine[0].GeoId, Sketcher::PointPos::start, selLine[0].GeoId, Sketcher::PointPos::end, onSketchPos);