X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FOCCViewer%2FOCCViewer_ViewPort3d.cxx;h=49c2250e7c91bce111e96b342ad2a9a7c1222272;hb=ebe38156f99322f96cfe86347908c7a55f340afe;hp=46153c3212c9139cceaa45c496d09597076c38d4;hpb=bf4f33e12f47caaa39edde16c7308e24ae7b515e;p=modules%2Fgui.git diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx old mode 100755 new mode 100644 index 46153c321..49c2250e7 --- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx +++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2023 CEA, EDF, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -39,9 +39,10 @@ #include #include #include +#include +#include #include -#include #include "utilities.h" @@ -64,9 +65,11 @@ static Standard_Boolean zRotation = Standard_False; */ OCCViewer_ViewPort3d::OCCViewer_ViewPort3d( QWidget* parent, const Handle( V3d_Viewer)& viewer, V3d_TypeOfView type ) : OCCViewer_ViewPort( parent ), - myScale( 1.0 ), myBusy( true ), - myIsAdvancedZoomingEnabled( false ) + myScale( 1.0 ), + myIsAdvancedZoomingEnabled( false ), + myIsRotating( false ), + myRotAngle( 0.0 ) { // VSR: 01/07/2010 commented to avoid SIGSEGV at SALOME exit //selectVisualId(); @@ -76,6 +79,7 @@ OCCViewer_ViewPort3d::OCCViewer_ViewPort3d( QWidget* parent, const Handle( V3d_V setDefaultParams(); myCursor = NULL; + myRotTimer = NULL; } /*! @@ -83,6 +87,13 @@ OCCViewer_ViewPort3d::OCCViewer_ViewPort3d( QWidget* parent, const Handle( V3d_V */ OCCViewer_ViewPort3d::~OCCViewer_ViewPort3d() { + if ( myRotTimer ) + { + myRotTimer->stop(); + delete myRotTimer; + myRotTimer = NULL; + } + if ( myCursor ) { delete myCursor; @@ -358,13 +369,13 @@ void OCCViewer_ViewPort3d::updateBackground() // set texture image: file name and fill mode switch ( textureMode ) { case Qtx::CenterTexture: - activeView()->SetBackgroundImage( fi.absoluteFilePath().toLatin1().constData(), Aspect_FM_CENTERED ); + activeView()->SetBackgroundImage( fi.absoluteFilePath().toUtf8().constData(), Aspect_FM_CENTERED ); break; case Qtx::TileTexture: - activeView()->SetBackgroundImage( fi.absoluteFilePath().toLatin1().constData(), Aspect_FM_TILED ); + activeView()->SetBackgroundImage( fi.absoluteFilePath().toUtf8().constData(), Aspect_FM_TILED ); break; case Qtx::StretchTexture: - activeView()->SetBackgroundImage( fi.absoluteFilePath().toLatin1().constData(), Aspect_FM_STRETCH ); + activeView()->SetBackgroundImage( fi.absoluteFilePath().toUtf8().constData(), Aspect_FM_STRETCH ); break; default: break; @@ -399,6 +410,9 @@ void OCCViewer_ViewPort3d::fitRect( const QRect& rect ) */ void OCCViewer_ViewPort3d::startZoomAtPoint( int x, int y ) { + // if (myIsRotating) + // stopRotation(); + if ( !activeView().IsNull() && isAdvancedZoomingEnabled() ) activeView()->StartZoomAtPoint( x, y ); } @@ -408,6 +422,9 @@ void OCCViewer_ViewPort3d::startZoomAtPoint( int x, int y ) */ void OCCViewer_ViewPort3d::zoom( int x0, int y0, int x, int y ) { + // if (myIsRotating) + // stopRotation(); + if ( !activeView().IsNull() ) { // as OCCT respects a sign of only dx, // but we want both signes to be taken into account @@ -425,6 +442,9 @@ void OCCViewer_ViewPort3d::zoom( int x0, int y0, int x, int y ) */ void OCCViewer_ViewPort3d::setCenter( int x, int y ) { + if (myIsRotating) + stopRotation(); + if ( !activeView().IsNull() ) { activeView()->Place( x, y, myScale ); emit vpTransformed( this ); @@ -436,6 +456,9 @@ void OCCViewer_ViewPort3d::setCenter( int x, int y ) */ void OCCViewer_ViewPort3d::pan( int dx, int dy ) { + if (myIsRotating) + stopRotation(); + if ( !activeView().IsNull() ) { activeView()->Pan( dx, dy, 1.0 ); emit vpTransformed( this ); @@ -449,28 +472,36 @@ void OCCViewer_ViewPort3d::startRotation( int x, int y, int theRotationPointType, const gp_Pnt& theSelectedPoint ) { + if (myIsRotating) + stopRotation(); + if ( !activeView().IsNull() ) { - //double gx, gy, gz; - //double gx = activeView()->gx; - //activeView()->Gravity(gx,gy,gz); + + Standard_Real zRotationThreshold, X, Y; + sx = x; sy = y; + activeView()->Size(X,Y); + rx = Standard_Real(activeView()->Convert(X)); + ry = Standard_Real(activeView()->Convert(Y)); + gp_Pnt centerPnt; switch ( theRotationPointType ) { case OCCViewer_ViewWindow::BBCENTER: + centerPnt = activeView()->GravityPoint(); + zRotation = Standard_False; + zRotationThreshold = 0.45; + if( zRotationThreshold > 0. ) { + Standard_Real dx = Abs(sx - rx/2.); + Standard_Real dy = Abs(sy - ry/2.); + Standard_Real dd = zRotationThreshold * (rx + ry)/2.; + if( dx > dd || dy > dd ) zRotation = Standard_True; + } activeView()->StartRotation( x, y, 0.45 ); break; case OCCViewer_ViewWindow::SELECTED: - sx = x; sy = y; - - double X,Y; - activeView()->Size(X,Y); - rx = Standard_Real(activeView()->Convert(X)); - ry = Standard_Real(activeView()->Convert(Y)); - activeView()->Rotate( 0., 0., 0., theSelectedPoint.X(),theSelectedPoint.Y(), theSelectedPoint.Z(), Standard_True ); - Quantity_Ratio zRotationThreshold; zRotation = Standard_False; zRotationThreshold = 0.45; if( zRotationThreshold > 0. ) { @@ -536,6 +567,70 @@ void OCCViewer_ViewPort3d::endRotation() } } +/*! + Set the rotation axis and start automatic rotation +*/ +void OCCViewer_ViewPort3d::setRotationAxis(const gp_Vec& theAxis, double theAngle, double theZAngle) +{ + myRotAxis.SetLocation(activeView()->GravityPoint()); + if (zRotation) { + gp_Dir anAxisDir = activeView()->Camera()->Direction(); + myRotAxis.SetDirection(anAxisDir.Reversed()); + myRotAngle = theZAngle; + } + else { + myRotAxis.SetDirection(gp_Dir(theAxis)); + myRotAngle = theAngle; + } + if (!myRotTimer) { + myRotTimer = new QTimer(this); + myRotTimer->setSingleShot(true); + connect(myRotTimer, SIGNAL(timeout()), this, SLOT(updateRotation())); + } + else + myRotTimer->stop(); + + myIsRotating = true; + myLastRender = QDateTime::currentMSecsSinceEpoch(); + Handle(Graphic3d_Camera) aCamera = activeView()->Camera(); + gp_Trsf trsfRot; + trsfRot.SetRotation (myRotAxis, myRotAngle); + aCamera->Transform(trsfRot); + activeView()->SetCamera(aCamera); + myRotTimer->start(20); +} + +/*! + Stop the automatic rotation +*/ +void OCCViewer_ViewPort3d::stopRotation() +{ + myIsRotating = false; + if (myRotTimer) + myRotTimer->stop(); +} + +/*! + Update the automatic rotation animation +*/ +void OCCViewer_ViewPort3d::updateRotation() +{ + if (!myIsRotating) + return; + + qint64 curTime = QDateTime::currentMSecsSinceEpoch(); + double angle = myRotAngle * (curTime - myLastRender) / 100.; + Handle(Graphic3d_Camera) aCamera = activeView()->Camera(); + gp_Trsf trsfRot; + trsfRot.SetRotation(myRotAxis, angle); + aCamera->Transform(trsfRot); + activeView()->SetCamera(aCamera); + + myLastRender = curTime; + if (myRotTimer) + myRotTimer->start(20); +} + /*! Repaints the viewport. [ virtual protected ] */ @@ -547,9 +642,6 @@ void OCCViewer_ViewPort3d::paintEvent( QPaintEvent* e ) mapView( activeView() ); #endif if ( !myWindow.IsNull() ) { -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - QApplication::syncX(); -#endif if ( !myPaintersRedrawing ) { activeView()->Redraw(); } @@ -563,14 +655,9 @@ void OCCViewer_ViewPort3d::paintEvent( QPaintEvent* e ) */ void OCCViewer_ViewPort3d::resizeEvent( QResizeEvent* e ) { -#if defined WIN32 || QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) - /* Win32 : map before first show to avoid flicker */ + /* Map before first show to avoid flicker */ if ( !mapped( activeView() ) ) mapView( activeView() ); -#endif -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - QApplication::syncX(); -#endif QTimer::singleShot( 0, this, SLOT( repaintViewAfterMove() ) ); emit vpResizeEvent( e ); } @@ -588,11 +675,14 @@ void OCCViewer_ViewPort3d::repaintViewAfterMove( ) /*! Fits all objects in view. [ virtual protected ] */ -void OCCViewer_ViewPort3d::fitAll( bool keepScale, bool withZ, bool upd ) +void OCCViewer_ViewPort3d::fitAll( bool keepScale, bool /*withZ*/, bool upd ) { if ( activeView().IsNull() ) return; + if (myIsRotating) + stopRotation(); + if ( keepScale ) myScale = activeView()->Scale(); @@ -608,6 +698,9 @@ void OCCViewer_ViewPort3d::fitAll( bool keepScale, bool withZ, bool upd ) */ void OCCViewer_ViewPort3d::reset() { + if (myIsRotating) + stopRotation(); + // double zsize = getZSize(); if ( !activeView().IsNull() ) { activeView()->Reset(); @@ -624,6 +717,9 @@ void OCCViewer_ViewPort3d::rotateXY( double degrees ) if ( activeView().IsNull() ) return; + if (myIsRotating) + stopRotation(); + int x = width()/2, y = height()/2; double X, Y, Z; activeView()->Convert( x, y, X, Y, Z );