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

Sketcher: Improving group constraint preselection

Browse Source 
=================================================

the position obtained from the SoPath of the picked point when entering
the combined icon object is not the center of the icon, what leads to
wrong preselection or no preselection at all.

This commit uses the translation of the Constraint node, which is the same that
is used to locate the constraint icons on the screen in the first place.
This commit is contained in:
Abdullah Tahiri
2018-11-12 16:53:57 +01:00
committed by wmayer
parent 50af914311
commit 434ce91e8d
1 changed files with 79 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1662,17 +1662,88 @@ std::set<int> ViewProviderSketch::detectPreselectionConstr(const SoPickedPoint *
// Screen dimensions of the icon
SbVec3s iconSize = getDisplayedSize(static_cast<SoImage *>(tail));
// Center of the icon
SbVec2f iconCoords = viewer->screenCoordsOfPath(path);
//SbVec2f iconCoords = viewer->screenCoordsOfPath(path);
// The use of the Path to get the screen coordinates to get the icon center coordinates
// does not work.
//
// This implementation relies on the use of ZoomTranslation to get the absolute and relative
// positions of the icons.
//
// In the case of second icons (the same constraint has two icons at two different positions),
// the translation vectors have to be added, as the second ZoomTranslation operates on top of
// the first.
//
// Coordinates are projected on the sketch plane and then to the screen in the interval [0 1]
// Then this result is coverted to pixels using the scale factor.
SbVec3f absPos;
SbVec3f trans;
absPos = static_cast<SoZoomTranslation *>(static_cast<SoSeparator *>(tailFather)->getChild(CONSTRAINT_SEPARATOR_INDEX_FIRST_TRANSLATION))->abPos.getValue();
trans = static_cast<SoZoomTranslation *>(static_cast<SoSeparator *>(tailFather)->getChild(CONSTRAINT_SEPARATOR_INDEX_FIRST_TRANSLATION))->translation.getValue();
if(tail != sep->getChild(CONSTRAINT_SEPARATOR_INDEX_FIRST_ICON)) {
absPos += static_cast<SoZoomTranslation *>(static_cast<SoSeparator *>(tailFather)->getChild(CONSTRAINT_SEPARATOR_INDEX_SECOND_TRANSLATION))->abPos.getValue();
trans += static_cast<SoZoomTranslation *>(static_cast<SoSeparator *>(tailFather)->getChild(CONSTRAINT_SEPARATOR_INDEX_SECOND_TRANSLATION))->translation.getValue();
}
double x,y;
SoCamera* pCam = viewer->getSoRenderManager()->getCamera();
if (!pCam)
continue;
SbViewVolume vol = pCam->getViewVolume();
getCoordsOnSketchPlane(x,y,absPos+trans,vol.getProjectionDirection());
Gui::ViewVolumeProjection proj(viewer->getSoRenderManager()->getCamera()->getViewVolume());
// dimensionless [0 1] (or 1.5 see View3DInventorViewer.cpp )
Base::Vector3d screencoords = proj(Base::Vector3d(x,y,0));
int width = viewer->getGLWidget()->width(),
height = viewer->getGLWidget()->height();
if (width >= height) {
// "Landscape" orientation, to square
screencoords.x *= height;
screencoords.x += (width-height) / 2.0;
screencoords.y *= height;
}
else {
// "Portrait" orientation
screencoords.x *= width;
screencoords.y *= width;
screencoords.y += (height-width) / 2.0;
}
SbVec2f iconCoords(screencoords.x,screencoords.y);
// cursorPos is SbVec2s in screen coordinates coming from SoEvent in mousemove
//
// Coordinates of the mouse cursor on the icon, origin at top-left for Qt
// but bottom-left for OIV.
// The coordinates are needed in Qt format, i.e. from top to bottom.
int iconX = cursorPos[0] - iconCoords[0] + iconSize[0]/2,
iconY = cursorPos[1] - iconCoords[1] - iconSize[1]/2;
iconY = cursorPos[1] - iconCoords[1] + iconSize[1]/2;
iconY = iconSize[1] - iconY;
for (ConstrIconBBVec::iterator b = edit->combinedConstrBoxes[constrIdsStr].begin();
b != edit->combinedConstrBoxes[constrIdsStr].end(); ++b) {
if (b->first.contains(iconX, iconY)) {
Base::Console().Log("Abs(%f,%f),Trans(%f,%f),Coords(%d,%d),iCoords(%f,%f),icon(%d,%d),isize(%d,%d),boundingbox([%d,%d],[%d,%d])\n", absPos[0],absPos[1],trans[0], trans[1], cursorPos[0], cursorPos[1], iconCoords[0], iconCoords[1], iconX, iconY, iconSize[0], iconSize[1], b->first.topLeft().x(),b->first.topLeft().y(),b->first.bottomRight().x(),b->first.bottomRight().y());
if (b->first.contains(iconX, iconY)) {
// We've found a bounding box that contains the mouse pointer!
for (std::set<int>::iterator k = b->second.begin(); k != b->second.end(); ++k)
constrIndices.insert(*k);
@@ -3216,6 +3287,8 @@ void ViewProviderSketch::drawMergedConstraintIcons(IconQueue iconQueue)
iconRotation,
&boundingBoxesVec,
&lastVPad);
//compositeIcon.invertPixels(QImage::InvertRgba);
} else {
int thisVPad;
QImage partialIcon = renderConstrIcon(thisType,
@@ -3225,6 +3298,8 @@ void ViewProviderSketch::drawMergedConstraintIcons(IconQueue iconQueue)
iconRotation,
&boundingBoxesVec,
&thisVPad);
//partialIcon.invertPixels(QImage::InvertRgba);
// Stack vertically for now. Down the road, it might make sense
// to figure out the best orientation automatically.
@@ -3292,7 +3367,7 @@ QImage ViewProviderSketch::renderConstrIcon(const QString &type,
QString joinStr = QString::fromLatin1(", ");
QImage icon = Gui::BitmapFactory().pixmap(type.toLatin1()).toImage();
QFont font = QApplication::font();
font.setPixelSize(11);
font.setBold(true);