Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Windows fix
[modules/kernel.git]
/
bin
/
salomeConsole.py
diff --git
a/bin/salomeConsole.py
b/bin/salomeConsole.py
index be01caa681a965d927087c703764f7a6b4518a36..46036d3e712595e9365a79aceff6d97194cdd59e 100755
(executable)
--- a/
bin/salomeConsole.py
+++ b/
bin/salomeConsole.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-201
3
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
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-24,6
+24,8
@@
import os
import sys
import os
import sys
+import glob
+
#-------------------------------
# Python completion and others if you want
# You should have set PYTHONSTARTUP env variable
#-------------------------------
# Python completion and others if you want
# You should have set PYTHONSTARTUP env variable
@@
-36,57
+38,41
@@
import user
#-------------------------------
import CORBA
import CosNaming
#-------------------------------
import CORBA
import CosNaming
-# There are cyclic dependencies between Engines, SALOME and SALOMEDS.
-# import first Engines, then SALOME and then SALOMEDS
-# Or use reload(Engines) to be safe.
-import Engines
-import SALOME
-import SALOMEDS
-import SALOME_ModuleCatalog
-reload(Engines)
-reload(SALOME)
-reload(SALOMEDS)
import salome_utils
import salome_utils
-import LifeCycleCORBA
import orbmodule
import orbmodule
-from runSalome import *
-import Utils_Identity
-files = glob.glob(os.path.join(os.environ["HOME"],Utils_Identity.getapplipath(),
-
"USERS"
,".omniORB_"+salome_utils.getUserName()+"_*.cfg"))
+def getRunningSession():
+ omniorbUserPath = os.getenv("OMNIORB_USER_PATH")
+
files = glob.glob(os.path.join(omniorbUserPath
,".omniORB_"+salome_utils.getUserName()+"_*.cfg"))
-filename=""
-if len(files)==1:
- filename=files[0]
-else:
- print "You have %d sessions running" % len(files)
- for f in files:
- print "Session:",f
- rep= raw_input("Do you want to connect to this session [y|n]")
- if rep == "y":
+
filename=""
+
if len(files)==1:
+
filename=files[0]
+
else:
+
print "You have %d sessions running" % len(files)
+
for f in files:
+
print "Session:",f
+
rep= raw_input("Do you want to connect to this session [y|n]")
+
if rep == "y":
filename=f
break
filename=f
break
-if filename != "":
- os.environ['OMNIORB_CONFIG']=filename
-else:
- rep= raw_input("Do you want to try a local session on port 2810 ? [y|n]")
- if rep == "y":
- # Try a local session running on port 2810
- sys.argv=sys.argv+['-ORBInitRef','NameService=corbaname::localhost:2810']#+['-ORBgiopMaxMsgSize','2097152000'] # 2 GBytes
+ if filename != "":
+ os.environ['OMNIORB_CONFIG']=filename
else:
else:
- sys.exit(1)
-
-print sys.argv
-
-#direct adress from clt.orb.object_to_string(clt.rootContext)
-#sys.argv=sys.argv+['-ORBInitRef','NameService=IOR:010000000100000000000000010000000000000023000000010100000a0000006c6f63616c686f737400fa0a0b0000004e616d6553657276696365']
+ rep= raw_input("Do you want to try a local session on port 2810 ? [y|n]")
+ if rep == "y":
+ # Try a local session running on port 2810
+ sys.argv=sys.argv+['-ORBInitRef','NameService=corbaname::localhost:2810']
+ else:
+ sys.exit(1)
+#
class client(orbmodule.client):
def initNS(self,args):
# Obtain a reference to the root naming context
class client(orbmodule.client):
def initNS(self,args):
# Obtain a reference to the root naming context
- obj
= self.orb.resolve_initial_references("NameService")
+ obj = self.orb.resolve_initial_references("NameService")
try:
self.rootContext = obj._narrow(CosNaming.NamingContext)
return
try:
self.rootContext = obj._narrow(CosNaming.NamingContext)
return
@@
-94,15
+80,25
@@
class client(orbmodule.client):
print "It's not a valid naming service"
self.rootContext = None
raise
print "It's not a valid naming service"
self.rootContext = None
raise
+#
-clt=client()
-print "Naming Service address: ",clt.orb.object_to_string(clt.rootContext)
+def startClient():
+ try:
+ clt=client()
+ except Exception:
+ sys.exit(1)
+ #
+ print "Naming Service address: ",clt.orb.object_to_string(clt.rootContext)
-clt.showNS()
+ clt.showNS()
+
+ session=clt.waitNS("/Kernel/Session")
+ catalog=clt.waitNS("/Kernel/ModulCatalog")
+ studyMgr=clt.waitNS("/myStudyManager")
+ import salome
+ salome.salome_init()
+ from salome import lcc
+#
-session=clt.waitNS("/Kernel/Session")
-catalog=clt.waitNS("/Kernel/ModulCatalog")
-studyMgr=clt.waitNS("/myStudyManager")
-import salome
-salome.salome_init()
-from salome import lcc
+getRunningSession()
+startClient()