refs #1327: implementation of the scaling operations

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

diff --git a/src/HYDROGUI/HYDROGUI_Module.cxx b/src/HYDROGUI/HYDROGUI_Module.cxx
index e46d12a97ff3050162fdd72071f8bed64741c44f..535770cfe4ee8a1ce4a8f670f280c8f6f144c60f 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Module.cxx
+++ b/src/HYDROGUI/HYDROGUI_Module.cxx
@@ -324,7 +324,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;
@@ -424,7 +424,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;
             }
           }
         }
@@ -476,7 +476,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;
     }
 
@@ -571,8 +571,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 ) );
@@ -1089,10 +1089,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 ) {
@@ -1475,6 +1478,9 @@ 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* ) ),
@@ -1538,6 +1544,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* ) ) );
@@ -1818,7 +1825,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