Additional fix for delete boolean parameter in method: "updateObjBrowser"

[modules/kernel.git] / src / KERNEL_PY / salome_iapp.py

diff --git a/src/KERNEL_PY/salome_iapp.py b/src/KERNEL_PY/salome_iapp.py
index dcea86988309471b6c37515a25fd968042379561..cdd942bd1bd35a37b89d18621598f847a3054bf8 100755 (executable)
--- a/src/KERNEL_PY/salome_iapp.py
+++ b/src/KERNEL_PY/salome_iapp.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2013  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
@@ -7,7 +7,7 @@
 # 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.
+# 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
@@ -32,7 +32,7 @@ import salome_ComponentGUI
 
     #--------------------------------------------------------------------------
 
-IN_SALOME_GUI=0
+IN_SALOME_GUI=None
 
 def ImportComponentGUI(ComponentName):
     if IN_SALOME_GUI:
@@ -71,25 +71,20 @@ class SalomeOutsideGUI(object):
     Provides a replacement for class SalomeGUI outside GUI process.
     Do almost nothing
     """
-    global myStudyId, myStudyName
+    global myStudyName
     
     def hasDesktop(self):
         """Indicate if GUI is running"""
         return False
     
-    def updateObjBrowser(self, bid):
+    def updateObjBrowser(self):
         """update the GUI object browser"""
         print "SalomeOutsideGUI: no objectBrowser update outside GUI"
         pass
     
-    def getActiveStudyId(self):
-        """Get the active study id"""
-        print "SalomeOutsideGUI.getActiveStudyId: avoid use outside GUI"
-        return myStudyId
-    
-    def getActiveStudyName(self):
-        """Get the active study name"""
-        print "SalomeOutsideGUI.getActiveStudyName: avoid use outside GUI"
+    def getStudyName(self):
+        """Get the study name"""
+        print "SalomeOutsideGUI.getStudyName: avoid use outside GUI"
         return myStudyName
     
     def SelectedCount(self):
@@ -174,11 +169,13 @@ def salome_iapp_init(embedded):
 
             # create a SALOMEGUI_Swig instance
             sg = SalomeGUI()
-            IN_SALOME_GUI = sg.hasDesktop()
+            inSalomeGUI = sg.hasDesktop()
         else:
             # Not embedded in GUI
             sg=SalomeOutsideGUI()
-            IN_SALOME_GUI=0
+            inSalomeGUI=0
+        if IN_SALOME_GUI is None:
+          IN_SALOME_GUI = inSalomeGUI
     return sg
 
 def salome_iapp_close():