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

sketcher: fix issue #25992 keep snapped position when releasing mosue for updated sketch points (#26102)

Browse Source 
* sketcher: fix issue #25992 keep snapped position when releasing mosue for updated sketch points

* Update src/Mod/Sketcher/Gui/ViewProviderSketch.cpp

Co-authored-by: Chris Hennes <chennes@pioneerlibrarysystem.org>

---------

Co-authored-by: Chris Hennes <chennes@pioneerlibrarysystem.org>
This commit is contained in:
Chris
2025-12-23 20:06:51 -06:00
committed by GitHub
parent 065fea473f
commit eb61ee36a6
1 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
View File

@@ -970,8 +970,10 @@ bool ViewProviderSketch::mouseButtonPressed(int Button, bool pressed, const SbVe
// Radius maximum to allow double click event
const int dblClickRadius = 5;
double x, y;
double x = std::numeric_limits<double>::quiet_NaN();
double y = std::numeric_limits<double>::quiet_NaN();
SbVec3f pos = point;
if (pp) {
const SoDetail* detail = pp->getDetail();
if (detail && detail->getTypeId() == SoPointDetail::getClassTypeId()) {
@@ -1017,7 +1019,7 @@ bool ViewProviderSketch::mouseButtonPressed(int Button, bool pressed, const SbVe
}
// Double click events variables
float dci = (float)QApplication::doubleClickInterval() / 1000.0f;
float dci = (float)QApplication::doubleClickInterval() / 1000.0F;
if (done
&& SbVec2f(cursorPos - DoubleClick::prvClickPos).length() < dblClickRadius
@@ -1040,8 +1042,9 @@ bool ViewProviderSketch::mouseButtonPressed(int Button, bool pressed, const SbVe
DoubleClick::prvClickPos = cursorPos;
DoubleClick::prvCursorPos = cursorPos;
DoubleClick::newCursorPos = cursorPos;
if (!done)
if (!done) {
setSketchMode(STATUS_SKETCH_StartRubberBand);
}
}
return done;
@@ -1108,7 +1111,7 @@ bool ViewProviderSketch::mouseButtonPressed(int Button, bool pressed, const SbVe
setSketchMode(STATUS_NONE);
return true;
}
case STATUS_SELECT_Constraint:
case STATUS_SELECT_Constraint: {
if (pp) {
auto sels = preselection.PreselectConstraintSet;
for (int id : sels) {
@@ -1120,11 +1123,14 @@ bool ViewProviderSketch::mouseButtonPressed(int Button, bool pressed, const SbVe
}
setSketchMode(STATUS_NONE);
return true;
case STATUS_SKETCH_Drag:
commitDragMove(x, y);
}
case STATUS_SKETCH_Drag: {
Base::Vector2d snappedPos = snapHandle->compute();
commitDragMove(snappedPos.x, snappedPos.y);
setSketchMode(STATUS_NONE);
return true;
case STATUS_SKETCH_DragConstraint:
}
case STATUS_SKETCH_DragConstraint: {
if (!drag.DragConstraintSet.empty()) {
auto idset = drag.DragConstraintSet;
// restore the old positions before opening the transaction and setting the new positions
@@ -1134,9 +1140,13 @@ bool ViewProviderSketch::mouseButtonPressed(int Button, bool pressed, const SbVe
getDocument()->openCommand(QT_TRANSLATE_NOOP("Command", "Drag Constraint"));
std::vector<Sketcher::Constraint*> constraints = getConstraints();
// get snapped position
Base::Vector2d snappedPos = snapHandle->compute();
for (int id : idset) {
Sketcher::Constraint* constr = constraints[id]->clone();
moveConstraint(constr, id, Base::Vector2d(x, y));
moveConstraint(constr, id, snappedPos);
constraints[id] = constr;
}
@@ -1150,6 +1160,7 @@ bool ViewProviderSketch::mouseButtonPressed(int Button, bool pressed, const SbVe
}
setSketchMode(STATUS_NONE);
return true;
}
case STATUS_SKETCH_StartRubberBand:// a single click happened, so clear selection
// unless user hold control.
if (!(QApplication::keyboardModifiers() & Qt::ControlModifier)) {
@@ -1435,8 +1446,9 @@ bool ViewProviderSketch::mouseMove(const SbVec2s& cursorPos, Gui::View3DInventor
}
}
if (!isInEditMode())
if (!isInEditMode()) {
return false;
}
// ignore small moves after selection
switch (Mode) {
@@ -1446,8 +1458,9 @@ bool ViewProviderSketch::mouseMove(const SbVec2s& cursorPos, Gui::View3DInventor
case STATUS_SKETCH_StartRubberBand:
short dx, dy;
(cursorPos - DoubleClick::prvCursorPos).getValue(dx, dy);
if (std::abs(dx) < dragIgnoredDistance && std::abs(dy) < dragIgnoredDistance)
if (std::abs(dx) < dragIgnoredDistance && std::abs(dy) < dragIgnoredDistance) {
return false;
}
default:
break;
}
@@ -1589,7 +1602,7 @@ void ViewProviderSketch::initDragging(int geoId, Sketcher::PointPos pos, Gui::Vi
drag.reset();
setSketchMode(STATUS_SKETCH_Drag);
drag.Dragged.push_back(GeoElementId(geoId, pos));
drag.Dragged.emplace_back(geoId, pos);
// Adding selected geos that should be dragged as well.
for (auto& geoIdi : selection.SelCurvSet) {
@@ -1608,12 +1621,12 @@ void ViewProviderSketch::initDragging(int geoId, Sketcher::PointPos pos, Gui::Vi
// For group dragging, we skip the internal geos.
const Part::Geometry* geo = getSketchObject()->getGeometry(geoId);
if (!GeometryFacade::isInternalAligned(geo)) {
drag.Dragged.push_back(GeoElementId(geoIdi));
drag.Dragged.emplace_back(geoIdi);
}
}
}
for (auto& pointId : selection.SelPointSet) {
int geoIdi;
int geoIdi = 0;
Sketcher::PointPos posi;
getSketchObject()->getGeoVertexIndex(pointId, geoIdi, posi);
if (geoIdi < 0) {
@@ -1630,7 +1643,7 @@ void ViewProviderSketch::initDragging(int geoId, Sketcher::PointPos pos, Gui::Vi
}
}
if (add) {
drag.Dragged.push_back(GeoElementId(geoIdi, posi));
drag.Dragged.emplace_back(geoIdi, posi);
}
}
@@ -1640,9 +1653,14 @@ void ViewProviderSketch::initDragging(int geoId, Sketcher::PointPos pos, Gui::Vi
// Calculate the click position and use it as the initial point
SbLine line2;
getProjectingLine(DoubleClick::prvCursorPos, viewer, line2);
getCoordsOnSketchPlane(
line2.getPosition(), line2.getDirection(), drag.xInit, drag.yInit);
snapManager->snap(Base::Vector2d(drag.xInit, drag.yInit), SnapType::All);
double x, y;
getCoordsOnSketchPlane(line2.getPosition(), line2.getDirection(), x, y);
auto snapHandle = std::make_unique<SnapManager::SnapHandle>(snapManager.get(), Base::Vector2d(x, y));
Base::Vector2d snappedPos = snapHandle->compute();
drag.xInit = snappedPos.x;
drag.yInit = snappedPos.y;
};
if (drag.Dragged.size() == 1 && pos == Sketcher::PointPos::none) {