X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ShowHideOp.cxx;h=066d0190f2bb90ba836c3c300cc40785c31fce2f;hb=a53349567d67f4df0ef737798a25c24d9dc8f08e;hp=47e0a2b6e2362b06018c3b06ca51e5eeed6f6ced;hpb=94f079c9197f9655e023e5047feffea452b4a1fe;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_ShowHideOp.cxx b/src/HYDROGUI/HYDROGUI_ShowHideOp.cxx
index 47e0a2b6..066d0190 100644
--- a/src/HYDROGUI/HYDROGUI_ShowHideOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ShowHideOp.cxx
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,17 +18,26 @@
 
 #include "HYDROGUI_ShowHideOp.h"
 
-#include "HYDROGUI_DataModel.h"
+#include <GraphicsView_Viewer.h>
+
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_Operations.h"
+#include "HYDROGUI_Tool.h"
 #include "HYDROGUI_UpdateFlags.h"
 
 #include <HYDROData_Iterator.h>
-#include <HYDROData_Object.h>
+#include <HYDROData_Entity.h>
+#include <HYDROData_Region.h>
+
+#include <LightApp_Application.h>
+#include <LightApp_Displayer.h>
 
-#include <LightApp_DataOwner.h>
+#include <OCCViewer_ViewModel.h>
+#include <OCCViewer_ViewManager.h>
 
-#include <SUIT_SelectionMgr.h>
+#include <SVTK_ViewModel.h>
+
+#include <SUIT_ViewManager.h>
 
 HYDROGUI_ShowHideOp::HYDROGUI_ShowHideOp( HYDROGUI_Module* theModule, int theId )
 : HYDROGUI_Operation( theModule ),
@@ -59,7 +64,32 @@ void HYDROGUI_ShowHideOp::startOperation()
 {
   HYDROGUI_Operation::startOperation();
 
-  HYDROGUI_DataModel* aModel = module()->getDataModel();
+  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 )
@@ -68,31 +98,86 @@ void HYDROGUI_ShowHideOp::startOperation()
     HYDROData_Iterator anIterator( doc() );
     for( ; anIterator.More(); anIterator.Next() )
     {
-      Handle(HYDROData_Object) anObject = anIterator.Current();
+      Handle(HYDROData_Entity) anObject = anIterator.Current();
       if( !anObject.IsNull() )
-        anObject->SetVisibility( aVisibility );
+        aModule->setObjectVisible( aViewId, anObject, aVisibility );
     }
+
+    // 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 )
   {
-    SUIT_SelectionMgr* aSelectionMgr = selectionMgr();
-    SUIT_DataOwnerPtrList anOwners;
-    aSelectionMgr->selected( anOwners );
-
-    bool aVisibility = myId == ShowId || myId == ShowOnlyId;
-    foreach( SUIT_DataOwner* aSUITOwner, anOwners )
+    HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetSelectedObjects( aModule );
+  
+    bool aVisibility = myId == ShowId || myId == ShowOnlyId || myId == ShowAllId;
+    Handle( HYDROData_Entity ) anObject;
+    for( Standard_Integer anIndex = 1, aLength = aSeq.Length(); anIndex <= aLength; anIndex++ )
     {
-      if( LightApp_DataOwner* anOwner = dynamic_cast<LightApp_DataOwner*>( aSUITOwner ) )
+      anObject = aSeq.Value( anIndex );
+      if( !anObject.IsNull() )
       {
-        Handle(HYDROData_Object) anObject = aModel->objectByEntry( anOwner->entry() );
-        if( !anObject.IsNull() )
-          anObject->SetVisibility( aVisibility ? true : false );
+        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 );
+          if ( !aRegion.IsNull() )
+          {
+            HYDROData_SequenceOfObjects aZonesSeq = aRegion->GetZones();
+            for( Standard_Integer aZoneIdx = 1, aNbZones = aZonesSeq.Length(); aZoneIdx <= aNbZones; aZoneIdx++ )
+            {
+              anObject = aZonesSeq.Value( aZoneIdx );
+              if( !anObject.IsNull() )
+              {
+                aModule->setObjectVisible( aViewId, anObject, aVisibility );
+              }
+            }
+          }
+        }
+        else if ( anObject->GetKind() == KIND_BATHYMETRY && aVisibility )
+        {
+          if ( anUpdateFlags & UF_OCCViewer )
+          {
+            aModule->setObjectVisible( aViewId, anObject, aVisibility );
+          }
+          else if ( !(anUpdateFlags & UF_VTKViewer) )
+          {
+            // 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 );
+            }
+          }
+        }
       }
     }
   }
 
-  module()->update( UF_Viewer );
+  if ( myId == ShowOnlyId || myId == ShowId || myId == ShowAllId )
+  {
+    if( isFoundImage || myId == ShowAllId )
+      anUpdateFlags |= UF_FitAll;
+  }
+
+  // Set VTK viewer active if show a bathymetry
+  if ( aVTKMgr )
+  {
+    anUpdateFlags |= UF_VTKViewer;
+    aVTKMgr->setShown( true );
+  }
+
+  aModule->update( anUpdateFlags );
   commit();
 }