From: Gilles DAVID Date: Tue, 22 Oct 2024 16:31:35 +0000 (+0200) Subject: salome_kernel.py devient salome_kernel_utils.py pour éviter les conflits X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d8e0521ce095e6b75612544e0d3c169549004696;p=modules%2Fkernel.git salome_kernel.py devient salome_kernel_utils.py pour éviter les conflits --- diff --git a/src/KERNEL_PY/CMakeLists.txt b/src/KERNEL_PY/CMakeLists.txt index 0ae46169f..e9cc0213c 100644 --- a/src/KERNEL_PY/CMakeLists.txt +++ b/src/KERNEL_PY/CMakeLists.txt @@ -30,7 +30,7 @@ SET(salomepython_PYTHON batchmode_salome.py kernel_test.py salome_test.py - salome_kernel.py + salome_kernel_utils.py salome_study.py salome_iapp.py salome_ComponentGUI.py diff --git a/src/KERNEL_PY/__init__.py b/src/KERNEL_PY/__init__.py index 822df2c6a..a0d24c0d4 100644 --- a/src/KERNEL_PY/__init__.py +++ b/src/KERNEL_PY/__init__.py @@ -119,7 +119,7 @@ extend_path(ROOT_PYTHONPACKAGE_NAME) # ========================================================================== # -from salome_kernel import * +from salome_kernel_utils import * from salome_study import * from salome_iapp import * import salome_study @@ -225,7 +225,7 @@ def salome_init_without_session_common(path=None, embedded=False): orb=CORBA.ORB_init(['']) import KernelModuleCatalog import SALOME_ModuleCatalog - from salome_kernel import list_of_catalogs_regarding_environement + from salome_kernel_utils import list_of_catalogs_regarding_environement modulcat = KernelModuleCatalog.myModuleCatalog( list_of_catalogs_regarding_environement() ) # poa = orb.resolve_initial_references("RootPOA") diff --git a/src/KERNEL_PY/kernel/__init__.py b/src/KERNEL_PY/kernel/__init__.py index 7e311ef23..07cf3afc8 100644 --- a/src/KERNEL_PY/kernel/__init__.py +++ b/src/KERNEL_PY/kernel/__init__.py @@ -18,7 +18,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -## \defgroup salome_kernel salome.kernel +## \defgroup salome_kernel_utils salome.kernel # \{ # \details Package containing the KERNEL python utilities # \defgroup deprecation diff --git a/src/KERNEL_PY/salome_kernel.py b/src/KERNEL_PY/salome_kernel.py deleted file mode 100644 index 6bdaef322..000000000 --- a/src/KERNEL_PY/salome_kernel.py +++ /dev/null @@ -1,87 +0,0 @@ -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2024 CEA, EDF, 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 -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : salome_kernel_utils.py -# Author : Paul RASCLE, EDF -# Module : SALOME -# $Header$ -# -from omniORB import CORBA -from LifeCycleCORBA import * -from SALOME_NamingServicePy import * -from SALOME_utilities import * -import Engines -import SALOME -import SALOME_ModuleCatalog - -orb = None -lcc = None -naming_service = None -cm = None -esm = None -dsm = None -modulcat = None - -def list_of_catalogs_regarding_environement(): - """ - Method to detect XML module catalogs regarding environement variables - """ - import os - KEY_IN_ENV_VAR = "_ROOT_DIR" - modules_env_var = [elt for elt in os.environ.keys() if elt[-len(KEY_IN_ENV_VAR):]==KEY_IN_ENV_VAR] - list_catalogs = [] - for module_env_var in modules_env_var: - module_upper_case = module_env_var[:-len(KEY_IN_ENV_VAR)] - file_candidate = os.path.join(os.environ[module_env_var],"share","salome","resources",module_upper_case.lower(),"{}Catalog.xml".format(module_upper_case)) - if os.path.isfile(file_candidate): - list_catalogs.append(file_candidate) - pass - return list_catalogs - -def salome_kernel_init(): - global orb, lcc, naming_service, cm, esm, dsm, modulcat - - if not orb: - # initialise the ORB - orb = CORBA.ORB_init([''], CORBA.ORB_ID) - - # create a LifeCycleCORBA instance - lcc = LifeCycleCORBA(orb) - - #create a naming service instance - naming_service = SALOME_NamingServicePy_i(orb) - - # get Container Manager - obj = naming_service.Resolve('/ContainerManager') - cm = obj._narrow(Engines.ContainerManager) - # get External Server Manager - obj = naming_service.Resolve('/ExternalServers') - esm = obj._narrow(SALOME.ExternalServerLauncher) - # - obj = naming_service.Resolve('/DataServerManager') - dsm = obj._narrow(SALOME.DataServerManager) - # - obj = naming_service.Resolve('Kernel/ModulCatalog') - modulcat = obj._narrow(SALOME_ModuleCatalog.ModuleCatalog) - - return orb, lcc, naming_service, cm, esm, dsm, modulcat diff --git a/src/KERNEL_PY/salome_kernel_utils.py b/src/KERNEL_PY/salome_kernel_utils.py new file mode 100644 index 000000000..6bdaef322 --- /dev/null +++ b/src/KERNEL_PY/salome_kernel_utils.py @@ -0,0 +1,87 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2007-2024 CEA, EDF, 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 +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# File : salome_kernel_utils.py +# Author : Paul RASCLE, EDF +# Module : SALOME +# $Header$ +# +from omniORB import CORBA +from LifeCycleCORBA import * +from SALOME_NamingServicePy import * +from SALOME_utilities import * +import Engines +import SALOME +import SALOME_ModuleCatalog + +orb = None +lcc = None +naming_service = None +cm = None +esm = None +dsm = None +modulcat = None + +def list_of_catalogs_regarding_environement(): + """ + Method to detect XML module catalogs regarding environement variables + """ + import os + KEY_IN_ENV_VAR = "_ROOT_DIR" + modules_env_var = [elt for elt in os.environ.keys() if elt[-len(KEY_IN_ENV_VAR):]==KEY_IN_ENV_VAR] + list_catalogs = [] + for module_env_var in modules_env_var: + module_upper_case = module_env_var[:-len(KEY_IN_ENV_VAR)] + file_candidate = os.path.join(os.environ[module_env_var],"share","salome","resources",module_upper_case.lower(),"{}Catalog.xml".format(module_upper_case)) + if os.path.isfile(file_candidate): + list_catalogs.append(file_candidate) + pass + return list_catalogs + +def salome_kernel_init(): + global orb, lcc, naming_service, cm, esm, dsm, modulcat + + if not orb: + # initialise the ORB + orb = CORBA.ORB_init([''], CORBA.ORB_ID) + + # create a LifeCycleCORBA instance + lcc = LifeCycleCORBA(orb) + + #create a naming service instance + naming_service = SALOME_NamingServicePy_i(orb) + + # get Container Manager + obj = naming_service.Resolve('/ContainerManager') + cm = obj._narrow(Engines.ContainerManager) + # get External Server Manager + obj = naming_service.Resolve('/ExternalServers') + esm = obj._narrow(SALOME.ExternalServerLauncher) + # + obj = naming_service.Resolve('/DataServerManager') + dsm = obj._narrow(SALOME.DataServerManager) + # + obj = naming_service.Resolve('Kernel/ModulCatalog') + modulcat = obj._narrow(SALOME_ModuleCatalog.ModuleCatalog) + + return orb, lcc, naming_service, cm, esm, dsm, modulcat diff --git a/src/KERNEL_PY/salome_study.py b/src/KERNEL_PY/salome_study.py index 048c67d1b..de6c6cc77 100644 --- a/src/KERNEL_PY/salome_study.py +++ b/src/KERNEL_PY/salome_study.py @@ -26,7 +26,7 @@ # Module : SALOME # $Header$ # -import salome_kernel +import salome_kernel_utils import SALOMEDS import salome_iapp from launchConfigureParser import verbose @@ -323,7 +323,7 @@ def salome_study_init(theStudyPath=None): global orb, lcc, naming_service, cm if not myStudy: - orb, lcc, naming_service, cm, _, _, _ = salome_kernel.salome_kernel_init() + orb, lcc, naming_service, cm, _, _, _ = salome_kernel_utils.salome_kernel_init() # get Study reference obj = naming_service.Resolve('/Study')