X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Module.cxx;h=38090fe5441884545f6a71db1a63a3e70a8c014c;hb=9082efb75ca2505f8b4c5096d37e8d87491cd5d9;hp=f861ac792105ff447509003d9ee25772dd21dba8;hpb=743e3da9cea294eb30ea8b16e7f6992a39a8a50a;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Module.cxx b/src/HYDROGUI/HYDROGUI_Module.cxx
index f861ac79..38090fe5 100644
--- 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"
@@ -323,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;
@@ -423,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;
             }
           }
         }
@@ -475,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;
     }
 
@@ -570,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 ) );
@@ -682,6 +683,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
         theMenu->addSeparator();
         //
         theMenu->addAction( action( ExportToShapeFileID ) );
+        theMenu->addSeparator();
       }      
       else if( anIsVisualState && anIsObjectBrowser )
       {
@@ -700,8 +702,13 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
       if ( anIsObjectCanBeColored )
       {
         theMenu->addAction( action( SetColorId ) );
-        if ( anIsLandCoverMap )
-          theMenu->addAction( action( SetTransparencyId ) );
+        theMenu->addSeparator();
+      }
+
+      // Add transparency action for land cover map objects
+      if ( anIsLandCoverMap )
+      {
+        theMenu->addAction( action( SetTransparencyId ) );
         theMenu->addSeparator();
       }
     } else if ( anAllAreProfiles ) {
@@ -1082,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 ) {
@@ -1811,7 +1821,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