0023299: [CEA] Finalize multi-study removal

- delete study id parameter

diff --git a/doc/input/index.doc b/doc/input/index.doc
index 3cfdc028a33a5be1fadb3021b7d8ce7b5a16dbbe..6b7409b676b4601c25f5ea5a3918a0e48a76429b 100644 (file)
--- a/doc/input/index.doc
+++ b/doc/input/index.doc
@@ -480,7 +480,7 @@ def initialize():
 
 \code
 def createPreferences():
-    if verbose() : print "PYHELLOGUI.createPreferences() : study : %d" % _getStudyId()
+    if verbose() : print "PYHELLOGUI.createPreferences()"
     gid = sgPyQt.addPreference( "General" )
     gid = sgPyQt.addPreference( "Object creation", gid )
     pid = sgPyQt.addPreference( "Default name",  gid, SalomePyQt.PT_String,   "PYHELLO", "def_obj_name" )
@@ -502,7 +502,7 @@ def createPreferences():
 
 \code
 def windows():
-    if verbose() : print "PYHELLOGUI.windows() : study : %d" % _getStudyId()
+    if verbose() : print "PYHELLOGUI.windows()"
     wm = {}
     wm[SalomePyQt.WT_ObjectBrowser] = Qt.LeftDockWidgetArea
     wm[SalomePyQt.WT_PyConsole]     = Qt.BottomDockWidgetArea

diff --git a/resources/schema.xml b/resources/schema.xml
index 26f7e3ce097a30b4e0d47e581e0d2fbb3c74aaa7..7411727ebd8952545217d7212e8d225ea7adf459 100644 (file)
--- a/resources/schema.xml
+++ b/resources/schema.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1' ?>
 <proc name="newSchema_1">
-   <property name="DefaultStudyID" value="1"/>
    <type name="string" kind="string"/>
    <struct name="Engines/dataref">
       <member name="ref" type="string"/>

diff --git a/src/PYHELLO/PYHELLO_utils.py b/src/PYHELLO/PYHELLO_utils.py
index cb54ac1b82e8143bb2c339dc23490f3b64347fbc..0e5d6ebe8c1ca88a628a88a5ff6b489e02285d49 100644 (file)
--- a/src/PYHELLO/PYHELLO_utils.py
+++ b/src/PYHELLO/PYHELLO_utils.py
@@ -32,7 +32,7 @@ __all__ = [
     "getORB",
     "getNS",
     "getLCC",
-    "getStudyManager",
+    "getStudy",
     "getEngine",
     "getEngineIOR",
     "findOrCreateComponent",
@@ -129,16 +129,16 @@ def getLCC():
     return __lcc__
 
 ##
-# Get study manager
-###
-__study_manager__ = None
-def getStudyManager():
-    global __study_manager__
-    if __study_manager__ is None:
-        obj = getNS().Resolve( '/myStudyManager' )
-        __study_manager__ = obj._narrow( SALOMEDS.StudyManager )
+# Get study
+###
+__study__ = None
+def getStudy():
+    global __study__
+    if __study__ is None:
+        obj = getNS().Resolve( '/Study' )
+        __study__ = obj._narrow( SALOMEDS.Study )
         pass
-    return __study_manager__
+    return __study__
 
 ###
 # Get PYHELLO engine

diff --git a/src/PYHELLOGUI/PYHELLOGUI.py b/src/PYHELLOGUI/PYHELLOGUI.py
index 887d43d4ebdd37a26a99801e424105a1e1d7a3a3..f2d547830ffb06ab52367a896468b2c319ce5e7b 100644 (file)
--- a/src/PYHELLOGUI/PYHELLOGUI.py
+++ b/src/PYHELLOGUI/PYHELLOGUI.py
@@ -107,10 +107,6 @@ class GUIcontext:
 # Global variables
 ################################################
 
-# study-to-context map
-__study2context__   = {}
-# current context
-__current_context__ = None
 # object counter
 __objectid__ = 0
 
@@ -130,26 +126,12 @@ sg = libSALOME_Swig.SALOMEGUI_Swig()
 # Internal methods
 ################################################
 
-###
-# get active study ID
-###
-def _getStudyId():
-    return sgPyQt.getStudyId()
-
-###
-# get active study
-###
-def _getStudy():
-    studyId = _getStudyId()
-    study = getStudyManager().GetStudyByID( studyId )
-    return study
-
 ###
 # returns True if object has children
 ###
 def _hasChildren( sobj ):
     if sobj:
-        study = _getStudy()
+        study = getStudy()
         iter  = study.NewChildIterator( sobj )
         while iter.More():
             name = iter.Value().GetName()
@@ -160,25 +142,6 @@ def _hasChildren( sobj ):
         pass
     return False
 
-###
-# get current GUI context
-###
-def _getContext():
-    global __current_context__
-    return __current_context__
-
-###
-# set and return current GUI context
-# study ID is passed as parameter
-###
-def _setContext( studyID ):
-    global __study2context__, __current_context__
-    if not __study2context__.has_key(studyID):
-        __study2context__[studyID] = GUIcontext()
-        pass
-    __current_context__ = __study2context__[studyID]
-    return __current_context__
-
 ###
 # increment object counter in the map
 ###
@@ -205,7 +168,7 @@ def _getSelection():
 # called when module is initialized
 # perform initialization actions
 def initialize():
-    if verbose() : print "PYHELLOGUI.initialize() : study : %d" % _getStudyId()
+    if verbose() : print "PYHELLOGUI.initialize()"
     # set default preferences values
     if not sgPyQt.hasSetting( "PYHELLO", "def_obj_name"):
         sgPyQt.addSetting( "PYHELLO", "def_obj_name", GUIcontext.DEFAULT_NAME )
@@ -218,7 +181,7 @@ def initialize():
 # called when module is initialized
 # return map of popup windows to be used by the module
 def windows():
-    if verbose() : print "PYHELLOGUI.windows() : study : %d" % _getStudyId()
+    if verbose() : print "PYHELLOGUI.windows()"
     wm = {}
     wm[SalomePyQt.WT_ObjectBrowser] = Qt.LeftDockWidgetArea
     wm[SalomePyQt.WT_PyConsole]     = Qt.BottomDockWidgetArea
@@ -227,13 +190,13 @@ def windows():
 # called when module is initialized
 # return list of 2d/3d views to be used ny the module
 def views():
-    if verbose() : print "PYHELLOGUI.views() : study : %d" % _getStudyId()
+    if verbose() : print "PYHELLOGUI.views()"
     return []
 
 # called when module is initialized
 # export module's preferences
 def createPreferences():
-    if verbose() : print "PYHELLOGUI.createPreferences() : study : %d" % _getStudyId()
+    if verbose() : print "PYHELLOGUI.createPreferences()"
     gid = sgPyQt.addPreference( "General" )
     gid = sgPyQt.addPreference( "Object creation", gid )
     pid = sgPyQt.addPreference( "Default name",  gid, SalomePyQt.PT_String,   "PYHELLO", "def_obj_name" )
@@ -255,28 +218,20 @@ def createPreferences():
 # called when module is activated
 # returns True if activating is successfull and False otherwise
 def activate():
-    if verbose() : print "PYHELLOGUI.activate() : study : %d" % _getStudyId()
-    ctx = _setContext( _getStudyId() )
+    if verbose() : print "PYHELLOGUI.activate()"
+    GUIcontext()
     return True
 
 # called when module is deactivated
 def deactivate():
-    if verbose() : print "PYHELLOGUI.deactivate() : study : %d" % _getStudyId()
-    pass
-
-# called when active study is changed
-# active study ID is passed as parameter
-def activeStudyChanged( studyID ):
-    if verbose() : print "PYHELLOGUI.activeStudyChanged(): study : %d" % studyID
-    ctx = _setContext( _getStudyId() )
+    if verbose() : print "PYHELLOGUI.deactivate()"
     pass
 
 # called when popup menu is invoked
 # popup menu and menu context are passed as parameters
 def createPopupMenu( popup, context ):
     if verbose() : print "PYHELLOGUI.createPopupMenu(): context = %s" % context
-    ctx = _setContext( _getStudyId() )
-    study = _getStudy()
+    study = getStudy()
     selcount, selected = _getSelection()
     if verbose() : print selcount, selected
     if selcount == 1:
@@ -473,7 +428,7 @@ def CreateObject():
         name = "%s %d" % ( default_name, __objectid__ )
         pass
     if not name: return
-    getEngine().createObject( _getStudy(), name )
+    getEngine().createObject( getStudy(), name )
     sg.updateObjBrowser( True )
     pass
 
@@ -481,7 +436,7 @@ def CreateObject():
 # Delete all objects
 ###
 def DeleteAll():
-    study = _getStudy()
+    study = getStudy()
     father = study.FindComponent( moduleName() )
     if father:
         iter = study.NewChildIterator( father )
@@ -499,7 +454,7 @@ def DeleteAll():
 # Show object's name
 ###
 def ShowMe():
-    study = _getStudy()
+    study = getStudy()
     entry = sg.getSelected( 0 )
     if entry != '':
         sobj = study.FindObjectID( entry )
@@ -516,7 +471,7 @@ def ShowMe():
 # Delete selected object(s)
 ###
 def Delete():
-    study = _getStudy()
+    study = getStudy()
     builder = study.NewBuilder()
     if sg.SelectedCount() <= 0: return
     for i in range( sg.SelectedCount() ):
@@ -535,7 +490,7 @@ def Delete():
 # Rename selected object
 ###
 def Rename():
-    study = _getStudy()
+    study = getStudy()
     builder = study.NewBuilder()
     entry = sg.getSelected( 0 )
     if entry != '':