-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015 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
// 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
#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>
{
HYDROGUI_Operation::startOperation();
- size_t aViewId = HYDROGUI_Tool::GetActiveViewId( module() );
+ HYDROGUI_Module* aModule = module();
- // for all objects
- if( myId == ShowOnlyId || myId == ShowAllId || myId == HideAllId )
- {
- bool aVisibility = myId == ShowAllId;
- HYDROData_Iterator anIterator( doc() );
- for( ; anIterator.More(); anIterator.Next() )
- {
- Handle(HYDROData_Entity) anObject = anIterator.Current();
- if( !anObject.IsNull() )
- module()->setObjectVisible( aViewId, anObject, aVisibility );
- }
- }
+ size_t aViewId = HYDROGUI_Tool::GetActiveViewId( aModule );
int anUpdateFlags = 0;
- SUIT_ViewManager* aVTKMgr = 0;
- SUIT_ViewManager* aViewMgr = module()->getApp()->activeViewManager();
+
+ SUIT_ViewManager* aVTKMgr = NULL;
+ OCCViewer_ViewManager* anOCCManager = NULL;
+
+ SUIT_ViewManager* aViewMgr = aModule->getApp()->activeViewManager();
if ( aViewMgr )
{
if ( aViewMgr->getType() == GraphicsView_Viewer::Type() )
else if ( aViewMgr->getType() == OCCViewer_Viewer::Type() )
{
anUpdateFlags |= UF_OCCViewer;
+ anOCCManager = ::qobject_cast<OCCViewer_ViewManager*>( aViewMgr );
}
else if ( aViewMgr->getType() == SVTK_Viewer::Type() )
{
}
}
+ // for all objects
+ if( myId == ShowOnlyId || myId == ShowAllId || myId == HideAllId )
+ {
+ bool aVisibility = myId == ShowAllId;
+ HYDROData_Iterator anIterator( doc() );
+ for( ; anIterator.More(); anIterator.Next() )
+ {
+ Handle(HYDROData_Entity) anObject = anIterator.Current();
+ if( !anObject.IsNull() )
+ 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 )
{
- HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetSelectedObjects( module() );
+ HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetSelectedObjects( aModule );
bool aVisibility = myId == ShowId || myId == ShowOnlyId || myId == ShowAllId;
Handle( HYDROData_Entity ) anObject;
if ( anObject->GetKind() == KIND_IMAGE )
isFoundImage = true;
- module()->setObjectVisible( aViewId, anObject, aVisibility );
+ aModule->setObjectVisible( aViewId, anObject, aVisibility );
if ( anObject->GetKind() == KIND_REGION )
{
Handle( HYDROData_Region ) aRegion = Handle( HYDROData_Region )::DownCast( anObject );
anObject = aZonesSeq.Value( aZoneIdx );
if( !anObject.IsNull() )
{
- module()->setObjectVisible( aViewId, anObject, aVisibility );
+ aModule->setObjectVisible( aViewId, anObject, aVisibility );
}
}
}
}
else if ( anObject->GetKind() == KIND_BATHYMETRY && aVisibility )
{
- if ( !(anUpdateFlags & UF_VTKViewer) )
+ if ( anUpdateFlags & UF_OCCViewer )
+ {
+ aModule->setObjectVisible( aViewId, anObject, aVisibility );
+ }
+ else if ( !(anUpdateFlags & UF_VTKViewer) )
{
// Activate VTK viewer if show a bathymetry
- aVTKMgr = module()->getApp()->viewManager( SVTK_Viewer::Type() );
+ aVTKMgr = aModule->getApp()->viewManager( SVTK_Viewer::Type() );
if ( !aVTKMgr )
{
- aVTKMgr = module()->getApp()->createViewManager( SVTK_Viewer::Type() );
+ aVTKMgr = aModule->getApp()->createViewManager( SVTK_Viewer::Type() );
}
if ( aVTKMgr )
{
- module()->setObjectVisible( (size_t)aVTKMgr->getViewModel(), anObject, aVisibility );
+ aModule->setObjectVisible( (size_t)aVTKMgr->getViewModel(), anObject, aVisibility );
}
}
}
aVTKMgr->setShown( true );
}
- module()->update( anUpdateFlags );
+ aModule->update( anUpdateFlags );
commit();
}