To improve SVTK package class hierarchy

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 9963f7cd9362fb6bd417e25cdde1b2b53d19b43a..38f90691e875a4184a98155f4af6ca938b9faae4 100644 (file)
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -1566,7 +1566,7 @@ OnSweep()
         float aPercents = float(i)/aSteps;
         aPrsObject->SetMapScale(aPercents);
         aPrsObject->UpdateActor(aActor);
-        vw->getRenderWindow()->getRenderWindow()->Render();
+        vw->getRenderWindow()->Render();
         usleep(aTemp);
       }
     }

diff --git a/src/VISUGUI/VisuGUI_Module.cxx b/src/VISUGUI/VisuGUI_Module.cxx
index 09da9b3c7d285861acc2fca5d0ebe7865d582f05..89cdc342b1b3a6e8236faca81f0aac424baa4174 100644 (file)
--- a/src/VISUGUI/VisuGUI_Module.cxx
+++ b/src/VISUGUI/VisuGUI_Module.cxx
@@ -48,6 +48,7 @@
 #include "SVTK_ViewModel.h"
 #include "SVTK_ViewManager.h"
 #include "SVTK_Event.h"
+#include "SVTK_View.h"
 
 #include "VisuGUI_Prs3dTools.h"
 
@@ -412,31 +413,31 @@ VisuGUI_Module
     return;
 
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  SVTK_View* view = viewWindow->getView();
+  SVTK_MainWindow* aMainWindow = viewWindow->getMainWindow();
   int val;
   if ( pref == "speed_increment" ) {
     val = resMgr->integerValue( "VISU", pref, 10 );
-    view->InvokeEvent( SVTK::SetSpeedIncrementEvent, &val );
+    aMainWindow->InvokeEvent( SVTK::SetSpeedIncrementEvent, &val );
   }
   else if ( pref == "spacemouse_func1_btn" ) {
     val = resMgr->integerValue( "VISU", pref, 1 );
-    view->InvokeEvent( SVTK::SetSpaceMouseF1Event, &val );
+    aMainWindow->InvokeEvent( SVTK::SetSpaceMouseF1Event, &val );
   }
   else if ( pref == "spacemouse_func2_btn" ) {
     val = resMgr->integerValue( "VISU", pref, 2 );
-    view->InvokeEvent( SVTK::SetSpaceMouseF2Event, &val );
+    aMainWindow->InvokeEvent( SVTK::SetSpaceMouseF2Event, &val );
   }
   else if ( pref == "spacemouse_func3_btn" ) {
     val = resMgr->integerValue( "VISU", pref, 10 );
-    view->InvokeEvent( SVTK::SetSpaceMouseF3Event, &val );
+    aMainWindow->InvokeEvent( SVTK::SetSpaceMouseF3Event, &val );
   }
   else if ( pref == "spacemouse_func4_btn" ) {
     val = resMgr->integerValue( "VISU", pref, 11 );
-    view->InvokeEvent( SVTK::SetSpaceMouseF4Event, &val );
+    aMainWindow->InvokeEvent( SVTK::SetSpaceMouseF4Event, &val );
   }
   else if ( pref == "spacemouse_func5_btn" ) {
     val = resMgr->integerValue( "VISU", pref, 9 );
-    view->InvokeEvent( SVTK::SetSpaceMouseF5Event, &val );
+    aMainWindow->InvokeEvent( SVTK::SetSpaceMouseF5Event, &val );
   }
 }
 

diff --git a/src/VISU_I/VISU_ViewManager_i.cc b/src/VISU_I/VISU_ViewManager_i.cc
index 849322e4ff29d3356f931857fbbbde397f388ca5..b3b88b49f5be3cdba2c5bfc62543bf309ee801fd 100644 (file)
--- a/src/VISU_I/VISU_ViewManager_i.cc
+++ b/src/VISU_I/VISU_ViewManager_i.cc
@@ -279,7 +279,7 @@ namespace VISU {
   {
     SVTK_ViewWindow* vf = GetViewWindow(theViewWindow);
     vf->getRenderer()->ResetCameraClippingRange();
-    vf->getRenderWindow()->getRenderWindow()->Render();
+    vf->getRenderWindow()->Render();
   }
 
   VISU_Actor* UpdateViewer (SUIT_ViewWindow* theStudyFrame, int theDisplaing, Prs3d_i* thePrs)

diff --git a/src/VVTK/VVTK_ViewModel.cxx b/src/VVTK/VVTK_ViewModel.cxx
index c1cd2bdbf28431e0a49a1b7c2e670eac6a769f77..cb58635a76ceea21bac19c06fb36f875e15c74d8 100644 (file)
--- a/src/VVTK/VVTK_ViewModel.cxx
+++ b/src/VVTK/VVTK_ViewModel.cxx
@@ -68,7 +68,7 @@ VVTK_Viewer
   thePopup->insertSeparator();
 
   if(TViewWindow* aView = dynamic_cast<TViewWindow*>(myViewManager->getActiveView())){
-    if ( !aView->getView()->getToolBar()->isVisible() ){
+    if ( !aView->getMainWindow()->getToolBar()->isVisible() ){
       thePopup->insertItem( VTKViewer_Viewer::tr( "MEN_SHOW_TOOLBAR" ), this, SLOT( onShowToolbar() ) );
     }
   }
@@ -83,7 +83,7 @@ VVTK_Viewer
   QPtrVector<SUIT_ViewWindow> aViews = myViewManager->getViews();
   for(int i = 0, iEnd = aViews.size(); i < iEnd; i++){
     if(TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at(i))){
-      aView->getView()->update();
+      aView->getMainWindow()->Repaint();
     }
   }
 }
@@ -125,7 +125,7 @@ VVTK_Viewer
   for(int i = 0, iEnd = aViews.size(); i < iEnd; i++){
     if(SUIT_ViewWindow* aViewWindow = aViews.at(i)){
       if(TViewWindow* aView = dynamic_cast<TViewWindow*>(aViewWindow)){
-       aView->setBackgroundColor(theColor);
+       aView->getMainWindow()->setBackgroundColor(theColor);
       }
     }
   }
@@ -150,7 +150,7 @@ VVTK_Viewer
     QPtrVector<SUIT_ViewWindow> aViews = aViewManager->getViews();
     for ( int i = 0; i < aViews.count(); i++ ){
       if(TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at( i ))){
-       aView->SetTrihedronSize( theSize );
+       aView->getMainWindow()->SetTrihedronSize( theSize );
       }
     }
   }
@@ -184,7 +184,7 @@ VVTK_Viewer
   QPtrVector<SUIT_ViewWindow> aViews = myViewManager->getViews();
   for(int i = 0, iEnd = aViews.size(); i < iEnd; i++){
     if(TViewWindow* aView = dynamic_cast<TViewWindow*>(aViews.at(i))){
-      aView->getView()->getToolBar()->show();
+      aView->getMainWindow()->getToolBar()->show();
     }
   }
 }

diff --git a/src/VVTK/VVTK_ViewWindow.cxx b/src/VVTK/VVTK_ViewWindow.cxx
index b7caabad144ee25c599ac38be0f7035f615a0115..f20d526d131ce360aed97d30e747dde871dcf63e 100755 (executable)
--- a/src/VVTK/VVTK_ViewWindow.cxx
+++ b/src/VVTK/VVTK_ViewWindow.cxx
@@ -34,14 +34,15 @@ VVTK_ViewWindow
     QSplitter* aSplitter = new QSplitter(Qt::Vertical,aWidget);
 
     // Create SVTK_View (successor of RenderWindowInteractor).
-    myView = new SVTK_View(aSplitter,"SVTK_View",aResourceMgr);
+    myMainWindow = new SVTK_MainWindow(aSplitter,"SVTK_MainWindow",aResourceMgr);
+    myView = new SVTK_View(myMainWindow);
 
     // important! : the default interactor style which is pushed is VVTK
     // see onSwitchIS() for details
-    myView->PushInteractorStyle(VVTK_InteractorStyle::New());
+    myMainWindow->PushInteractorStyle(VVTK_InteractorStyle::New());
 
     // create another toolbar
-    myToolBar = new QToolBar(myView);
+    myToolBar = new QToolBar(myMainWindow);
     myToolBar->setCloseMode(QDockWindow::Undocked);
     myToolBar->setLabel(tr("LBL_TOOLBAR_LABEL"));
     
@@ -93,9 +94,9 @@ VVTK_ViewWindow
   // if SVTK is a current one - pop it (remove from stack), below it there MUST BE
   // (logically) a VVTK interactor style.
   if ( theIsVVTKStyle )
-    getView()->PopInteractorStyle();
+    getMainWindow()->PopInteractorStyle();
   else
-    getView()->PushInteractorStyle( SVTK_InteractorStyle::New() );
+    getMainWindow()->PushInteractorStyle( SVTK_InteractorStyle::New() );
 }
 
 void
@@ -103,5 +104,5 @@ VVTK_ViewWindow
 ::OnSelectionModeSwitch(bool theIsSelectionOn)
 {
   Selection_Mode aMode = theIsSelectionOn? NodeSelection: ActorSelection;
-  getView()->SetSelectionMode(aMode);
+  getMainWindow()->SetSelectionMode(aMode);
 }