X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_PrsImageFrame.cxx;h=f5aaade5dea264a3a3bbbeb876b53c3a553b9692;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=058d0ea6ea38d75804ef0846a99fb72ac291db5c;hpb=d74afc6389ed4e656c9451ac01b4065470746fd8;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_PrsImageFrame.cxx b/src/HYDROGUI/HYDROGUI_PrsImageFrame.cxx index 058d0ea6..f5aaade5 100644 --- a/src/HYDROGUI/HYDROGUI_PrsImageFrame.cxx +++ b/src/HYDROGUI/HYDROGUI_PrsImageFrame.cxx @@ -164,14 +164,26 @@ QRectF HYDROGUI_PrsImageFrame::UnscaledGraphicsEllipseItem::boundingRect() const if( !aParent ) return aRect; - QTransform aTransform = aParent->getViewTransform(); - double aScale = aTransform.m11(); // same as m22(), viewer specific - if( fabs( aScale ) < EPSILON ) + // take into account a transformation of the base image item + double aXScale = 1.0; + double aYScale = 1.0; + if( QGraphicsItem* aGrandParent = aParent->parentItem() ) + { + QTransform aTransform = aGrandParent->transform(); + QLineF aLine( 0, 0, 1, 1 ); + aLine = aTransform.map( aLine ); + aXScale = aLine.dx(); + aYScale = aLine.dy(); + } + + QTransform aViewTransform = aParent->getViewTransform(); + double aScale = aViewTransform.m11(); // same as m22(), viewer specific + if( fabs( aScale ) < EPSILON || fabs( aXScale ) < EPSILON || fabs( aYScale ) < EPSILON) return aRect; QPointF aCenter = aRect.center(); - double aWidth = aRect.width() / aScale; - double aHeight = aRect.height() / aScale; + double aWidth = aRect.width() / aScale / aXScale; + double aHeight = aRect.height() / aScale / aYScale; aRect = QRectF( aCenter.x() - aWidth / 2, aCenter.y() - aHeight / 2, aWidth, aHeight ); return aRect; @@ -205,7 +217,6 @@ void HYDROGUI_PrsImageFrame::UnscaledGraphicsEllipseItem::paint( thePainter->save(); thePainter->setTransform( GenerateTranslationOnlyTransform( thePainter->transform(), myBasePoint ) ); - QGraphicsEllipseItem::paint( thePainter, theOption, theWidget ); thePainter->restore(); }