Merge branch 'BR_1328' into BR_DEMO

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_Module.cxx

diff --git a/src/HYDROGUI/HYDROGUI_Module.cxx b/src/HYDROGUI/HYDROGUI_Module.cxx
index f8baa64dad4958f33f13aca77f8a121ee9a141ef..d6d8f32cda753e82c086dac5c1553e6cd5d00dd7 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Module.cxx
+++ b/src/HYDROGUI/HYDROGUI_Module.cxx
@@ -30,6 +30,7 @@
 #include "HYDROGUI_Operations.h"
 #include "HYDROGUI_PrsImage.h"
 #include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_UpdateFlags.h"
 #include "HYDROGUI_Shape.h"
 #include "HYDROGUI_VTKPrs.h"
@@ -39,6 +40,7 @@
 #include "HYDROGUI_SetColorOp.h"
 #include "HYDROGUI_ImportGeomObjectOp.h"
 #include "HYDROGUI_ShowHideOp.h"
+#include "HYDROGUI_Overview.h"
 
 #include <HYDROData_Tool.h>
 #include <HYDROData_Image.h>
@@ -119,7 +121,8 @@ HYDROGUI_Module::HYDROGUI_Module()
 : LightApp_Module( "HYDRO" ),
   myDisplayer( 0 ),
   myOCCDisplayer( 0 ),
-  myIsUpdateEnabled( true )
+  myIsUpdateEnabled( true ),
+  myOverview( 0 )
 {
 }
 
@@ -208,12 +211,19 @@ bool HYDROGUI_Module::activateModule( SUIT_Study* theStudy )
 
   ViewManagerList anOCCViewManagers;
   anApp->viewManagers( OCCViewer_Viewer::Type(), anOCCViewManagers );
-  foreach ( const SUIT_ViewManager* aViewManager, anOCCViewManagers ) {
+
+  foreach ( const SUIT_ViewManager* aViewManager, anOCCViewManagers )
+  {
     connect( aViewManager, SIGNAL( mouseMove( SUIT_ViewWindow*, QMouseEvent* ) ),
              this, SLOT( onMouseMove( SUIT_ViewWindow*, QMouseEvent* ) ) );
-    foreach( SUIT_ViewWindow* aViewWindow, aViewManager->getViews() ) {
+    connect( aViewManager, SIGNAL( activated( SUIT_ViewManager* ) ), 
+             this, SLOT( onViewActivated( SUIT_ViewManager* ) ) );
+
+    foreach( SUIT_ViewWindow* aViewWindow, aViewManager->getViews() )
+    {
       OCCViewer_ViewFrame* aViewFrame = dynamic_cast<OCCViewer_ViewFrame*>( aViewWindow );
-      if ( aViewFrame && aViewFrame->getViewPort() ) {
+      if ( aViewFrame && aViewFrame->getViewPort() )
+      {
         aViewFrame->getViewPort()->installEventFilter( this );
       }
     }
@@ -286,12 +296,28 @@ bool HYDROGUI_Module::deactivateModule( SUIT_Study* theStudy )
 
 void HYDROGUI_Module::windows( QMap<int, int>& theMap ) const
 {
+  static bool inWindows = false;
+  if( inWindows )
+    return;
+
   theMap.clear();
   theMap.insert( LightApp_Application::WT_LogWindow,     Qt::BottomDockWidgetArea );
 #ifndef DISABLE_PYCONSOLE
   theMap.insert( LightApp_Application::WT_PyConsole,     Qt::BottomDockWidgetArea );
 #endif
   theMap.insert( LightApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea   );
+  theMap.insert( OverviewWindow, Qt::LeftDockWidgetArea );
+
+  inWindows = true;
+  LightApp_Application* app = getApp();
+  if( app && app->getWindow( OverviewWindow )==0 )
+  {
+    const_cast<HYDROGUI_Module*>( this )->myOverview = 
+      new HYDROGUI_Overview( tr( "OVERVIEW" ), 0, app->desktop() );
+    myOverview->setGeometry( 0, 0, 320, 240 );
+    app->insertDockWindow( OverviewWindow, myOverview );
+  }
+  inWindows = false;
 }
 
 void HYDROGUI_Module::viewManagers( QStringList& theTypesList ) const
@@ -323,7 +349,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
   bool anIsImageHasRefs = false;
   bool anIsFusedImage = false;
   bool anIsCutImage = false;
-  bool anIsSplittedImage = false;
+  bool anIsSplitImage = false;
   bool anIsMustObjectBeUpdated = false;
   bool anIsPolyline = false;
   bool anIsPolyline3D = false;
@@ -423,7 +449,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
               else if( anOperatorName == ImageComposer_CutOperator::Type() )
                 anIsCutImage = true;
               else if( anOperatorName == ImageComposer_CropOperator::Type() )
-                anIsSplittedImage = true;
+                anIsSplitImage = true;
             }
           }
         }
@@ -475,7 +501,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
         anIsDigue = true;
       else if( anObjectKind == KIND_DUMMY_3D )
         anIsDummyObject3D = true;
-      else if( anObjectKind == KIND_SHAPES_GROUP || anObjectKind == KIND_SPLITTED_GROUP )
+      else if( anObjectKind == KIND_SHAPES_GROUP || anObjectKind == KIND_SPLIT_GROUP )
         anIsGroup = true;
     }
 
@@ -570,8 +596,8 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
             theMenu->addAction( action( EditFusedImageId ) );
           else if( anIsCutImage )
             theMenu->addAction( action( EditCutImageId ) );
-          else if( anIsSplittedImage )
-            theMenu->addAction( action( EditSplittedImageId ) );
+          else if( anIsSplitImage )
+            theMenu->addAction( action( EditSplitImageId ) );
         }
 
         //RKV: BUG#98: theMenu->addAction( action( ObserveImageId ) );
@@ -678,9 +704,11 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
         theMenu->addSeparator();
         theMenu->addAction( action( SplitLandCoverId ) );
         theMenu->addAction( action( MergeLandCoverId ) );
+        theMenu->addAction( action( ChangeLandCoverTypeId ) );
         theMenu->addSeparator();
         //
         theMenu->addAction( action( ExportToShapeFileID ) );
+        theMenu->addSeparator();
       }      
       else if( anIsVisualState && anIsObjectBrowser )
       {
@@ -701,6 +729,13 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
         theMenu->addAction( action( SetColorId ) );
         theMenu->addSeparator();
       }
+
+      // Add transparency action for land cover map objects
+      if ( anIsLandCoverMap )
+      {
+        theMenu->addAction( action( SetTransparencyId ) );
+        theMenu->addSeparator();
+      }
     } else if ( anAllAreProfiles ) {
       theMenu->addAction( action( SelectedGeoreferencementId ) );
       theMenu->addSeparator();
@@ -1079,10 +1114,13 @@ void HYDROGUI_Module::setObjectVisible( const int theViewId,
     if ( hydroObject )
     {
         SUIT_AbstractModel* treeModel = dynamic_cast<SUIT_AbstractModel*>( getApp()->objectBrowser()->model() );
-        QString id = hydroObject->text( hydroObject->customData( Qtx::IdType ).toInt() );
-        Qtx::VisibilityState visState = treeModel->visibilityState( id );
-        if ( visState != Qtx::UnpresentableState )
+        if ( treeModel )
+        {
+          QString id = hydroObject->text( hydroObject->customData( Qtx::IdType ).toInt() );
+          Qtx::VisibilityState visState = treeModel->visibilityState( id );
+          if ( visState != Qtx::UnpresentableState )
             treeModel->setVisibilityState( id, theState ? Qtx::ShownState : Qtx::HiddenState );
+        }
     }
 
     if ( theObject->GetKind() == KIND_BATHYMETRY && theState ) {
@@ -1465,10 +1503,15 @@ void HYDROGUI_Module::onViewManagerAdded( SUIT_ViewManager* theViewManager )
   }
   else if( theViewManager->getType() == OCCViewer_Viewer::Type() )
   {
+    OCCViewer_ViewManager* mgr = dynamic_cast<OCCViewer_ViewManager*>( theViewManager );
+    mgr->setChainedOperations( true );//TODO: via preferences
+
     connect( theViewManager, SIGNAL( viewCreated( SUIT_ViewWindow* ) ),
              this, SLOT( onViewCreated( SUIT_ViewWindow* ) ) );
     connect( theViewManager, SIGNAL( mouseMove( SUIT_ViewWindow*, QMouseEvent* ) ),
              this, SLOT( onMouseMove( SUIT_ViewWindow*, QMouseEvent* ) ) );
+    connect( theViewManager, SIGNAL( activated( SUIT_ViewManager* ) ), 
+             this, SLOT( onViewActivated( SUIT_ViewManager* ) ) );
   }
   else if( theViewManager->getType() == SVTK_Viewer::Type() )
   {
@@ -1528,6 +1571,7 @@ void HYDROGUI_Module::onViewCreated( SUIT_ViewWindow* theViewWindow )
       aViewFrame->installEventFilter( this );
 
       GraphicsView_ViewPort* aViewPort = aViewFrame->getViewPort();
+      aViewPort->setInteractionFlag( GraphicsView_ViewPort::GlobalWheelScaling );
 
       connect( aViewPort, SIGNAL( vpMouseEvent( QGraphicsSceneMouseEvent* ) ),
                this, SLOT( onViewPortMouseEvent( QGraphicsSceneMouseEvent* ) ) );
@@ -1808,7 +1852,7 @@ void HYDROGUI_Module::onObjectClicked( SUIT_DataObject* theObject, int theColumn
 
   setObjectVisible( HYDROGUI_Tool::GetActiveViewId( this ), hydroObject->modelObject(), vis );
 
-  update( UF_OCCViewer | ( visState == Qtx::ShownState ? UF_FitAll : 0 ) );
+  update( UF_OCCViewer | UF_VTKViewer | ( visState == Qtx::ShownState ? UF_FitAll : 0 ) );
 }
 
 Handle(HYDROData_StricklerTable) HYDROGUI_Module::getLandCoverColoringTable( const int theViewId ) const
@@ -1859,3 +1903,16 @@ void HYDROGUI_Module::setObjectRemoved( const Handle(HYDROData_Entity)& theObjec
     }
   }
 }
+
+void HYDROGUI_Module::onViewActivated( SUIT_ViewManager* theMgr )
+{
+  if( !theMgr )
+    return;
+
+  SUIT_ViewWindow* wnd = theMgr->getActiveView();
+  OCCViewer_ViewFrame* occwnd = dynamic_cast<OCCViewer_ViewFrame*>( wnd );
+  if( !occwnd )
+    return;
+
+  myOverview->setMainView( occwnd );
+}