# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2016 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
# Module : SALOME
#
"""
-Module salome gives access to Salome ressources.
+Module salome gives access to Salome resources.
variables:
"""
## @package salome
-# Module salome gives access to Salome ressources.
+# Module salome gives access to Salome resources.
#
# \param salome.orb : CORBA orb object
# \param salome.naming_service : instance of naming Service class (SALOME_NamingServicePy::SALOME_NamingServicePy_i)
salome_initial=1
def salome_init(theStudyId=0,embedded=0):
"""
- Performs only once SALOME general purpose intialisation for scripts.
+ Performs only once SALOME general purpose initialisation for scripts.
optional argument : theStudyId
When in embedded interpreter inside IAPP, theStudyId is not used
When used without GUI (external interpreter)
salome_initial=0
sg = salome_iapp_init(embedded)
orb, lcc, naming_service, cm = salome_kernel_init()
- myStudyManager, myStudyId, myStudy, myStudyName =salome_study_init(theStudyId)
+ myStudyManager, myStudyId, myStudy, myStudyName = salome_study_init(theStudyId)
pass
pass
except RuntimeError, inst:
print """
============================================
May be there is no running SALOME session
- salome.salome_init() is intented to be used
+ salome.salome_init() is intended to be used
within an already running session
============================================
"""
raise
-
+
def salome_close():
- global salome_initial
+ global salome_initial, myStudy, myStudyId, myStudyName
+ try:
+ # study can be closed either from GUI or directly with salome.myStudy.Close()
+ myStudy.Close()
+ except:
+ pass
salome_initial=1
salome_iapp_close()
- salome_kernel_close()
salome_study_close()
+ myStudyId, myStudy, myStudyName=None,None,None
pass