From aacd3a638816ac9cb50dfa5284090d3270105e4a Mon Sep 17 00:00:00 2001 From: nds Date: Wed, 14 Sep 2005 06:39:30 +0000 Subject: [PATCH] Remove dependency from KERNEL --- src/Prs/Makefile.in | 2 +- src/PyInterp/Makefile.in | 2 +- src/PyInterp/PyInterp_base.cxx | 44 ++---- src/PyInterp/PyInterp_base.h | 5 +- src/SOCC/Makefile.in | 11 +- src/SOCC/SOCC_ViewModel.cxx | 141 ++++++++++++-------- src/SVTK/Makefile.in | 11 +- src/SVTK/SVTK_Actor.cxx | 2 - src/SVTK/SVTK_InteractorStyle.cxx | 16 --- src/SVTK/SVTK_RenderWindowInteractor.cxx | 11 -- src/SVTK/SVTK_Selector.cxx | 1 - src/SVTK/SVTK_ViewModel.cxx | 87 +++++++----- src/VTKViewer/VTKViewer_InteractorStyle.cxx | 15 --- src/VTKViewer/VTKViewer_ShrinkFilter.cxx | 8 -- 14 files changed, 164 insertions(+), 192 deletions(-) diff --git a/src/Prs/Makefile.in b/src/Prs/Makefile.in index 2ca3c38c5..73133a3e6 100755 --- a/src/Prs/Makefile.in +++ b/src/Prs/Makefile.in @@ -20,7 +20,7 @@ LIB_CLIENT_IDL = BIN = BIN_SRC = -CPPFLAGS+= -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS+= LDFLAGS+= diff --git a/src/PyInterp/Makefile.in b/src/PyInterp/Makefile.in index 15e6ba005..1672f5ada 100755 --- a/src/PyInterp/Makefile.in +++ b/src/PyInterp/Makefile.in @@ -44,7 +44,7 @@ LIB_SRC= PyInterp_base.cxx \ LIB_MOC = PyInterp_Watcher.h -CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_INCLUDES) -I$(KERNEL_ROOT_DIR)/include/salome +CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_INCLUDES) LDFLAGS+= $(PYTHON_LIBS) $(QT_MT_LIBS) diff --git a/src/PyInterp/PyInterp_base.cxx b/src/PyInterp/PyInterp_base.cxx index 4c427d7ef..e9fdcb259 100644 --- a/src/PyInterp/PyInterp_base.cxx +++ b/src/PyInterp/PyInterp_base.cxx @@ -14,46 +14,29 @@ #include #include "PyInterp_base.h" // this include must be first (see PyInterp_base.h)! -#include #include -#include - - using namespace std; - -//#ifdef _DEBUG_ -//static int MYDEBUG = 1; -//static int MYPYDEBUG = 1; -//#else -//static int MYDEBUG = 0; -//static int MYPYDEBUG = 0; -//#endif - - PyLockWrapper::PyLockWrapper(PyThreadState* theThreadState): myThreadState(theThreadState), - mySaveThreadState(KERNEL_PYTHON::_gtstate) + mySaveThreadState(0) { PyEval_AcquireLock(); mySaveThreadState = PyThreadState_Swap(myThreadState); // store previous current in save, // set local in current -// if(MYDEBUG) MESSAGE(" PyLockWrapper "< -#include CORBA_CLIENT_HEADER(SALOMEDS) +// Temporarily commented to avoid awful dependecy on SALOMEDS +// TODO: better mechanism of storing display/erse status in a study +// should be provided... +//#include +//#include CORBA_CLIENT_HEADER(SALOMEDS) #include #include @@ -17,13 +20,16 @@ #include #include -#include -#include -#include -#include +// Temporarily commented to avoid awful dependecy on SALOMEDS +// TODO: better mechanism of storing display/erse status in a study +// should be provided... +//#include +//#include +//#include +//#include -#include "SALOMEDSClient.hxx" -#include "SALOMEDS_StudyManager.hxx" +//#include "SALOMEDSClient.hxx" +//#include "SALOMEDS_StudyManager.hxx" #include @@ -31,21 +37,24 @@ // SalomeApp_Study::studyDS() does it as well, but -- here it is retrieved from // SALOMEDS::StudyManager - no linkage with SalomeApp. -static _PTR(Study) getStudyDS() -{ - SALOMEDSClient_Study* aStudy = NULL; - _PTR(StudyManager) aMgr( new SALOMEDS_StudyManager() ); +// Temporarily commented to avoid awful dependecy on SALOMEDS +// TODO: better mechanism of storing display/erse status in a study +// should be provided... +//static _PTR(Study) getStudyDS() +//{ +// SALOMEDSClient_Study* aStudy = NULL; +// _PTR(StudyManager) aMgr( new SALOMEDS_StudyManager() ); // get id of SUIT_Study, if it's a SalomeApp_Study, it will return // id of its underlying SALOMEDS::Study - SUIT_Application* app = SUIT_Session::session()->activeApplication(); - if ( !app ) return _PTR(Study)(aStudy); - SUIT_Study* stud = app->activeStudy(); - if ( !stud ) return _PTR(Study)(aStudy); - const int id = stud->id(); // virtual method, must return SALOMEDS_Study id +// SUIT_Application* app = SUIT_Session::session()->activeApplication(); +// if ( !app ) return _PTR(Study)(aStudy); +// SUIT_Study* stud = app->activeStudy(); +// if ( !stud ) return _PTR(Study)(aStudy); +// const int id = stud->id(); // virtual method, must return SALOMEDS_Study id // get SALOMEDS_Study with this id from StudyMgr - return aMgr->GetStudyByID( id ); -} +// return aMgr->GetStudyByID( id ); +//} SOCC_Viewer::SOCC_Viewer( bool DisplayTrihedron ) : OCCViewer_Viewer( DisplayTrihedron ) @@ -244,7 +253,10 @@ void SOCC_Viewer::Display( const SALOME_OCCPrs* prs ) return; // get SALOMEDS Study - _PTR(Study) study(getStudyDS()); + // Temporarily commented to avoid awful dependecy on SALOMEDS + // TODO: better mechanism of storing display/erse status in a study + // should be provided... + // _PTR(Study) study(getStudyDS()); // get context Handle (AIS_InteractiveContext) ic = getAISContext(); @@ -303,14 +315,16 @@ void SOCC_Viewer::Display( const SALOME_OCCPrs* prs ) bDisplayed = true; // Set visibility flag - Handle(SALOME_InteractiveObject) anObj = - Handle(SALOME_InteractiveObject)::DownCast( anAIS->GetOwner() ); - if ( !anObj.IsNull() && anObj->hasEntry() ) - { - if ( study ) - ToolsGUI::SetVisibility( study, anObj->getEntry(), true, this ); - } - + // Temporarily commented to avoid awful dependecy on SALOMEDS + // TODO: better mechanism of storing display/erse status in a study + // should be provided... + //Handle(SALOME_InteractiveObject) anObj = + // Handle(SALOME_InteractiveObject)::DownCast( anAIS->GetOwner() ); + //if ( !anObj.IsNull() && anObj->hasEntry() ) + //{ + // if ( study ) + // ToolsGUI::SetVisibility( study, anObj->getEntry(), true, this ); + //} break; } } @@ -329,13 +343,16 @@ void SOCC_Viewer::Display( const SALOME_OCCPrs* prs ) ic->Display( anAIS, false ); // Set visibility flag - Handle(SALOME_InteractiveObject) anObj = - Handle(SALOME_InteractiveObject)::DownCast( anAIS->GetOwner() ); - if ( !anObj.IsNull() && anObj->hasEntry() ) - { - if ( study ) - ToolsGUI::SetVisibility( study, anObj->getEntry(), true, this ); - } + // Temporarily commented to avoid awful dependecy on SALOMEDS + // TODO: better mechanism of storing display/erse status in a study + // should be provided... + //Handle(SALOME_InteractiveObject) anObj = + // Handle(SALOME_InteractiveObject)::DownCast( anAIS->GetOwner() ); + //if ( !anObj.IsNull() && anObj->hasEntry() ) + //{ + // if ( study ) + // ToolsGUI::SetVisibility( study, anObj->getEntry(), true, this ); + //} // Deactivate object if necessary if ( !anOCCPrs->ToActivate() ) @@ -356,7 +373,10 @@ void SOCC_Viewer::Erase( const SALOME_OCCPrs* prs, const bool forced ) return; // get SALOMEDS Study - _PTR(Study) study(getStudyDS()); + // Temporarily commented to avoid awful dependecy on SALOMEDS + // TODO: better mechanism of storing display/erse status in a study + // should be provided... + // _PTR(Study) study(getStudyDS()); // get context Handle(AIS_InteractiveContext) ic = getAISContext(); @@ -373,16 +393,19 @@ void SOCC_Viewer::Erase( const SALOME_OCCPrs* prs, const bool forced ) ic->Erase( anAIS, false, forced ? false : true ); // Set visibility flag if necessary - if ( !forced ) - { - Handle(SALOME_InteractiveObject) anObj = - Handle(SALOME_InteractiveObject)::DownCast( anAIS->GetOwner() ); - if ( !anObj.IsNull() && anObj->hasEntry() ) - { - if ( study ) - ToolsGUI::SetVisibility( study, anObj->getEntry(), true, this ); - } - } + // Temporarily commented to avoid awful dependecy on SALOMEDS + // TODO: better mechanism of storing display/erse status in a study + // should be provided... + //if ( !forced ) + //{ + // Handle(SALOME_InteractiveObject) anObj = + // Handle(SALOME_InteractiveObject)::DownCast( anAIS->GetOwner() ); + // if ( !anObj.IsNull() && anObj->hasEntry() ) + // { + // if ( study ) + // ToolsGUI::SetVisibility( study, anObj->getEntry(), true, this ); + // } + //} } } } @@ -394,7 +417,10 @@ void SOCC_Viewer::Erase( const SALOME_OCCPrs* prs, const bool forced ) void SOCC_Viewer::EraseAll( const bool forced ) { // get SALOMEDS Study - _PTR(Study) study(getStudyDS()); + // Temporarily commented to avoid awful dependecy on SALOMEDS + // TODO: better mechanism of storing display/erse status in a study + // should be provided... + // _PTR(Study) study(getStudyDS()); // get context Handle(AIS_InteractiveContext) ic = getAISContext(); @@ -415,15 +441,18 @@ void SOCC_Viewer::EraseAll( const bool forced ) ic->Erase( anIO, false, forced ? false : true ); // Set visibility flag if necessary - if ( !forced ) { - Handle(SALOME_InteractiveObject) anObj = - Handle(SALOME_InteractiveObject)::DownCast( anIO->GetOwner() ); - - if ( !anObj.IsNull() && anObj->hasEntry() ) { - if ( study ) - ToolsGUI::SetVisibility( study, anObj->getEntry(), true, this ); - } - } + // Temporarily commented to avoid awful dependecy on SALOMEDS + // TODO: better mechanism of storing display/erse status in a study + // should be provided... + //if ( !forced ) { + // Handle(SALOME_InteractiveObject) anObj = + // Handle(SALOME_InteractiveObject)::DownCast( anIO->GetOwner() ); + + // if ( !anObj.IsNull() && anObj->hasEntry() ) { + // if ( study ) + // ToolsGUI::SetVisibility( study, anObj->getEntry(), true, this ); + // } + //} } // display trihedron if necessary diff --git a/src/SVTK/Makefile.in b/src/SVTK/Makefile.in index e41cfb610..928dfd5eb 100755 --- a/src/SVTK/Makefile.in +++ b/src/SVTK/Makefile.in @@ -48,14 +48,9 @@ LIB_MOC = SVTK_RenderWindowInteractor.h \ SVTK_ViewModel.h \ SVTK_ViewManager.h -LIB_CLIENT_IDL = SALOMEDS.idl \ - SALOME_Exception.idl \ - SALOME_ModuleCatalog.idl \ - SALOME_GenericObj.idl +CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(BOOST_CPPFLAGS) -CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome - -LDFLAGS+=$(QT_MT_LIBS) $(OCC_LIBS) $(VTK_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -LIBS+= -lsuit -lCAM -lSalomeObject -lSalomePrs -lVTKViewer -lOpUtil +LDFLAGS+=$(QT_MT_LIBS) $(OCC_LIBS) $(VTK_LIBS) +LIBS+= -lsuit -lCAM -lSalomeObject -lSalomePrs -lVTKViewer @CONCLUDE@ diff --git a/src/SVTK/SVTK_Actor.cxx b/src/SVTK/SVTK_Actor.cxx index 1ec5fa4b1..c958f2852 100644 --- a/src/SVTK/SVTK_Actor.cxx +++ b/src/SVTK/SVTK_Actor.cxx @@ -31,8 +31,6 @@ #include #include -//#include "utilities.h" - using namespace std; #ifdef _DEBUG_ diff --git a/src/SVTK/SVTK_InteractorStyle.cxx b/src/SVTK/SVTK_InteractorStyle.cxx index 0a5e19f49..6564c0007 100644 --- a/src/SVTK/SVTK_InteractorStyle.cxx +++ b/src/SVTK/SVTK_InteractorStyle.cxx @@ -29,8 +29,6 @@ #include "SVTK_InteractorStyle.h" -#include "utilities.h" - #include "VTKViewer_CellRectPicker.h" #include "VTKViewer_Utilities.h" #include "VTKViewer_RectPicker.h" @@ -74,12 +72,6 @@ using namespace std; -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif - namespace { int @@ -147,7 +139,6 @@ SVTK_InteractorStyle SVTK_InteractorStyle ::~SVTK_InteractorStyle() { - if(MYDEBUG) INFOS("SVTK_InteractorStyle::~SVTK_InteractorStyle()"); myViewWindow->RemoveActor(myPreSelectionActor); } @@ -911,7 +902,6 @@ SVTK_InteractorStyle Handle(SALOME_InteractiveObject) anIO = aSActor->getIO(); if(aSelectionMode != EdgeOfCellSelection) { if(CheckDimensionId(aSelectionMode,aSActor,anObjId)){ - if(MYDEBUG) INFOS(" CellId : "<IsSelected(anIO)) { // This IO is already in the selection GetSelector()->AddOrRemoveIndex(anIO,anObjId,myShiftState); @@ -931,7 +921,6 @@ SVTK_InteractorStyle } int anEdgeId = GetEdgeId(picker,aSActor,anObjId); if (anEdgeId >= 0) { - if(MYDEBUG) INFOS(" CellId : "<AddOrRemoveIndex(anIO,anObjId,false); GetSelector()->AddOrRemoveIndex(anIO,-anEdgeId-1,true); GetSelector()->AddIObject(aSActor); @@ -957,7 +946,6 @@ SVTK_InteractorStyle this->HighlightProp( NULL ); GetSelector()->ClearIObjects(); } - if(MYDEBUG) INFOS(" PointId : "<AddOrRemoveIndex(anIO,anObjId,myShiftState); GetSelector()->AddIObject(aSActor); } @@ -1087,7 +1075,6 @@ SVTK_InteractorStyle continue; VTKViewer_CellDataSet cellList = picker->GetCellData(aActor); if ( !cellList.empty() ) { - if(MYDEBUG) INFOS ( " NAME Actor : " << aSActor->getName() ); TColStd_MapOfInteger anIndexes; VTKViewer_CellDataSet::iterator it; for ( it = cellList.begin(); it != cellList.end(); ++it ) { @@ -1273,7 +1260,6 @@ SVTK_InteractorStyle if(aResult){ mySelectedActor = aSActor; myElemId = anObjId; - if(MYDEBUG) INFOS(" CellId : "<setCellData(anObjId,aSActor,myPreSelectionActor); } } @@ -1288,7 +1274,6 @@ SVTK_InteractorStyle mySelectedActor = aSActor; myEdgeId = anEdgeId; myElemId = anObjId; - if(MYDEBUG) INFOS(" CellId : "<setEdgeData(anObjId,aSActor,-anEdgeId-1,myPreSelectionActor); } } @@ -1309,7 +1294,6 @@ SVTK_InteractorStyle if(!anIsSameObjId) { mySelectedActor = aSActor; myNodeId = anObjId; - if(MYDEBUG) INFOS(" PointId : "<setPointData(anObjId,aSActor,myPreSelectionActor); } myPreSelectionActor->GetProperty()->SetRepresentationToSurface(); diff --git a/src/SVTK/SVTK_RenderWindowInteractor.cxx b/src/SVTK/SVTK_RenderWindowInteractor.cxx index a80733492..55dd794e7 100644 --- a/src/SVTK/SVTK_RenderWindowInteractor.cxx +++ b/src/SVTK/SVTK_RenderWindowInteractor.cxx @@ -54,17 +54,8 @@ #include -#include "utilities.h" - using namespace std; -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif - - SVTK_RenderWindowInteractor* SVTK_RenderWindowInteractor ::New() @@ -113,8 +104,6 @@ SVTK_RenderWindowInteractor SVTK_RenderWindowInteractor ::~SVTK_RenderWindowInteractor() { - if(MYDEBUG) INFOS("SVTK_RenderWindowInteractor::~SVTK_RenderWindowInteractor()"); - delete mTimer ; myViewWindow->RemoveActor(myCellActor); diff --git a/src/SVTK/SVTK_Selector.cxx b/src/SVTK/SVTK_Selector.cxx index 96690603e..7a18425d5 100644 --- a/src/SVTK/SVTK_Selector.cxx +++ b/src/SVTK/SVTK_Selector.cxx @@ -36,7 +36,6 @@ #include "SVTK_ViewWindow.h" #include "SVTK_SelectorDef.h" -#include "utilities.h" SVTK_SelectorDef ::SVTK_SelectorDef() diff --git a/src/SVTK/SVTK_ViewModel.cxx b/src/SVTK/SVTK_ViewModel.cxx index 17f0ac85c..02bdb6d64 100644 --- a/src/SVTK/SVTK_ViewModel.cxx +++ b/src/SVTK/SVTK_ViewModel.cxx @@ -20,33 +20,38 @@ #include "SALOME_Actor.h" #include "SALOME_InteractiveObject.hxx" -#include "Utils_ORB_INIT.hxx" -#include "Utils_SINGLETON.hxx" -#include "SALOME_ModuleCatalog_impl.hxx" -#include "SALOME_NamingService.hxx" +// Temporarily commented to avoid awful dependecy on SALOMEDS +// TODO: better mechanism of storing display/erse status in a study +// should be provided... +//#include "Utils_ORB_INIT.hxx" +//#include "Utils_SINGLETON.hxx" +//#include "SALOME_ModuleCatalog_impl.hxx" +//#include "SALOME_NamingService.hxx" -#include "SALOMEDSClient.hxx" -#include "SALOMEDS_StudyManager.hxx" +//#include "SALOMEDSClient.hxx" +//#include "SALOMEDS_StudyManager.hxx" // in order NOT TO link with SalomeApp, here the code returns SALOMEDS_Study. // SalomeApp_Study::studyDS() does it as well, but -- here it is retrieved from // SALOMEDS::StudyManager - no linkage with SalomeApp. -static _PTR(Study) getStudyDS() -{ - SALOMEDSClient_Study* aStudy = NULL; - _PTR(StudyManager) aMgr( new SALOMEDS_StudyManager() ); - +// Temporarily commented to avoid awful dependecy on SALOMEDS +// TODO: better mechanism of storing display/erse status in a study +// should be provided... +//static _PTR(Study) getStudyDS() +//{ +// SALOMEDSClient_Study* aStudy = NULL; +// _PTR(StudyManager) aMgr( new SALOMEDS_StudyManager() ); // get id of SUIT_Study, if it's a SalomeApp_Study, it will return // id of its underlying SALOMEDS::Study - SUIT_Application* app = SUIT_Session::session()->activeApplication(); - if ( !app ) return _PTR(Study)(aStudy); - SUIT_Study* stud = app->activeStudy(); - if ( !stud ) return _PTR(Study)(aStudy); - const int id = stud->id(); // virtual method, must return SALOMEDS_Study id +// SUIT_Application* app = SUIT_Session::session()->activeApplication(); +// if ( !app ) return _PTR(Study)(aStudy); +// SUIT_Study* stud = app->activeStudy(); +// if ( !stud ) return _PTR(Study)(aStudy); +// const int id = stud->id(); // virtual method, must return SALOMEDS_Study id // get SALOMEDS_Study with this id from StudyMgr - return aMgr->GetStudyByID( id ); -} +// return aMgr->GetStudyByID( id ); +//} //========================================================== SVTK_Viewer::SVTK_Viewer() @@ -254,15 +259,21 @@ SVTK_Viewer return; if(vtkActorCollection* anActorCollection = aPrs->GetObjects()){ // get SALOMEDS Study - _PTR(Study) aStudy(getStudyDS()); + // Temporarily commented to avoid awful dependecy on SALOMEDS + // TODO: better mechanism of storing display/erse status in a study + // should be provided... + // _PTR(Study) aStudy(getStudyDS()); anActorCollection->InitTraversal(); while(vtkActor* anActor = anActorCollection->GetNextActor()){ if(SALOME_Actor* anAct = SALOME_Actor::SafeDownCast(anActor)){ // Set visibility flag - Handle(SALOME_InteractiveObject) anObj = anAct->getIO(); - if(!anObj.IsNull() && anObj->hasEntry() && aStudy){ - ToolsGUI::SetVisibility(aStudy,anObj->getEntry(),true,this); - } + // Temporarily commented to avoid awful dependecy on SALOMEDS + // TODO: better mechanism of storing display/erse status in a study + // should be provided... + //Handle(SALOME_InteractiveObject) anObj = anAct->getIO(); + //if(!anObj.IsNull() && anObj->hasEntry() && aStudy){ + // ToolsGUI::SetVisibility(aStudy,anObj->getEntry(),true,this); + //} // just display the object QPtrVector aViews = myViewManager->getViews(); for(int i = 0, iEnd = aViews.size(); i < iEnd; i++){ @@ -295,15 +306,21 @@ SVTK_Viewer return; if(vtkActorCollection* anActorCollection = aPrs->GetObjects()){ // get SALOMEDS Study - _PTR(Study) aStudy(getStudyDS()); + // Temporarily commented to avoid awful dependecy on SALOMEDS + // TODO: better mechanism of storing display/erse status in a study + // should be provided... + //_PTR(Study) aStudy(getStudyDS()); anActorCollection->InitTraversal(); while(vtkActor* anActor = anActorCollection->GetNextActor()) if(SALOME_Actor* anAct = SALOME_Actor::SafeDownCast(anActor)){ // Set visibility flag - Handle(SALOME_InteractiveObject) anObj = anAct->getIO(); - if(!anObj.IsNull() && anObj->hasEntry() && aStudy){ - ToolsGUI::SetVisibility(aStudy,anObj->getEntry(),false,this); - } + // Temporarily commented to avoid awful dependecy on SALOMEDS + // TODO: better mechanism of storing display/erse status in a study + // should be provided... + //Handle(SALOME_InteractiveObject) anObj = anAct->getIO(); + //if(!anObj.IsNull() && anObj->hasEntry() && aStudy){ + // ToolsGUI::SetVisibility(aStudy,anObj->getEntry(),false,this); + //} // just display the object QPtrVector aViews = myViewManager->getViews(); for(int i = 0, iEnd = aViews.size(); i < iEnd; i++){ @@ -325,7 +342,10 @@ void SVTK_Viewer ::EraseAll( const bool forced ) { - _PTR(Study) aStudy(getStudyDS()); + // Temporarily commented to avoid awful dependecy on SALOMEDS + // TODO: better mechanism of storing display/erse status in a study + // should be provided... + //_PTR(Study) aStudy(getStudyDS()); QPtrVector aViews = myViewManager->getViews(); for(int i = 0, iEnd = aViews.size(); i < iEnd; i++){ if(SUIT_ViewWindow* aViewWindow = aViews.at(i)){ @@ -336,9 +356,12 @@ SVTK_Viewer while(vtkActor* anActor = anActorCollection->GetNextActor()){ if(SALOME_Actor* anAct = SALOME_Actor::SafeDownCast(anActor)){ // Set visibility flag - Handle(SALOME_InteractiveObject) anObj = anAct->getIO(); - if(!anObj.IsNull() && anObj->hasEntry() && aStudy) - ToolsGUI::SetVisibility(aStudy,anObj->getEntry(),false,this); + // Temporarily commented to avoid awful dependecy on SALOMEDS + // TODO: better mechanism of storing display/erse status in a study + // should be provided... + //Handle(SALOME_InteractiveObject) anObj = anAct->getIO(); + //if(!anObj.IsNull() && anObj->hasEntry() && aStudy) + // ToolsGUI::SetVisibility(aStudy,anObj->getEntry(),false,this); if(forced) aRenderer->RemoveActor(anAct); else{ diff --git a/src/VTKViewer/VTKViewer_InteractorStyle.cxx b/src/VTKViewer/VTKViewer_InteractorStyle.cxx index 18a496089..fa407641d 100644 --- a/src/VTKViewer/VTKViewer_InteractorStyle.cxx +++ b/src/VTKViewer/VTKViewer_InteractorStyle.cxx @@ -64,12 +64,6 @@ using namespace std; -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif - /* static int GetEdgeId(vtkPicker *thePicker, SALOME_Actor *theActor, int theObjId){ int anEdgeId = -1; @@ -117,7 +111,6 @@ VTKViewer_InteractorStyle::VTKViewer_InteractorStyle() /*!Destructor.*/ VTKViewer_InteractorStyle::~VTKViewer_InteractorStyle() { -// if(MYDEBUG) INFOS("VTKViewer_InteractorStyle::~VTKViewer_InteractorStyle()"); m_ViewWnd->RemoveActor(myPreSelectionActor); } @@ -899,7 +892,6 @@ void VTKViewer_InteractorStyle::onFinishOperation() Handle(SALOME_InteractiveObject) IO = SActor->getIO(); if(aSelectionMode != EdgeOfCellSelection) { if(CheckDimensionId(aSelectionMode,SActor,anObjId)){ - if(MYDEBUG) INFOS(" CellId : "<AddOrRemoveIndex( IO, anObjId, myShiftState, false ); @@ -919,7 +911,6 @@ void VTKViewer_InteractorStyle::onFinishOperation() } int anEdgeId = GetEdgeId(picker,SActor,anObjId); if (anEdgeId >= 0) { - if(MYDEBUG) INFOS(" CellId : "<AddOrRemoveIndex( IO, anObjId, true, false); aSel->AddOrRemoveIndex( IO, -anEdgeId-1, true, true ); aSel->AddIObject( IO, false ); @@ -945,7 +936,6 @@ void VTKViewer_InteractorStyle::onFinishOperation() this->HighlightProp( NULL ); aSel->ClearIObjects(); } - if(MYDEBUG) INFOS(" PointId : "<AddOrRemoveIndex( IO, anObjId, myShiftState, false ); aSel->AddIObject( IO, false ); } @@ -1076,7 +1066,6 @@ void VTKViewer_InteractorStyle::onFinishOperation() continue; VTKViewer_CellDataSet cellList = picker->GetCellData(aActor); if ( !cellList.empty() ) { - if(MYDEBUG) INFOS ( " NAME Actor : " << aSActor->getName() ); SALOME_Selection::TContainerOfId anIndexes; VTKViewer_CellDataSet::iterator it; for ( it = cellList.begin(); it != cellList.end(); ++it ) { @@ -1260,7 +1249,6 @@ void VTKViewer_InteractorStyle::onCursorMove(QPoint mousePos) { if(aResult){ mySelectedActor = SActor; myElemId = anObjId; - if(MYDEBUG) INFOS(" CellId : "<setCellData(anObjId,SActor,myPreSelectionActor); } } @@ -1275,7 +1263,6 @@ void VTKViewer_InteractorStyle::onCursorMove(QPoint mousePos) { mySelectedActor = SActor; myEdgeId = anEdgeId; myElemId = anObjId; - if(MYDEBUG) INFOS(" CellId : "<setEdgeData(anObjId,SActor,-anEdgeId-1,myPreSelectionActor); } } @@ -1296,7 +1283,6 @@ void VTKViewer_InteractorStyle::onCursorMove(QPoint mousePos) { if(!anIsSameObjId) { mySelectedActor = SActor; myNodeId = anObjId; - if(MYDEBUG) INFOS(" PointId : "<setPointData(anObjId,SActor,myPreSelectionActor); } myPreSelectionActor->GetProperty()->SetRepresentationToSurface(); @@ -1328,7 +1314,6 @@ void VTKViewer_InteractorStyle::onCursorMove(QPoint mousePos) { } } } - //if(MYDEBUG) INFOS ( " NAME PREVIEW " << SActor->getName() ); } } } diff --git a/src/VTKViewer/VTKViewer_ShrinkFilter.cxx b/src/VTKViewer/VTKViewer_ShrinkFilter.cxx index f980b5c0d..c65699a9a 100755 --- a/src/VTKViewer/VTKViewer_ShrinkFilter.cxx +++ b/src/VTKViewer/VTKViewer_ShrinkFilter.cxx @@ -35,14 +35,6 @@ #include #include -#ifdef _DEBUG_ -static int MYDEBUG = 0; -static int MYDEBUGWITHFILES = 0; -#else -static int MYDEBUG = 0; -static int MYDEBUGWITHFILES = 0; -#endif - vtkCxxRevisionMacro(VTKViewer_ShrinkFilter, "$Revision$"); vtkStandardNewMacro(VTKViewer_ShrinkFilter); -- 2.39.2