Merge from V6_main 01/04/2013

[modules/gui.git] / src / OCCViewer / OCCViewer_ViewPort3d.cxx

diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
index 26b0736b2f25f5daf4f93e5081b5bf94465baa1e..5946a43ffada3725374466759b4a15b5f9ffa82d 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -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
 }
 
@@ -92,6 +88,7 @@ OCCViewer_ViewPort3d::OCCViewer_ViewPort3d( QWidget* parent, const Handle( V3d_V
 */
 OCCViewer_ViewPort3d::~OCCViewer_ViewPort3d()
 {
+  emit vpClosed();
   Handle(V3d_View) aView = activeView();
   if (!aView.IsNull())
     aView->Remove();
@@ -160,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;
@@ -456,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 ]
 */
@@ -548,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);
@@ -632,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();
@@ -745,15 +718,7 @@ bool OCCViewer_ViewPort3d::setWindow( const Handle(V3d_View)& view )
   if ( view.IsNull() )
     return false;
 
-  int hwnd = (int)winId();
-  if ( !hwnd )
-    return false;
-
-  /* set this widget as the drawing window */
-  short lo = (short)hwnd;
-  short hi = (short)( hwnd >> 16 );
-
-  attachWindow( view, OCCViewer_VService::CreateWindow( view, (int)hi, (int)lo, Xw_WQ_SAMEQUALITY ) );
+  attachWindow( view, OCCViewer_VService::CreateWindow( view, winId() ) );
 
   myWindow = view->Window();
   return !myWindow.IsNull();