From 146d3ff81c3be819d530b4c751eb8a01ac9fd7a0 Mon Sep 17 00:00:00 2001 From: mpa Date: Fri, 3 Feb 2017 16:26:14 +0300 Subject: [PATCH] Deleted deprecated code --- CMakeLists.txt | 10 +++++++++- doc/salome/examples/XTPlugindemo.py | 2 +- src/XTPluginBuilder.py | 2 +- src/XTPlugin_GUI.cxx | 16 ++++++---------- src/XTPlugin_OperationsCreator.cxx | 12 +++++------- src/XTPlugin_OperationsCreator.hxx | 6 ++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d36065..73d0331 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,12 +35,20 @@ SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) SET(${PROJECT_NAME_UC}_VERSION_DEV 0) +# Common CMake macros +SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files") +IF(EXISTS ${CONFIGURATION_ROOT_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake") + INCLUDE(SalomeMacros) +ELSE() + MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !") +ENDIF() + # Find KERNEL # =========== SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the SALOME KERNEL") IF(EXISTS ${KERNEL_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files") - INCLUDE(SalomeMacros) FIND_PACKAGE(SalomeKERNEL REQUIRED) KERNEL_WITH_CORBA() #check whether KERNEL is built with CORBA ADD_DEFINITIONS(${KERNEL_DEFINITIONS}) diff --git a/doc/salome/examples/XTPlugindemo.py b/doc/salome/examples/XTPlugindemo.py index f8d34be..85242c3 100644 --- a/doc/salome/examples/XTPlugindemo.py +++ b/doc/salome/examples/XTPlugindemo.py @@ -5,7 +5,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # - path to the file xtFile = "/path/to/the/xt/file.x_t" diff --git a/src/XTPluginBuilder.py b/src/XTPluginBuilder.py index edb5b29..da1110e 100644 --- a/src/XTPluginBuilder.py +++ b/src/XTPluginBuilder.py @@ -32,7 +32,7 @@ def GetXTPluginOperations(self): Returns: An instance of XT plugin operations interface """ - anOp = self.GetPluginOperations(self.myStudyId, __libraryName__) + anOp = self.GetPluginOperations(__libraryName__) return anOp._narrow(IXTOperations) ## Import a shape from the XT file diff --git a/src/XTPlugin_GUI.cxx b/src/XTPlugin_GUI.cxx index 3bd0f68..8aac0d2 100644 --- a/src/XTPlugin_GUI.cxx +++ b/src/XTPlugin_GUI.cxx @@ -102,11 +102,8 @@ bool XTPlugin_GUI::importXT( SUIT_Desktop* parent ) { SalomeApp_Application* app = getGeometryGUI()->getApp(); if ( !app ) return false; - SalomeApp_Study* study = dynamic_cast ( app->activeStudy() ); - if ( !study ) return false; - SALOMEDS::Study_var dsStudy = GeometryGUI::ClientStudyToStudy( study->studyDS() ); - GEOM::GEOM_IOperations_var op = GeometryGUI::GetGeomGen()->GetPluginOperations( dsStudy->StudyId(), "XTPluginEngine" ); + GEOM::GEOM_IOperations_var op = GeometryGUI::GetGeomGen()->GetPluginOperations( "XTPluginEngine" ); XTPlugin::IXTOperations_var xtOp = XTPlugin::IXTOperations::_narrow( op ); if ( CORBA::is_nil( xtOp ) ) return false; @@ -133,14 +130,13 @@ bool XTPlugin_GUI::importXT( SUIT_Desktop* parent ) { GEOM::GEOM_Object_var main = result[0]; QString publishName = GEOMBase::GetDefaultName( SUIT_Tools::file( fileName, true ) ); - SALOMEDS::SObject_var so = GeometryGUI::GetGeomGen()->PublishInStudy( dsStudy, - SALOMEDS::SObject::_nil(), - main.in(), - publishName.toUtf8().constData() ); + SALOMEDS::SObject_var so = GeometryGUI::GetGeomGen()->PublishInStudy( SALOMEDS::SObject::_nil(), + main.in(), + publishName.toUtf8().constData() ); entryList.append( so->GetID() ); transaction.commit(); - GEOM_Displayer( study ).Display( main.in() ); + GEOM_Displayer().Display( main.in() ); } else { @@ -153,7 +149,7 @@ bool XTPlugin_GUI::importXT( SUIT_Desktop* parent ) transaction.abort(); } } - getGeometryGUI()->updateObjBrowser( true ); + getGeometryGUI()->updateObjBrowser(); app->browseObjects( entryList ); if ( errors.count() > 0 ) diff --git a/src/XTPlugin_OperationsCreator.cxx b/src/XTPlugin_OperationsCreator.cxx index 7acd93d..0a1c8d4 100644 --- a/src/XTPlugin_OperationsCreator.cxx +++ b/src/XTPlugin_OperationsCreator.cxx @@ -50,19 +50,17 @@ XTPlugin_OperationsCreator::~XTPlugin_OperationsCreator() } GEOM_IOperations_i* XTPlugin_OperationsCreator::Create( PortableServer::POA_ptr thePOA, - int theStudyId, GEOM::GEOM_Gen_ptr theEngine, ::GEOMImpl_Gen* theGenImpl ) { Unexpect aCatch( SALOME_SalomeException ); MESSAGE( "XTPlugin_OperationsCreator::Create" ); - return new XTPlugin_IOperations_i( thePOA, theEngine, get( theGenImpl, theStudyId ) ); + return new XTPlugin_IOperations_i( thePOA, theEngine, get( theGenImpl ) ); } -XTPlugin_IOperations* XTPlugin_OperationsCreator::get( ::GEOMImpl_Gen* theGenImpl, - int theStudyId ) +XTPlugin_IOperations* XTPlugin_OperationsCreator::get( ::GEOMImpl_Gen* theGenImpl ) { - if (_mapOfOperations.find( theStudyId ) == _mapOfOperations.end() ) - _mapOfOperations[theStudyId] = new XTPlugin_IOperations( theGenImpl, theStudyId ); - return _mapOfOperations[theStudyId]; + if( !_operation ) + _operation = new XTPlugin_IOperations( theGenImpl ); + return _operation; } diff --git a/src/XTPlugin_OperationsCreator.hxx b/src/XTPlugin_OperationsCreator.hxx index ae374c1..001c55c 100644 --- a/src/XTPlugin_OperationsCreator.hxx +++ b/src/XTPlugin_OperationsCreator.hxx @@ -41,15 +41,13 @@ public: ~XTPlugin_OperationsCreator(); GEOM_IOperations_i* Create( PortableServer::POA_ptr thePOA, - int theStudyId, GEOM::GEOM_Gen_ptr theEngine, ::GEOMImpl_Gen* theGenImpl ); private: - static XTPlugin_IOperations* get( ::GEOMImpl_Gen* theGenImpl, - int theStudyId ); + static XTPlugin_IOperations* get( ::GEOMImpl_Gen* theGenImpl ); - static std::map _mapOfOperations; + static XTPlugin_IOperations* _operation; friend class XTPlugin_IECallBack; }; -- 2.39.2