X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_VTKUtils.cxx;h=b74d29e50b73237b8359e46843b9b364a6356a8d;hp=10bc6ba22351523fb3777999d8747c0da72b8bd6;hb=8d297d6698f361d4f2dde723050bcfbaea050920;hpb=7a713be33b27d6a8c77f983460f0e97e52c6ff7c diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx index 10bc6ba22..b74d29e50 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx @@ -32,6 +32,7 @@ #include "SMESHGUI_Utils.h" #include "SMDS_Mesh.hxx" #include "SMESH_Actor.h" +#include "SMESH_ActorProps.h" #include "SMESH_ActorUtils.h" #include "SMESH_CellLabelActor.h" #include "SMESH_ControlsDef.hxx" @@ -76,7 +77,7 @@ namespace SMESH { - typedef std::map TVisualObjCont; + typedef std::map TVisualObjCont; static TVisualObjCont VISUAL_OBJ_CONT; //============================================================================= @@ -136,17 +137,13 @@ namespace SMESH } } - if (aViewManager ) { - int aStudyId = aViewManager->study()->id(); - TVisualObjCont::key_type aKey(aStudyId,theEntry); - TVisualObjCont::iterator anIter = VISUAL_OBJ_CONT.find(aKey); - if(anIter != VISUAL_OBJ_CONT.end()) { - // for unknown reason, object destructor is not called, so clear object manually - anIter->second->GetUnstructuredGrid()->SetCells(0,0,0,0,0); - anIter->second->GetUnstructuredGrid()->SetPoints(0); - } - VISUAL_OBJ_CONT.erase(aKey); + TVisualObjCont::iterator anIter = VISUAL_OBJ_CONT.find(theEntry); + if(anIter != VISUAL_OBJ_CONT.end()) { + // for unknown reason, object destructor is not called, so clear object manually + anIter->second->GetUnstructuredGrid()->SetCells(0,0,0,0,0); + anIter->second->GetUnstructuredGrid()->SetPoints(0); } + VISUAL_OBJ_CONT.erase(theEntry); if(actorRemoved) aStudy->setVisibilityState(theEntry, Qtx::HiddenState); @@ -199,7 +196,7 @@ namespace SMESH */ //================================================================================ - void RemoveVisuData(int studyID) + void RemoveVisuData() { SalomeApp_Application* app = dynamic_cast ( SUIT_Session::session()->activeApplication() ); @@ -207,8 +204,7 @@ namespace SMESH ViewManagerList viewMgrs = app->viewManagers(); for ( int iM = 0; iM < viewMgrs.count(); ++iM ) { SUIT_ViewManager* aViewManager = viewMgrs.at( iM ); - if ( aViewManager && aViewManager->getType() == SVTK_Viewer::Type() && - aViewManager->study()->id() == studyID ) { + if ( aViewManager && aViewManager->getType() == SVTK_Viewer::Type() ) { QVector views = aViewManager->getViews(); for ( int iV = 0; iV < views.count(); ++iV ) { if(SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(views[iV])) { @@ -229,16 +225,10 @@ namespace SMESH } TVisualObjCont::iterator anIter = VISUAL_OBJ_CONT.begin(); for ( ; anIter != VISUAL_OBJ_CONT.end(); ) { - int curId = anIter->first.first; - if ( curId == studyID ) { - // for unknown reason, object destructor is not called, so clear object manually - anIter->second->GetUnstructuredGrid()->SetCells(0,0,0,0,0); - anIter->second->GetUnstructuredGrid()->SetPoints(0); - VISUAL_OBJ_CONT.erase( anIter++ ); // anIter++ returns a copy of self before incrementing - } - else { - anIter++; - } + // for unknown reason, object destructor is not called, so clear object manually + anIter->second->GetUnstructuredGrid()->SetCells(0,0,0,0,0); + anIter->second->GetUnstructuredGrid()->SetPoints(0); + VISUAL_OBJ_CONT.erase( anIter++ ); // anIter++ returns a copy of self before incrementing } } @@ -278,18 +268,17 @@ namespace SMESH */ //================================================================================ - TVisualObjPtr GetVisualObj(int theStudyId, const char* theEntry, bool nulData){ + TVisualObjPtr GetVisualObj(const char* theEntry, bool nulData){ TVisualObjPtr aVisualObj; - TVisualObjCont::key_type aKey(theStudyId,theEntry); try{ OCC_CATCH_SIGNALS; - TVisualObjCont::iterator anIter = VISUAL_OBJ_CONT.find(aKey); + TVisualObjCont::iterator anIter = VISUAL_OBJ_CONT.find(theEntry); if(anIter != VISUAL_OBJ_CONT.end()){ aVisualObj = anIter->second; }else{ SalomeApp_Application* app = dynamic_cast( SMESHGUI::activeStudy()->application() ); - _PTR(Study) aStudy = SMESHGUI::activeStudy()->studyDS(); + _PTR(Study) aStudy = SMESH::getStudy(); _PTR(SObject) aSObj = aStudy->FindObjectID(theEntry); if(aSObj){ _PTR(GenericAttribute) anAttr; @@ -302,7 +291,7 @@ namespace SMESH SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow(anObj); if(!aMesh->_is_nil()){ aVisualObj.reset(new SMESH_MeshObj(aMesh)); - TVisualObjCont::value_type aValue(aKey,aVisualObj); + TVisualObjCont::value_type aValue(theEntry,aVisualObj); VISUAL_OBJ_CONT.insert(aValue); } //Try narrow to SMESH_Group interface @@ -313,10 +302,10 @@ namespace SMESH aFatherSObj = aFatherSObj->GetFather(); if(!aFatherSObj) return aVisualObj; CORBA::String_var anEntry = aFatherSObj->GetID().c_str(); - TVisualObjPtr aVisObj = GetVisualObj(theStudyId,anEntry.in()); + TVisualObjPtr aVisObj = GetVisualObj(anEntry.in()); if(SMESH_MeshObj* aMeshObj = dynamic_cast(aVisObj.get())){ aVisualObj.reset(new SMESH_GroupObj(aGroup,aMeshObj)); - TVisualObjCont::value_type aValue(aKey,aVisualObj); + TVisualObjCont::value_type aValue(theEntry,aVisualObj); VISUAL_OBJ_CONT.insert(aValue); } } @@ -328,10 +317,10 @@ namespace SMESH aFatherSObj = aFatherSObj->GetFather(); if(!aFatherSObj) return aVisualObj; CORBA::String_var anEntry = aFatherSObj->GetID().c_str(); - TVisualObjPtr aVisObj = GetVisualObj(theStudyId,anEntry.in()); + TVisualObjPtr aVisObj = GetVisualObj(anEntry.in()); if(SMESH_MeshObj* aMeshObj = dynamic_cast(aVisObj.get())){ aVisualObj.reset(new SMESH_subMeshObj(aSubMesh,aMeshObj)); - TVisualObjCont::value_type aValue(aKey,aVisualObj); + TVisualObjCont::value_type aValue(theEntry,aVisualObj); VISUAL_OBJ_CONT.insert(aValue); } } @@ -553,7 +542,7 @@ namespace SMESH return NULL; if(!CORBA::is_nil(theObject)){ - _PTR(Study) aStudy = GetActiveStudyDocument(); + _PTR(Study) aStudy = getStudy(); CORBA::String_var anIOR = app->orb()->object_to_string( theObject ); _PTR(SObject) aSObject = aStudy->FindObjectIOR(anIOR.in()); if(aSObject){ @@ -565,14 +554,12 @@ namespace SMESH } - SMESH_Actor* CreateActor(_PTR(Study) theStudy, - const char* theEntry, + SMESH_Actor* CreateActor(const char* theEntry, int theIsClear) { SMESH_Actor *anActor = NULL; - CORBA::Long anId = theStudy->StudyId(); - if(TVisualObjPtr aVisualObj = GetVisualObj(anId,theEntry)){ - _PTR(SObject) aSObj = theStudy->FindObjectID(theEntry); + if(TVisualObjPtr aVisualObj = GetVisualObj(theEntry)){ + _PTR(SObject) aSObj = getStudy()->FindObjectID(theEntry); if(aSObj){ _PTR(GenericAttribute) anAttr; if(aSObj->FindAttribute(anAttr,"AttributeName")){ @@ -645,10 +632,7 @@ namespace SMESH Handle(SALOME_InteractiveObject) anIO = theActor->getIO(); if(anIO->hasEntry()){ std::string anEntry = anIO->getEntry(); - SalomeApp_Study* aStudy = dynamic_cast( vtkWnd->getViewManager()->study() ); - int aStudyId = aStudy->id(); - TVisualObjCont::key_type aKey(aStudyId,anEntry); - VISUAL_OBJ_CONT.erase(aKey); + VISUAL_OBJ_CONT.erase(anEntry); } } theActor->Delete(); @@ -753,13 +737,10 @@ namespace SMESH { //MESSAGE("---"); SalomeApp_Study* aStudy = dynamic_cast(theWnd->getViewManager()->study()); - _PTR(Study) aDocument = aStudy->studyDS(); - // Pass non-visual objects (hypotheses, etc.), return true in this case - CORBA::Long anId = aDocument->StudyId(); TVisualObjPtr aVisualObj; - if ( (aVisualObj = GetVisualObj(anId,theEntry)) && aVisualObj->IsValid()) + if ( (aVisualObj = GetVisualObj(theEntry)) && aVisualObj->IsValid()) { - if ((anActor = CreateActor(aDocument,theEntry,true))) { + if ((anActor = CreateActor(theEntry,true))) { bool needFitAll = noSmeshActors(theWnd); // fit for the first object only DisplayActor(theWnd,anActor); anActor->SetVisibility(true); @@ -794,12 +775,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(); @@ -808,15 +790,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(); @@ -827,9 +833,7 @@ namespace SMESH bool Update(const Handle(SALOME_InteractiveObject)& theIO, bool theDisplay) { //MESSAGE("Update"); - _PTR(Study) aStudy = GetActiveStudyDocument(); - CORBA::Long anId = aStudy->StudyId(); - if ( TVisualObjPtr aVisualObj = SMESH::GetVisualObj(anId,theIO->getEntry())) { + if ( TVisualObjPtr aVisualObj = SMESH::GetVisualObj(theIO->getEntry())) { if ( theDisplay ) UpdateView(SMESH::eDisplay,theIO->getEntry()); return true; @@ -840,9 +844,7 @@ namespace SMESH bool UpdateNulData(const Handle(SALOME_InteractiveObject)& theIO, bool theDisplay) { //MESSAGE("UpdateNulData"); - _PTR(Study) aStudy = GetActiveStudyDocument(); - CORBA::Long anId = aStudy->StudyId(); - if ( TVisualObjPtr aVisualObj = SMESH::GetVisualObj(anId,theIO->getEntry(), true)) { + if ( TVisualObjPtr aVisualObj = SMESH::GetVisualObj(theIO->getEntry(), true)) { if ( theDisplay ) UpdateView(SMESH::eDisplay,theIO->getEntry()); return true; @@ -878,6 +880,8 @@ namespace SMESH return; } + SMESH_ActorProps::props()->reset(); + QColor aHiColor = mgr->colorValue( "SMESH", "selection_object_color", Qt::white ), aSelColor = mgr->colorValue( "SMESH", "selection_element_color", Qt::yellow ), @@ -919,12 +923,7 @@ namespace SMESH aCollection->InitTraversal(); while ( vtkActor *anAct = aCollection->GetNextActor() ) { if ( SMESH_Actor *anActor = dynamic_cast(anAct) ) { - anActor->SetHighlightColor(aHiColor.red()/255., - aHiColor.green()/255., - aHiColor.blue()/255.); - anActor->SetPreHighlightColor(aPreColor.red()/255., - aPreColor.green()/255., - aPreColor.blue()/255.); + anActor->UpdateSelectionProps(); } } } @@ -1421,7 +1420,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. */ //================================================================================