#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
-#ifndef DISABLE_PLOT2DVIEWER
-#include <SPlot2d_ViewModel.h>
-#include <SPlot2d_Histogram.h>
-#include <Plot2d_ViewManager.h>
-#endif
-
// SALOME KERNEL includes
#include <utilities.h>
*/
//================================================================================
- void RemoveVisualObjectWithActors( const char* theEntry )
+ void RemoveVisualObjectWithActors( const char* theEntry, bool fromAllViews )
{
- SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>
- ( SUIT_Session::session()->activeApplication() );
- SUIT_ViewManager* aViewManager =
- app ? app->getViewManager(SVTK_Viewer::Type(), true) : 0;
- if ( aViewManager ) {
+ SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>(SUIT_Session::session()->activeApplication());
+ if(!app)
+ return;
+ SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>(app->activeStudy());
+ if(!aStudy)
+ return;
+ ViewManagerList aList;
+
+ if(fromAllViews) {
+ app->viewManagers(SVTK_Viewer::Type() , aList);
+ } else {
+ SUIT_ViewManager* aVM = app->getViewManager(SVTK_Viewer::Type(), true);
+ if(aVM)
+ aList.append(aVM);
+ }
+ bool actorRemoved = false;
+ ViewManagerList::ConstIterator it = aList.begin();
+ SUIT_ViewManager* aViewManager = 0;
+ for( ; it!=aList.end();it++) {
+ aViewManager = *it;
QVector<SUIT_ViewWindow*> views = aViewManager->getViews();
for ( int iV = 0; iV < views.count(); ++iV ) {
if ( SMESH_Actor* actor = FindActorByEntry( views[iV], theEntry)) {
- if(SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(views[iV]))
+ if(SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(views[iV])) {
vtkWnd->RemoveActor(actor);
+ actorRemoved = true;
+ }
actor->Delete();
}
}
+ }
+
+ if (aViewManager ) {
int aStudyId = aViewManager->study()->id();
TVisualObjCont::key_type aKey(aStudyId,theEntry);
TVisualObjCont::iterator anIter = VISUAL_OBJ_CONT.find(aKey);
}
VISUAL_OBJ_CONT.erase(aKey);
}
+
+ if(actorRemoved)
+ aStudy->setVisibilityState(theEntry, Qtx::HiddenState);
}
//================================================================================
/*!
}
SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow( SMESH::SObjectToObject( aSObj ));
- if(!CORBA::is_nil(aGroup))
+ if(!CORBA::is_nil(aGroup) && anActor)
{
SALOMEDS::Color aColor = aGroup->GetColor();
if( !( aColor.R > 0 || aColor.G > 0 || aColor.B > 0 ) )
VISUAL_OBJ_CONT.erase(aKey);
}
}
-#ifndef DISABLE_PLOT2DVIEWER
- ProcessIn2DViewers(theActor,RemoveFrom2dViewer);
-#endif
theActor->Delete();
vtkWnd->Repaint();
}
if (!aViewWnd)
return OK;
+ SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(theWnd);
+ if (!vtkWnd)
+ return OK;
+
+ SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>( vtkWnd->getViewManager()->study() );
+
+ if (!aStudy)
+ return OK;
+
{
OK = true;
vtkRenderer *aRenderer = aViewWnd->getRenderer();
if (SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)) {
MESSAGE("--- display " << anActor);
anActor->SetVisibility(true);
+
+ if(anActor->hasIO()){
+ Handle(SALOME_InteractiveObject) anIO = anActor->getIO();
+ if(anIO->hasEntry()){
+ aStudy->setVisibilityState(anIO->getEntry(), Qtx::ShownState);
+ }
+ }
}
}
break;
anActor->SetVisibility(false);
}
}
+ aStudy->setVisibilityStateForAll(Qtx::HiddenState);
}
default: {
if (SMESH_Actor *anActor = FindActorByEntry(theWnd,theEntry)) {
case eDisplay:
case eDisplayOnly:
//MESSAGE("--- display " << anActor);
+ anActor->Update();
anActor->SetVisibility(true);
if (theAction == eDisplayOnly) aRenderer->ResetCameraClippingRange();
+ aStudy->setVisibilityState(theEntry, Qtx::ShownState);
break;
case eErase:
//MESSAGE("--- erase " << anActor);
anActor->SetVisibility(false);
+ aStudy->setVisibilityState(theEntry, Qtx::HiddenState);
break;
}
} else {
if ((anActor = CreateActor(aDocument,theEntry,true))) {
bool needFitAll = noSmeshActors(theWnd); // fit for the first object only
DisplayActor(theWnd,anActor);
+ aStudy->setVisibilityState(theEntry, Qtx::ShownState);
// FitAll(); - PAL16770(Display of a group performs an automatic fit all)
if (needFitAll) FitAll();
} else {
}
#ifndef DISABLE_PLOT2DVIEWER
- //=======================================================================
- /**
- Get histogram from the input actor
- Repaint/Remove the histogram in/from each opened Plot2D Viewer
- */
- //=======================================================================
- void ProcessIn2DViewers( SMESH_Actor *theActor, Viewer2dActionType aType ) {
- SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>(SUIT_Session::session()->activeApplication());
-
- if(!anApp || !theActor)
- return;
+ //================================================================================
+ /*!
+ * \brief Find all SMESH_Actor's in the View Window.
+ * If actor constains Plot2d_Histogram object remove it from each Plot2d Viewer.
+ */
+ //================================================================================
- SPlot2d_Histogram* aHistogram = 0;
- if(theActor->GetPlot2Histogram())
- aHistogram = theActor->UpdatePlot2Histogram();
- else
- return;
-
- ViewManagerList aViewManagerList;
- anApp->viewManagers(SPlot2d_Viewer::Type(), aViewManagerList);
-
- aType = aHistogram->getPointList().empty() ? RemoveFrom2dViewer : aType;
-
- SUIT_ViewManager* aViewManager;
- foreach( aViewManager, aViewManagerList ) {
- if (Plot2d_ViewManager* aManager = dynamic_cast<Plot2d_ViewManager*>(aViewManager)) {
- if (SPlot2d_Viewer* aViewer = dynamic_cast<SPlot2d_Viewer*>(aManager->getViewModel())) {
- if (Plot2d_ViewFrame* aViewFrame = aViewer->getActiveViewFrame()) {
- if(aType == UpdateIn2dViewer )
- aViewFrame->displayObject(aHistogram, true);
- else if (aType == RemoveFrom2dViewer)
- aViewFrame->eraseObject(aHistogram, true);
- }
- }
- }
- }
+ void ClearPlot2Viewers( SUIT_ViewWindow* theWindow ) {
+ if(SVTK_ViewWindow* aViewWindow = GetVtkViewWindow(theWindow)){
+ vtkRenderer *aRenderer = aViewWindow->getRenderer();
+ VTK::ActorCollectionCopy aCopy(aRenderer->GetActors());
+ vtkActorCollection *aCollection = aCopy.GetActors();
+ aCollection->InitTraversal();
+ while(vtkActor *anAct = aCollection->GetNextActor()){
+ if(SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(anAct)){
+ if(anActor->hasIO() && anActor->GetPlot2Histogram() ){
+ ProcessIn2DViewers(anActor,RemoveFrom2dViewer);
+ }
+ }
+ }
+ }
}
-#endif //DISABLE_PLOT2DVIEWER
+
+#endif
+
} // end of namespace SMESH
