lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-19 19:14:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

corrected problem in displaying picked point with double-click: now it displays SCENE-SPACE coordinates, as initially intended

Browse Source 
[to be properly tested before release!]
This commit is contained in:
Marco Callieri mcallieri 2013-12-17 15:47:22 +00:00
parent 1906ed3fba
commit ea2133565c
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/meshlab/glarea.cpp
View File

@ -540,6 +540,19 @@ void GLArea::paintEvent(QPaintEvent */*event*/)
decorInterface->decorateDoc(p,*this->md(),this->glas.currentGlobalParamSet, this,&painter,md()->Log);
}
// we want to write scene-space the point picked with double-click in the log
// we have to do it now, before leaving this transformation space
// we hook to the same mechanism double-click will be managed later on to move trackball
if(hasToPick && !hasToGetPickPos)
{
Point3f pp;
if(Pick<Point3f>(pointToPick[0],pointToPick[1],pp))
{
// write picked point in the log
Logf(0,"Recentering on point [%f %f %f] [%d,%d]",pp[0],pp[1],pp[2],pointToPick[0],pointToPick[1]);
}
}
glPopMatrix(); // We restore the state to immediately before the trackball
//If it is a raster viewer draw the image as a texture
@ -554,9 +567,6 @@ void GLArea::paintEvent(QPaintEvent */*event*/)
hasToPick=false;
if(Pick<Point3f>(pointToPick[0],pointToPick[1],pp))
{
// write picked point in the log
Logf(0,"Recentering on point [%f %f %f] [%d,%d]",pp[0],pp[1],pp[2],pointToPick[0],pointToPick[1]);
trackball.MouseUp(pointToPick[0],pointToPick[1], vcg::Trackball::BUTTON_NONE );
trackball.Translate(-pp);
trackball.Scale(1.25f);