X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_VTKUtils.cxx;h=5b4a50483c47f05874e33398d63149ad2b4227a4;hp=eac67620e4a542e269441013450f698dad1d8e94;hb=9e3de95a12082efdff03ab6bd53267bab406b937;hpb=10191484fe88a27e962b8e4b57e09d390d8705c7 diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx index eac67620e..5b4a50483 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx @@ -774,12 +774,13 @@ namespace SMESH return false; } - void UpdateView(){ + void UpdateView( bool withChildrenOfSelected ) + { if ( SVTK_ViewWindow* aWnd = SMESH::GetCurrentVtkView()) { LightApp_SelectionMgr* mgr = SMESHGUI::selectionMgr(); SALOME_ListIO selected; mgr->selectedObjects( selected ); - if( selected.Extent() == 0){ + if ( selected.Extent() == 0 ) { vtkRenderer* aRenderer = aWnd->getRenderer(); VTK::ActorCollectionCopy aCopy(aRenderer->GetActors()); vtkActorCollection *aCollection = aCopy.GetActors(); @@ -788,15 +789,39 @@ namespace SMESH if(SMESH_Actor *anActor = dynamic_cast(anAct)){ if(anActor->hasIO()) if (!Update(anActor->getIO(),anActor->GetVisibility())) - break; // avoid multiple warinings if visu failed + break; // avoid multiple warnings if visu failed } } - }else{ + } + else + { SALOME_ListIteratorOfListIO anIter( selected ); - for( ; anIter.More(); anIter.Next()){ + for( ; anIter.More(); anIter.Next()) + { Handle(SALOME_InteractiveObject) anIO = anIter.Value(); - if ( !Update(anIO,true) ) - break; // avoid multiple warinings if visu failed + if ( !Update( anIO, true )) + break; // avoid multiple warnings if visu failed + + if ( withChildrenOfSelected ) // update all visible children + { + QString aFatherID = anIO->getEntry(); + vtkRenderer* aRenderer = aWnd->getRenderer(); + VTK::ActorCollectionCopy aCopy(aRenderer->GetActors()); + vtkActorCollection *aCollection = aCopy.GetActors(); + aCollection->InitTraversal(); + while ( vtkActor *anAct = aCollection->GetNextActor() ) { + if ( SMESH_Actor *anActor = dynamic_cast( anAct )) { + if ( anActor->hasIO() && anActor->GetVisibility() ) + { + QString aChildID = anActor->getIO()->getEntry(); + if ( aChildID.size() > aFatherID.size() && + aChildID.startsWith( aFatherID )) + if ( ! Update( anActor->getIO(), true )) + break; + } + } + } + } } } RepaintCurrentView(); @@ -1397,7 +1422,7 @@ namespace SMESH //================================================================================ /*! * \brief Find all SMESH_Actor's in the View Window. - * If actor constains Plot2d_Histogram object remove it from each Plot2d Viewer. + * If actor contains Plot2d_Histogram object remove it from each Plot2d Viewer. */ //================================================================================