Merge changes from 'master' branch.

[samples/calculator.git] / bin / runCALCULATOR.py

diff --git a/bin/runCALCULATOR.py b/bin/runCALCULATOR.py
index d7c9613352adeb582cb0bab82b2cd75c17c59756..9d3b708c758b5127aca9214225f561dc79c21939 100755 (executable)
--- a/bin/runCALCULATOR.py
+++ b/bin/runCALCULATOR.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# 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
@@ -21,34 +21,39 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-def test(clt):
+# CORBA ORB reference
+__orb = None
+
+# get ORB
+def __getORB():
+   global __orb
+   return __orb
+
+def calculator():
    """
-        Test function that creates an instance of CALCULATOR component
-        usage : hello=test(clt)
+   Test function that creates an instance of CALCULATOR component
+   usage : hello=test(clt)
    """
-   # create an LifeCycleCORBA instance
    import LifeCycleCORBA
-   lcc = LifeCycleCORBA.LifeCycleCORBA(clt.orb)
+   lcc = LifeCycleCORBA.LifeCycleCORBA(__getORB())
    import CALCULATOR_ORB
-   hello = lcc.FindOrLoadComponent("FactoryServer", "CALCULATOR")
-   return hello
-
-#
+   return lcc.FindOrLoadComponent("FactoryServer", "CALCULATOR")
 
 if __name__ == "__main__":
-   import user
    from runSalome import *
-   clt,args = main()
-   
-   #
-   #  Impression arborescence Naming Service
-   #
-   
-   if clt != None:
-     print
-     print " --- registered objects tree in Naming Service ---"
-     clt.showNS()
-     session=clt.waitNS("/Kernel/Session")
-     catalog=clt.waitNS("/Kernel/ModulCatalog")
-     import socket
-     container =  clt.waitNS("/Containers/" + socket.gethostname().split('.')[0] + "/FactoryServer")
+   clt, args = main()
+   if clt:
+     from salome_utils import getShortHostName
+     clt.waitNS("/Containers/" + getShortHostName() + "/FactoryServer")
+     __orb = clt.orb
+
+     print()
+     print("Use calculator() function to get access to the CALCULATOR component.")
+     print("Example: calc = calculator()")
+     print("...")
+     print()
+     pass
+   else:
+      print("ERROR: SALOME is not initialized")
+      pass
+   pass