#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();
+
+ 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 )
{
Handle(HYDROData_Entity) anObject = anIterator.Current();
if( !anObject.IsNull() )
- module()->setObjectVisible( aViewId, anObject, 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 )
{
- HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetSelectedObjects( module() );
-
- bool aVisibility = myId == ShowId || myId == ShowOnlyId;
+ 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++ )
{
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 );
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) )
+ {
+ // 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 );
+ }
+ }
+ }
}
}
}
- int anUpdateFlags = 0;
+ if ( myId == ShowOnlyId || myId == ShowId || myId == ShowAllId )
+ {
+ if( isFoundImage || myId == ShowAllId )
+ anUpdateFlags |= UF_FitAll;
+ }
- SUIT_ViewManager* aViewMgr = module()->getApp()->activeViewManager();
- if ( aViewMgr )
+ // Set VTK viewer active if show a bathymetry
+ if ( aVTKMgr )
{
- if ( aViewMgr->getType() == GraphicsView_Viewer::Type() )
- {
- anUpdateFlags |= UF_Viewer;
- }
- else if ( aViewMgr->getType() == OCCViewer_Viewer::Type() )
- {
- anUpdateFlags |= UF_OCCViewer;
- }
+ anUpdateFlags |= UF_VTKViewer;
+ aVTKMgr->setShown( true );
}
- module()->update( anUpdateFlags );
+ aModule->update( anUpdateFlags );
commit();
}