From: inv Date: Tue, 26 Mar 2013 11:06:44 +0000 (+0000) Subject: Porting to dev version of OCCT: remove obsolete methods X-Git-Tag: V6_main_FINAL~18 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a19c413fcc13e6d5b266355cad709423685083f4;p=modules%2Fgui.git Porting to dev version of OCCT: remove obsolete methods --- diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx index 7e3593e5b..8574faa29 100755 --- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx +++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx @@ -66,8 +66,6 @@ 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 ), - myDegenerated( true ), - myAnimate( false ), myBusy( true ), myIsAdvancedZoomingEnabled( false ) { @@ -82,8 +80,6 @@ OCCViewer_ViewPort3d::OCCViewer_ViewPort3d( QWidget* parent, const Handle( V3d_V myPerspView = new V3d_PerspectiveView( viewer ); myActiveView = myPerspView; } - if ( myDegenerated ) - activeView()->SetDegenerateModeOn(); setBackground( Qtx::BackgroundData( Qt::black ) ); // set default background } @@ -161,11 +157,6 @@ Handle( V3d_View ) OCCViewer_ViewPort3d::setView( const Handle( V3d_View )& view view->SetBackgroundColor( oldView->BackgroundColor() ); } - if ( myDegenerated ) - view->SetDegenerateModeOn(); - else - view->SetDegenerateModeOff(); - view->View()->Activate(); activeView() = view; return oldView; @@ -457,18 +448,6 @@ void OCCViewer_ViewPort3d::updateBackground() #endif } -/*! - Set animation mode - \param theDegenerated - degenerated mode -*/ -void OCCViewer_ViewPort3d::setAnimationMode(bool theDegenerated) -{ - if ( !activeView().IsNull() ) { - myAnimate = theDegenerated; - activeView()->SetAnimationMode(true, theDegenerated); - } -} - /*! Updates the active viewport. [ virtual public ] */ @@ -549,10 +528,6 @@ void OCCViewer_ViewPort3d::startRotation( int x, int y, const gp_Pnt& theSelectedPoint ) { if ( !activeView().IsNull() ) { - myDegenerated = activeView()->DegenerateModeIsOn(); - activeView()->SetDegenerateModeOn(); - if (myAnimate) activeView()->SetAnimationModeOn(); - //double gx, gy, gz; //double gx = activeView()->gx; //activeView()->Gravity(gx,gy,gz); @@ -633,9 +608,6 @@ void OCCViewer_ViewPort3d::rotate( int x, int y, void OCCViewer_ViewPort3d::endRotation() { if ( !activeView().IsNull() ) { - if (myAnimate) activeView()->SetAnimationModeOff(); - if ( !myDegenerated ) - activeView()->SetDegenerateModeOff(); activeView()->ZFitAll(1.); activeView()->SetZSize(0.); activeView()->Update(); diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.h b/src/OCCViewer/OCCViewer_ViewPort3d.h index d82872979..fe4f4df99 100755 --- a/src/OCCViewer/OCCViewer_ViewPort3d.h +++ b/src/OCCViewer/OCCViewer_ViewPort3d.h @@ -53,8 +53,6 @@ public: Handle(V3d_View) setView( const Handle(V3d_View)& ); Handle(V3d_Viewer) getViewer() const; - void setAnimationMode(bool theDegenerated); - virtual void setBackgroundColor( const QColor& color); // obsolete virtual QColor backgroundColor() const; // obsolete void setBackground( const Qtx::BackgroundData& color); @@ -121,8 +119,6 @@ private: Handle(V3d_View) myOrthoView; Handle(V3d_View) myPerspView; Handle(V3d_View) myActiveView; - bool myDegenerated; - bool myAnimate; bool myBusy; double myScale; bool myIsAdvancedZoomingEnabled;