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

SketcherGui: Fix preselectAtPoint for non X-Y orientations

Browse Source
This commit is contained in:
Abdullah Tahiri
2023-11-14 19:38:52 +01:00
committed by abdullahtahiriyo
parent 4857836287
commit 97d3665757
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -358,9 +358,9 @@ void ViewProviderSketch::ParameterObserver::initParameters()
},
nullptr}},
{"SegmentsPerGeometry",
{[this, packedDefaultGridColor](const std::string& string,
{[this](const std::string& string,
[[maybe_unused]] App::Property* property) {
auto v = getPreferencesViewParameter(string, 50);
auto v = getPreferencesViewParameter(string, 50); //LINT
Client.viewProviderParameters.stdCountSegments = v;
},
nullptr}},
@@ -692,8 +692,6 @@ void ViewProviderSketch::preselectAtPoint(Base::Vector2d point)
&& Mode != STATUS_SKETCH_DragCurve && Mode != STATUS_SKETCH_DragConstraint
&& Mode != STATUS_SKETCH_UseRubberBand) {
SbVec3f sbpoint(point.x, point.y, 0.f);
Gui::MDIView* mdi = this->getActiveView();
Gui::View3DInventor* view = qobject_cast<Gui::View3DInventor*>(mdi);
@@ -702,6 +700,18 @@ void ViewProviderSketch::preselectAtPoint(Base::Vector2d point)
Gui::View3DInventorViewer* viewer = view->getViewer();
Base::Placement Plm = getEditingPlacement();
auto inPlacementCoords = [&Plm](const Base::Vector3d & point) {
Base::Vector3d pnt;
Plm.multVec(point, pnt);
return pnt;
};
auto pnt = inPlacementCoords(Base::Vector3d(point.x,point.y,0));
SbVec3f sbpoint(static_cast<float>(pnt.x), static_cast<float>(pnt.y), static_cast<float>(pnt.z));
SbVec2s screencoords = viewer->getPointOnViewport(sbpoint);
std::unique_ptr<SoPickedPoint> Point(this->getPointOnRay(screencoords, viewer));