X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_VTKUtils.cxx;h=9289f0108e1c0836c13b61637fdb70543f2c5335;hb=adc76cf234693fd9a7bb24ea76b6f43eb0bc7b9b;hp=76a8cb1a608233aceb6e8fc244863624ef189e2c;hpb=d0f366c4a3a66a71b0be94f7a6e2d146f80a94c4;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx index 76a8cb1a6..9289f0108 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx @@ -1,4 +1,6 @@ -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// Copyright (C) 2007-2008 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 @@ -15,67 +17,250 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org - - +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// SMESH SMESHGUI : GUI for SMESH component +// File : SMESHGUI_VTKUtils.cxx +// Author : Open CASCADE S.A.S. +// SMESH includes +// #include "SMESHGUI_VTKUtils.h" + +#include "SMESHGUI.h" #include "SMESHGUI_Utils.h" #include "SMESHGUI_Filter.h" -#include -#include - -#include +#include +#include +#include +#include +// SALOME GUI includes #include #include -#include +#include +#include +#include -#include "LightApp_SelectionMgr.h" +#include +#include + +#include +#include +#include -#include "SVTK_Selector.h" -#include "SVTK_ViewModel.h" -#include "SVTK_ViewWindow.h" +#include +#include +#include -#include "utilities.h" +// SALOME KERNEL includes +#include -#include "SALOMEconfig.h" -#include CORBA_CLIENT_HEADER(SMESH_Gen) +// IDL includes +#include #include CORBA_CLIENT_HEADER(SMESH_Mesh) #include CORBA_CLIENT_HEADER(SMESH_Group) -#include CORBA_CLIENT_HEADER(SMESH_Hypothesis) -#include "SMESHGUI.h" -#include "SMESH_Actor.h" -#include "SMESH_ObjectDef.h" +// VTK includes +#include +#include +#include -#include -#include -#include +// OCCT includes +#include +#include -#include -#include +namespace SMESH +{ + typedef std::map TVisualObjCont; + static TVisualObjCont VISUAL_OBJ_CONT; -#include -#include + //============================================================================= + /*! + * \brief Allocate some memory at construction and release it at destruction. + * Is used to be able to continue working after mesh generation or visualization + * break due to lack of memory + */ + //============================================================================= + + struct MemoryReserve + { + char* myBuf; + MemoryReserve(): myBuf( new char[1024*1024*1] ){} // 1M + void Free() { if (myBuf) { delete [] myBuf; myBuf = 0; }} + ~MemoryReserve() { Free(); } + }; + static MemoryReserve* theVISU_MemoryReserve = new MemoryReserve; + + //================================================================================ + /*! + * \brief Remove VisualObj and its actor from all views + */ + //================================================================================ + + void RemoveVisualObjectWithActors( const char* theEntry ) + { + SalomeApp_Application* app = dynamic_cast + ( SUIT_Session::session()->activeApplication() ); + SUIT_ViewManager* aViewManager = + app ? app->getViewManager(SVTK_Viewer::Type(), true) : 0; + if ( aViewManager ) { + QVector 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])) + vtkWnd->RemoveActor(actor); + actor->Delete(); + } + } + 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); + anIter->second->GetUnstructuredGrid()->SetPoints(0); + } + VISUAL_OBJ_CONT.erase(aKey); + } + } + //================================================================================ + /*! + * \brief Remove all VisualObjs and their actors from all views + */ + //================================================================================ -#include -using namespace std; + void RemoveAllObjectsWithActors() + { + SalomeApp_Application* app = dynamic_cast + ( SUIT_Session::session()->activeApplication() ); + if (!app) return; + 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()) { + QVector views = aViewManager->getViews(); + for ( int iV = 0; iV < views.count(); ++iV ) { + if(SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(views[iV])) { + vtkRenderer *aRenderer = vtkWnd->getRenderer(); + vtkActorCollection *actors = aRenderer->GetActors(); + for (int i = 0; i < actors->GetNumberOfItems(); ++i ) { + // size of actors changes inside the loop + while (SMESH_Actor *actor = dynamic_cast(actors->GetItemAsObject(i))) + { + vtkWnd->RemoveActor(actor); + actor->Delete(); + } + } + } + } + } + } + TVisualObjCont::iterator anIter = VISUAL_OBJ_CONT.begin(); + for ( ; anIter != VISUAL_OBJ_CONT.end(); ++anIter ) { + // for unknown reason, object destructor is not called, so clear object manually + anIter->second->GetUnstructuredGrid()->SetCells(0,0,0); + anIter->second->GetUnstructuredGrid()->SetPoints(0); + } + VISUAL_OBJ_CONT.clear(); + } -namespace SMESH{ + //================================================================================ + /*! + * \brief Remove all VisualObjs of a study + */ + //================================================================================ - typedef map TVisualObjCont; - static TVisualObjCont VISUAL_OBJ_CONT; + void RemoveVisuData(int studyID) + { + SalomeApp_Application* app = dynamic_cast + ( SUIT_Session::session()->activeApplication() ); + if (!app) return; + 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 ) { + QVector views = aViewManager->getViews(); + for ( int iV = 0; iV < views.count(); ++iV ) { + if(SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(views[iV])) { + vtkRenderer *aRenderer = vtkWnd->getRenderer(); + vtkActorCollection *actors = aRenderer->GetActors(); + for (int i = 0; i < actors->GetNumberOfItems(); ++i ) { + // size of actors changes inside the loop + while(SMESH_Actor *actor = dynamic_cast(actors->GetItemAsObject(i))) + { + vtkWnd->RemoveActor(actor); + actor->Delete(); + } + } + } + } + } + } + TVisualObjCont::iterator anIter = VISUAL_OBJ_CONT.begin(); + for ( ; anIter != VISUAL_OBJ_CONT.end(); ++anIter ) { + 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); + anIter->second->GetUnstructuredGrid()->SetPoints(0); + VISUAL_OBJ_CONT.erase( anIter-- ); // dercement occures before erase() + } + } + } + + //================================================================================ + /*! + * \brief Notify the user on problems during visualization + */ + //================================================================================ + + void OnVisuException() + { + try { +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 + OCC_CATCH_SIGNALS; +#endif + // PAL16774 (Crash after display of many groups). Salome sometimes crashes just + // after or at showing this message, so we do an additional check of available memory +// char* buf = new char[100*1024]; +// delete [] buf; + SUIT_MessageBox::warning(SMESHGUI::desktop(), QObject::tr("SMESH_WRN_WARNING"), + QObject::tr("SMESH_VISU_PROBLEM")); + } catch (...) { + // no more memory at all: last resort + MESSAGE_BEGIN ( "SMESHGUI_VTKUtils::OnVisuException(), exception even at showing a message!!!" << + std::endl << "Try to remove all visual data..." ); + if (theVISU_MemoryReserve) { + delete theVISU_MemoryReserve; + theVISU_MemoryReserve = 0; + } + RemoveAllObjectsWithActors(); + SUIT_MessageBox::warning(SMESHGUI::desktop(), QObject::tr("SMESH_WRN_WARNING"), + QObject::tr("SMESH_VISU_PROBLEM_CLEAR")); + MESSAGE_END ( "...done" ); + } + } + //================================================================================ + /*! + * \brief Returns an updated visual object + */ + //================================================================================ TVisualObjPtr GetVisualObj(int theStudyId, const char* theEntry){ TVisualObjPtr aVisualObj; + TVisualObjCont::key_type aKey(theStudyId,theEntry); try{ - TVisualObjCont::key_type aKey(theStudyId,theEntry); +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 + OCC_CATCH_SIGNALS; +#endif TVisualObjCont::iterator anIter = VISUAL_OBJ_CONT.find(aKey); if(anIter != VISUAL_OBJ_CONT.end()){ aVisualObj = anIter->second; }else{ - SalomeApp_Application* app = dynamic_cast( SMESHGUI::activeStudy()->application() ); + SalomeApp_Application* app = + dynamic_cast( SMESHGUI::activeStudy()->application() ); _PTR(Study) aStudy = SMESHGUI::activeStudy()->studyDS(); _PTR(SObject) aSObj = aStudy->FindObjectID(theEntry); if(aSObj){ @@ -85,16 +270,14 @@ namespace SMESH{ CORBA::String_var aVal = anIOR->Value().c_str(); CORBA::Object_var anObj = app->orb()->string_to_object( aVal.in() ); if(!CORBA::is_nil(anObj)){ - //Try narrow to SMESH_Mesh interafce + //Try narrow to SMESH_Mesh interface SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow(anObj); if(!aMesh->_is_nil()){ aVisualObj.reset(new SMESH_MeshObj(aMesh)); - aVisualObj->Update(); TVisualObjCont::value_type aValue(aKey,aVisualObj); VISUAL_OBJ_CONT.insert(aValue); - return aVisualObj; } - //Try narrow to SMESH_Group interafce + //Try narrow to SMESH_Group interface SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow(anObj); if(!aGroup->_is_nil()){ _PTR(SObject) aFatherSObj = aSObj->GetFather(); @@ -105,13 +288,11 @@ namespace SMESH{ TVisualObjPtr aVisObj = GetVisualObj(theStudyId,anEntry.in()); if(SMESH_MeshObj* aMeshObj = dynamic_cast(aVisObj.get())){ aVisualObj.reset(new SMESH_GroupObj(aGroup,aMeshObj)); - aVisualObj->Update(); TVisualObjCont::value_type aValue(aKey,aVisualObj); VISUAL_OBJ_CONT.insert(aValue); - return aVisualObj; } } - //Try narrow to SMESH_subMesh interafce + //Try narrow to SMESH_subMesh interface SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow(anObj); if(!aSubMesh->_is_nil()){ _PTR(SObject) aFatherSObj = aSObj->GetFather(); @@ -122,10 +303,8 @@ namespace SMESH{ TVisualObjPtr aVisObj = GetVisualObj(theStudyId,anEntry.in()); if(SMESH_MeshObj* aMeshObj = dynamic_cast(aVisObj.get())){ aVisualObj.reset(new SMESH_subMeshObj(aSubMesh,aMeshObj)); - aVisualObj->Update(); TVisualObjCont::value_type aValue(aKey,aVisualObj); VISUAL_OBJ_CONT.insert(aValue); - return aVisualObj; } } } @@ -134,38 +313,114 @@ namespace SMESH{ } }catch(...){ INFOS("GetMeshObj - There is no SMESH_Mesh object for the SALOMEDS::Strudy and Entry!!!"); + return TVisualObjPtr(); } + // Update object + bool objModified = false; + if ( aVisualObj ) { + try { +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 + OCC_CATCH_SIGNALS; +#endif + objModified = aVisualObj->Update(); + } + catch (...) { +#ifdef _DEBUG_ + MESSAGE ( "Exception in SMESHGUI_VTKUtils::GetVisualObj()" ); +#endif + RemoveVisualObjectWithActors( theEntry ); // remove this object + OnVisuException(); + aVisualObj.reset(); + } + } + + if ( objModified ) { + // PAL16631. Mesurements showed that to show aVisualObj in SHADING(default) mode, + // ~10 times more memory is used than it occupies. + // Warn the user if there is less free memory than 30 sizes of a grid + // TODO: estimate memory usage in other modes and take current mode into account + int freeMB = SMDS_Mesh::CheckMemory(true); + int usedMB = aVisualObj->GetUnstructuredGrid()->GetActualMemorySize() / 1024; + if ( freeMB > 0 && usedMB * 30 > freeMB ) { +#ifdef _DEBUG_ + MESSAGE ( "SMESHGUI_VTKUtils::GetVisualObj(), freeMB=" << freeMB + << ", usedMB=" << usedMB ); +#endif + bool continu = false; + if ( usedMB * 10 > freeMB ) + // even dont try to show + SUIT_MessageBox::warning(SMESHGUI::desktop(), QObject::tr("SMESH_WRN_WARNING"), + QObject::tr("SMESH_NO_MESH_VISUALIZATION")); + else + // there is a chance to succeed + continu = SUIT_MessageBox::warning + (SMESHGUI::desktop(), + QObject::tr("SMESH_WRN_WARNING"), + QObject::tr("SMESH_CONTINUE_MESH_VISUALIZATION"), + SUIT_MessageBox::Yes | SUIT_MessageBox::No, + SUIT_MessageBox::Yes ) == SUIT_MessageBox::Yes; + if ( !continu ) { + // remove the corresponding actors from all views + RemoveVisualObjectWithActors( theEntry ); + aVisualObj.reset(); + } + } + } + return aVisualObj; } - SVTK_ViewWindow* - GetViewWindow(const SalomeApp_Module* theModule) + /*! Return active view window, if it instantiates SVTK_ViewWindow class, + * overwise find or create corresponding view window, make it active and return it. + * \note Active VVTK_ViewWindow can be returned, because it inherits SVTK_ViewWindow. + */ + SVTK_ViewWindow* GetViewWindow (const SalomeApp_Module* theModule, + bool createIfNotFound) { - if (SalomeApp_Application* anApp = theModule->getApp()) - return dynamic_cast(anApp->desktop()->activeWindow()); + SalomeApp_Application* anApp; + if (theModule) + anApp = theModule->getApp(); + else + anApp = dynamic_cast + (SUIT_Session::session()->activeApplication()); + + if (anApp) { + if (SVTK_ViewWindow* aView = dynamic_cast(anApp->desktop()->activeWindow())) + return aView; + + SUIT_ViewManager* aViewManager = + anApp->getViewManager(SVTK_Viewer::Type(), createIfNotFound); + if (aViewManager) { + if (SUIT_ViewWindow* aViewWindow = aViewManager->getActiveView()) { + if (SVTK_ViewWindow* aView = dynamic_cast(aViewWindow)) { + aViewWindow->raise(); + aViewWindow->setFocus(); + return aView; + } + } + } + } return NULL; } - SVTK_ViewWindow* FindVtkViewWindow( SUIT_ViewManager* theMgr, - SUIT_ViewWindow* theWindow ) + SVTK_ViewWindow* FindVtkViewWindow (SUIT_ViewManager* theMgr, + SUIT_ViewWindow * theWindow) { if( !theMgr ) return NULL; - QPtrVector views = theMgr->getViews(); - if( views.containsRef( theWindow ) ) + QVector views = theMgr->getViews(); + if( views.contains( theWindow ) ) return GetVtkViewWindow( theWindow ); else return NULL; } - SVTK_ViewWindow* GetVtkViewWindow(SUIT_ViewWindow* theWindow){ return dynamic_cast(theWindow); } - /* SUIT_ViewWindow* GetActiveWindow() { SalomeApp_Application* app = dynamic_cast( SUIT_Session::session()->activeApplication() ); @@ -182,17 +437,80 @@ namespace SMESH{ return GetVtkViewWindow( GetActiveWindow() ); } + + void RepaintCurrentView() + { + if (SVTK_ViewWindow* wnd = GetCurrentVtkView()) + { + try { +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 + OCC_CATCH_SIGNALS; +#endif + wnd->getRenderer()->Render(); + wnd->Repaint(false); + } + catch (...) { +#ifdef _DEBUG_ + MESSAGE ( "Exception in SMESHGUI_VTKUtils::RepaintCurrentView()" ); +#endif + OnVisuException(); + } + } + } + void RepaintViewWindow(SVTK_ViewWindow* theWindow) { - theWindow->Repaint(); + try { +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 + OCC_CATCH_SIGNALS; +#endif + theWindow->getRenderer()->Render(); + theWindow->Repaint(); + } + catch (...) { +#ifdef _DEBUG_ + MESSAGE ( "Exception in SMESHGUI_VTKUtils::RepaintViewWindow(SVTK_ViewWindow*)" ); +#endif + OnVisuException(); + } } void RenderViewWindow(SVTK_ViewWindow* theWindow) { - theWindow->getRenderer()->Render(); - theWindow->Repaint(); + try { +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 + OCC_CATCH_SIGNALS; +#endif + theWindow->getRenderer()->Render(); + theWindow->Repaint(); + } + catch (...) { +#ifdef _DEBUG_ + MESSAGE ( "Exception in SMESHGUI_VTKUtils::RenderViewWindow(SVTK_ViewWindow*)" ); +#endif + OnVisuException(); + } } + void FitAll(){ + if(SVTK_ViewWindow* wnd = GetCurrentVtkView() ){ + try { +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 + OCC_CATCH_SIGNALS; +#endif + wnd->onFitAll(); + wnd->Repaint(); + } + catch (...) { +#ifdef _DEBUG_ + MESSAGE ( "Exception in SMESHGUI_VTKUtils::FitAll()" ); +#endif + OnVisuException(); + } + } + } + + SMESH_Actor* FindActorByEntry(SUIT_ViewWindow *theWindow, const char* theEntry) { @@ -253,6 +571,27 @@ namespace SMESH{ std::string aNameVal = aName->Value(); anActor = SMESH_Actor::New(aVisualObj,theEntry,aNameVal.c_str(),theIsClear); } + + SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow( SMESH::SObjectToObject( aSObj )); + if(!CORBA::is_nil(aGroup)) + { + SALOMEDS::Color aColor = aGroup->GetColor(); + if( !( aColor.R > 0 || aColor.G > 0 || aColor.B > 0 ) ) + { + int r = 0, g = 0, b = 0; + SMESH::GetColor( "SMESH", "fill_color", r, g, b, QColor( 0, 170, 255 ) ); + aColor.R = (float)r / 255.0; + aColor.G = (float)g / 255.0; + aColor.B = (float)b / 255.0; + aGroup->SetColor( aColor ); + } + if( aGroup->GetType() == SMESH::NODE ) + anActor->SetNodeColor( aColor.R, aColor.G, aColor.B ); + else if( aGroup->GetType() == SMESH::EDGE ) + anActor->SetEdgeColor( aColor.R, aColor.G, aColor.B ); + else + anActor->SetSufaceColor( aColor.R, aColor.G, aColor.B ); + } } } return anActor; @@ -261,8 +600,19 @@ namespace SMESH{ void DisplayActor( SUIT_ViewWindow *theWnd, SMESH_Actor* theActor){ if(SVTK_ViewWindow* vtkWnd = GetVtkViewWindow(theWnd)){ - vtkWnd->AddActor(theActor); - vtkWnd->Repaint(); + try { +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 + OCC_CATCH_SIGNALS; +#endif + vtkWnd->AddActor(theActor); + vtkWnd->Repaint(); + } + catch (...) { +#ifdef _DEBUG_ + MESSAGE ( "Exception in SMESHGUI_VTKUtils::DisplayActor()" ); +#endif + OnVisuException(); + } } } @@ -285,38 +635,42 @@ namespace SMESH{ } } + //================================================================================ + /*! + * \brief Return true if there are no SMESH actors in a view + */ + //================================================================================ - void FitAll(){ - if(SVTK_ViewWindow* wnd = GetCurrentVtkView() ){ - wnd->onFitAll(); - wnd->Repaint(); + bool noSmeshActors(SUIT_ViewWindow *theWnd) + { + if(SVTK_ViewWindow* aViewWindow = GetVtkViewWindow(theWnd)) { + vtkRenderer *aRenderer = aViewWindow->getRenderer(); + vtkActorCollection *aCollection = aRenderer->GetActors(); + aCollection->InitTraversal(); + while(vtkActor *anAct = aCollection->GetNextActor()) + if(dynamic_cast(anAct)) + return false; } + return true; } - vtkRenderer* GetCurrentRenderer(){ - if(SVTK_ViewWindow* wnd = GetCurrentVtkView() ) - return wnd->getRenderer(); - return NULL; - } - - void RepaintCurrentView(){ - if(SVTK_ViewWindow* wnd = GetCurrentVtkView() ) - { - wnd->getRenderer()->Render(); - wnd->Repaint(false); - } - } - - void UpdateView(SUIT_ViewWindow *theWnd, EDisplaing theAction, const char* theEntry) + bool UpdateView(SUIT_ViewWindow *theWnd, EDisplaing theAction, const char* theEntry) { - if(SVTK_ViewWindow* aViewWnd = GetVtkViewWindow(theWnd)){ + bool OK = false; + SVTK_ViewWindow* aViewWnd = GetVtkViewWindow(theWnd); + if (!aViewWnd) + return OK; + + { + OK = true; vtkRenderer *aRenderer = aViewWnd->getRenderer(); vtkActorCollection *aCollection = aRenderer->GetActors(); aCollection->InitTraversal(); - switch(theAction){ + + switch (theAction) { case eDisplayAll: { - while(vtkActor *anAct = aCollection->GetNextActor()){ - if(SMESH_Actor *anActor = dynamic_cast(anAct)){ + while (vtkActor *anAct = aCollection->GetNextActor()) { + if (SMESH_Actor *anActor = dynamic_cast(anAct)) { anActor->SetVisibility(true); } } @@ -324,48 +678,60 @@ namespace SMESH{ } case eDisplayOnly: case eEraseAll: { - while(vtkActor *anAct = aCollection->GetNextActor()){ - if(SMESH_Actor *anActor = dynamic_cast(anAct)){ + while (vtkActor *anAct = aCollection->GetNextActor()) { + if (SMESH_Actor *anActor = dynamic_cast(anAct)) { anActor->SetVisibility(false); } } } default: { - if(SMESH_Actor *anActor = FindActorByEntry(theWnd,theEntry)){ - switch(theAction) { + if (SMESH_Actor *anActor = FindActorByEntry(theWnd,theEntry)) { + switch (theAction) { case eDisplay: case eDisplayOnly: anActor->SetVisibility(true); + if (theAction == eDisplayOnly) aRenderer->ResetCameraClippingRange(); break; case eErase: anActor->SetVisibility(false); break; } } else { - switch(theAction){ + switch (theAction) { case eDisplay: - case eDisplayOnly:{ - SalomeApp_Study* aStudy = dynamic_cast( theWnd->getViewManager()->study() ); - _PTR(Study) aDocument = aStudy->studyDS(); - if((anActor = CreateActor(aDocument,theEntry,true))) { - DisplayActor(theWnd,anActor); - FitAll(); - } - break; - } + case eDisplayOnly: + { + 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(); + if (TVisualObjPtr aVisualObj = GetVisualObj(anId,theEntry)) + { + if ((anActor = CreateActor(aDocument,theEntry,true))) { + bool needFitAll = noSmeshActors(theWnd); // fit for the first object only + DisplayActor(theWnd,anActor); + // FitAll(); - PAL16770(Display of a group performs an automatic fit all) + if (needFitAll) FitAll(); + } else { + OK = false; + } + } + break; + } } } } } } + return OK; } - void UpdateView(EDisplaing theAction, const char* theEntry){ + bool UpdateView(EDisplaing theAction, const char* theEntry){ SalomeApp_Study* aStudy = dynamic_cast< SalomeApp_Study* >( GetActiveStudy() ); SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( aStudy->application() ); SUIT_ViewWindow *aWnd = app->activeViewManager()->getActiveView(); - UpdateView(aWnd,theAction,theEntry); + return UpdateView(aWnd,theAction,theEntry); } void UpdateView(){ @@ -380,14 +746,16 @@ namespace SMESH{ while(vtkActor *anAct = aCollection->GetNextActor()){ if(SMESH_Actor *anActor = dynamic_cast(anAct)){ if(anActor->hasIO()) - Update(anActor->getIO(),anActor->GetVisibility()); + if (!Update(anActor->getIO(),anActor->GetVisibility())) + break; // avoid multiple warinings if visu failed } } }else{ SALOME_ListIteratorOfListIO anIter( selected ); - for(; anIter.More(); anIter.Next()){ + for( ; anIter.More(); anIter.Next()){ Handle(SALOME_InteractiveObject) anIO = anIter.Value(); - Update(anIO,true); + if ( !Update(anIO,true) ) + break; // avoid multiple warinings if visu failed } } RepaintCurrentView(); @@ -395,16 +763,16 @@ namespace SMESH{ } - void Update(const Handle(SALOME_InteractiveObject)& theIO, - bool theDisplay) + bool Update(const Handle(SALOME_InteractiveObject)& theIO, bool theDisplay) { _PTR(Study) aStudy = GetActiveStudyDocument(); CORBA::Long anId = aStudy->StudyId(); - TVisualObjPtr aVisualObj = SMESH::GetVisualObj(anId,theIO->getEntry()); - if( aVisualObj ) - aVisualObj->Update(); - if ( theDisplay ) - UpdateView(SMESH::eDisplay,theIO->getEntry()); + if ( TVisualObjPtr aVisualObj = SMESH::GetVisualObj(anId,theIO->getEntry())) { + if ( theDisplay ) + UpdateView(SMESH::eDisplay,theIO->getEntry()); + return true; + } + return false; } @@ -426,7 +794,7 @@ namespace SMESH{ return; } - QPtrVector views = vm->getViews(); + QVector views = vm->getViews(); SUIT_ResourceMgr* mgr = SMESH::GetResourceMgr( theModule ); if( !mgr ) @@ -443,23 +811,24 @@ namespace SMESH{ PW = mgr->integerValue( "SMESH", "highlight_width", 5 ); double SP1 = mgr->doubleValue( "SMESH", "selection_precision_node", 0.025 ), - SP2 = mgr->doubleValue( "SMESH", "selection_precision_element", 0.001 ); + SP2 = mgr->doubleValue( "SMESH", "selection_precision_element", 0.001 ), + SP3 = mgr->doubleValue( "SMESH", "selection_precision_object", 0.025 ); for ( int i=0, n=views.count(); iSetSelectionProp(aSelColor.red()/255., + aVtkView->SetSelectionProp(aSelColor.red()/255., aSelColor.green()/255., - aSelColor.blue()/255., + aSelColor.blue()/255., SW ); // tolerances - aVtkView->SetSelectionTolerance(SP1, SP2); + aVtkView->SetSelectionTolerance(SP1, SP2, SP3); // pre-selection - aVtkView->SetPreselectionProp(aPreColor.red()/255., + aVtkView->SetPreselectionProp(aPreColor.red()/255., aPreColor.green()/255., - aPreColor.blue()/255., + aPreColor.blue()/255., PW); // update actors vtkRenderer* aRenderer = aVtkView->getRenderer(); @@ -467,10 +836,10 @@ namespace SMESH{ aCollection->InitTraversal(); while(vtkActor *anAct = aCollection->GetNextActor()){ if(SMESH_Actor *anActor = dynamic_cast(anAct)){ - anActor->SetHighlightColor(aHiColor.red()/255., + anActor->SetHighlightColor(aHiColor.red()/255., aHiColor.green()/255., aHiColor.blue()/255.); - anActor->SetPreHighlightColor(aPreColor.red()/255., + anActor->SetPreHighlightColor(aPreColor.red()/255., aPreColor.green()/255., aPreColor.blue()/255.); } @@ -481,7 +850,7 @@ namespace SMESH{ //---------------------------------------------------------------------------- - SVTK_Selector* + SVTK_Selector* GetSelector(SUIT_ViewWindow *theWindow) { if(SVTK_ViewWindow* aWnd = GetVtkViewWindow(theWindow)) @@ -514,7 +883,7 @@ namespace SMESH{ void RemoveFilters(SVTK_Selector* theSelector) { - for ( int id = SMESHGUI_NodeFilter; theSelector && id < SMESHGUI_LastFilter; id++ ) + for ( int id = SMESH::NodeFilter; theSelector && id < SMESH::LastFilter; id++ ) theSelector->RemoveFilter( id ); } @@ -592,7 +961,7 @@ namespace SMESH{ anIdContainer.insert(aMapIndex(i)); TIdContainer::const_iterator anIter = anIdContainer.begin(); - for(; anIter != anIdContainer.end(); anIter++) + for( ; anIter != anIdContainer.end(); anIter++) theName += QString(" %1").arg(*anIter); return aMapIndex.Extent(); @@ -672,12 +1041,12 @@ namespace SMESH{ if(FindActorByEntry(theIO->getEntry())){ TColStd_IndexedMapOfInteger aMapIndex; theMgr->GetIndexes(theIO,aMapIndex); - typedef set TIdContainer; + typedef std::set TIdContainer; TIdContainer anIdContainer; for( int i = 1; i <= aMapIndex.Extent(); i++) anIdContainer.insert(aMapIndex(i)); TIdContainer::const_iterator anIter = anIdContainer.begin(); - for(; anIter != anIdContainer.end(); anIter++){ + for( ; anIter != anIdContainer.end(); anIter++){ theName += QString(" %1").arg(*anIter); } return aMapIndex.Extent(); @@ -771,4 +1140,4 @@ namespace SMESH{ } } -} +} // end of namespace SMESH