X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ShowHideOp.cxx;h=d754a33a9d55c336e3d4853a085a768f5537bd7f;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=d06c59f26ce4c267f84d89fd05db87ba0c3d6e84;hpb=9e5f9721be88b2f58dcf4ae6564b2bee69fdb65e;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_ShowHideOp.cxx b/src/HYDROGUI/HYDROGUI_ShowHideOp.cxx
index d06c59f2..d754a33a 100644
--- a/src/HYDROGUI/HYDROGUI_ShowHideOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ShowHideOp.cxx
@@ -34,8 +34,11 @@
 #include <HYDROData_Region.h>
 
 #include <LightApp_Application.h>
+#include <LightApp_Displayer.h>
 
 #include <OCCViewer_ViewModel.h>
+#include <OCCViewer_ViewManager.h>
+
 #include <SVTK_ViewModel.h>
 
 #include <SUIT_ViewManager.h>
@@ -65,7 +68,32 @@ void HYDROGUI_ShowHideOp::startOperation()
 {
   HYDROGUI_Operation::startOperation();
 
-  size_t aViewId = HYDROGUI_Tool::GetActiveViewId( module() );
+  HYDROGUI_Module* aModule = module();
+
+  size_t aViewId = HYDROGUI_Tool::GetActiveViewId( aModule );
+
+  int anUpdateFlags = 0;
+
+  SUIT_ViewManager* aVTKMgr           = NULL;
+  OCCViewer_ViewManager* anOCCManager = NULL;
+
+  SUIT_ViewManager* aViewMgr = aModule->getApp()->activeViewManager();
+  if ( aViewMgr )
+  {
+    if ( aViewMgr->getType() == GraphicsView_Viewer::Type() )
+    {
+      anUpdateFlags |= UF_Viewer;
+    }
+    else if ( aViewMgr->getType() == OCCViewer_Viewer::Type() )
+    {
+      anUpdateFlags |= UF_OCCViewer;
+      anOCCManager = ::qobject_cast<OCCViewer_ViewManager*>( aViewMgr );
+    }
+    else if ( aViewMgr->getType() == SVTK_Viewer::Type() )
+    {
+      anUpdateFlags |= UF_VTKViewer;
+    }
+  }
 
   // for all objects
   if( myId == ShowOnlyId || myId == ShowAllId || myId == HideAllId )
@@ -76,26 +104,31 @@ void HYDROGUI_ShowHideOp::startOperation()
     {
       Handle(HYDROData_Entity) anObject = anIterator.Current();
       if( !anObject.IsNull() )
-        module()->setObjectVisible( aViewId, anObject, aVisibility );
+        aModule->setObjectVisible( aViewId, anObject, aVisibility );
     }
-  }
 
-  int anUpdateFlags = 0;
-  SUIT_ViewManager* aVTKMgr = 0;
+    // For occ viewer we do the additional step to hide objects from other modules
+    if ( anOCCManager != NULL && !aVisibility )
+      LightApp_Displayer().EraseAll( true );
+  }
 
+  bool isFoundImage = false;
   // for selected objects
   if( myId == ShowId || myId == ShowOnlyId || myId == HideId )
   {
-    HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetSelectedObjects( module() );
+    HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetSelectedObjects( aModule );
   
-    bool aVisibility = myId == ShowId || myId == ShowOnlyId;
+    bool aVisibility = myId == ShowId || myId == ShowOnlyId || myId == ShowAllId;
     Handle( HYDROData_Entity ) anObject;
     for( Standard_Integer anIndex = 1, aLength = aSeq.Length(); anIndex <= aLength; anIndex++ )
     {
       anObject = aSeq.Value( anIndex );
       if( !anObject.IsNull() )
       {
-        module()->setObjectVisible( aViewId, anObject, aVisibility );
+        if ( anObject->GetKind() == KIND_IMAGE )
+          isFoundImage = true;
+
+        aModule->setObjectVisible( aViewId, anObject, aVisibility );
         if ( anObject->GetKind() == KIND_REGION )
         {
           Handle( HYDROData_Region ) aRegion = Handle( HYDROData_Region )::DownCast( anObject );
@@ -107,22 +140,25 @@ void HYDROGUI_ShowHideOp::startOperation()
               anObject = aZonesSeq.Value( aZoneIdx );
               if( !anObject.IsNull() )
               {
-                module()->setObjectVisible( aViewId, anObject, aVisibility );
+                aModule->setObjectVisible( aViewId, anObject, aVisibility );
               }
             }
           }
         }
         else if ( anObject->GetKind() == KIND_BATHYMETRY && aVisibility )
         {
-          // Activate VTK viewer if show a bathymetry
-          aVTKMgr = module()->getApp()->viewManager( SVTK_Viewer::Type() );
-          if ( !aVTKMgr )
-          {
-            aVTKMgr = module()->getApp()->createViewManager( SVTK_Viewer::Type() );
-          }
-          if ( aVTKMgr )
+          if ( !(anUpdateFlags & UF_VTKViewer) )
           {
-            module()->setObjectVisible( (size_t)aVTKMgr->getViewModel(), anObject, aVisibility );
+            // Activate VTK viewer if show a bathymetry
+            aVTKMgr = aModule->getApp()->viewManager( SVTK_Viewer::Type() );
+            if ( !aVTKMgr )
+            {
+              aVTKMgr = aModule->getApp()->createViewManager( SVTK_Viewer::Type() );
+            }
+            if ( aVTKMgr )
+            {
+              aModule->setObjectVisible( (size_t)aVTKMgr->getViewModel(), anObject, aVisibility );
+            }
           }
         }
       }
@@ -131,7 +167,8 @@ void HYDROGUI_ShowHideOp::startOperation()
 
   if ( myId == ShowOnlyId || myId == ShowId || myId == ShowAllId )
   {
-    anUpdateFlags |= UF_FitAll;
+    if( isFoundImage || myId == ShowAllId )
+      anUpdateFlags |= UF_FitAll;
   }
 
   // Set VTK viewer active if show a bathymetry
@@ -140,23 +177,7 @@ void HYDROGUI_ShowHideOp::startOperation()
     anUpdateFlags |= UF_VTKViewer;
     aVTKMgr->setShown( true );
   }
-  SUIT_ViewManager* aViewMgr = module()->getApp()->activeViewManager();
-  if ( aViewMgr )
-  {
-    if ( aViewMgr->getType() == GraphicsView_Viewer::Type() )
-    {
-      anUpdateFlags |= UF_Viewer;
-    }
-    else if ( aViewMgr->getType() == OCCViewer_Viewer::Type() )
-    {
-      anUpdateFlags |= UF_OCCViewer;
-    }
-    else if ( aViewMgr->getType() == SVTK_Viewer::Type() )
-    {
-      anUpdateFlags |= UF_VTKViewer;
-    }
-  }
 
-  module()->update( anUpdateFlags );
+  aModule->update( anUpdateFlags );
   commit();
 }