#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2015 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
from server import process_id, Server
import json
import subprocess
+from salomeContextUtils import ScriptAndArgsObjectEncoder
# -----------------------------------------------------------------------------
return cata_path
-_siman_name = None
-def simanStudyName(args):
- global _siman_name
- if _siman_name is None:
- # siman session paramenters and checkout processing
- _siman_name = ""
- if 'siman' in args:
- siman_data = []
- for param in [ 'study', 'scenario', 'user']:
- siman_param = "siman_%s"%param
- if siman_param in args:
- siman_data.append(args[siman_param])
- else:
- print "SIMAN %s must be defined using parameter --siman-%s=XXX" % (siman_param, siman_param)
- pass
- pass
- if len(siman_data) == 3:
- _siman_name = "_".join(siman_data)
- pass
- pass
- pass
- return _siman_name
-
class CatalogServer(Server):
def __init__(self,args):
self.args=args
def __init__(self,args):
self.args=args
self.initArgs()
- from salome_utils import generateFileName
- if sys.platform == "win32": dirpath = os.environ["HOME"]
- else: dirpath = "/tmp"
- logfile = generateFileName( dirpath,
+ from salome_utils import generateFileName, getLogDir
+ logfile = generateFileName( getLogDir(),
prefix="logger",
extension="log",
with_username=True,
if self.args['study_hdf'] is not None:
self.SCMD2+=['--study-hdf=%s'%self.args['study_hdf']]
pass
- if simanStudyName(self.args):
- self.SCMD2+=['--siman-study=%s'%simanStudyName(self.args)]
- pass
pass
if self.args.has_key('pyscript') and len(self.args['pyscript']) > 0:
- msg = json.dumps(self.args['pyscript'])
+ msg = json.dumps(self.args['pyscript'], cls=ScriptAndArgsObjectEncoder)
self.SCMD2+=['--pyscript=%s'%(msg)]
pass
pass
myServer.run()
clt.waitLogger("Logger")
- # set siman python path before the session server launching to import scripts inside python console
- if simanStudyName(args):
- # MPV: use os.environ here because session server is launched in separated process and sys.path is missed in this case
- os.environ["PYTHONPATH"] = "/tmp/SimanSalome/" + args['siman_study'] + "/" + \
- args['siman_scenario'] + "/" + args['siman_user'] + os.pathsep + os.environ["PYTHONPATH"];
-
# Launch Session Server (to show splash ASAP)
#
except ImportError:
pass
- # siman session paramenters and checkout processing
- if simanStudyName(args):
- print '**********************************************'
- print "Siman study name= '" + simanStudyName(args) + "'"
- import SALOMEDS
- obj = clt.Resolve('myStudyManager')
- myStudyManager = obj._narrow(SALOMEDS.StudyManager)
- aNewStudy = myStudyManager.NewStudy(simanStudyName(args))
- aSimS = myStudyManager.GetSimanStudy()
- aSimS._set_StudyId(args['siman_study'])
- aSimS._set_ScenarioId(args['siman_scenario'])
- aSimS._set_UserId(args['siman_user'])
- aSimS.CheckOut(aNewStudy)
- # if session server is enabled, activate the created study
- if args["gui"]:
- print "Activate the SIMAN study in the SALOME GUI"
- obj = clt.Resolve('/Kernel/Session')
- mySession = obj._narrow(SALOME.Session)
- mySession.emitMessage("simanCheckoutDone " + simanStudyName(args))
- print '**********************************************'
-
return clt
# -----------------------------------------------------------------------------
# run python scripts, passed as command line arguments
toimport = []
- if args.has_key('pyscript'):
- if args.has_key('gui') and args.has_key('session_gui'):
- if not args['gui'] or not args['session_gui']:
+ if args.has_key('gui') and args.has_key('session_gui'):
+ if not args['gui'] or not args['session_gui']:
+ if args.has_key('study_hdf'):
+ toopen = args['study_hdf']
+ if toopen:
+ import salome
+ salome.salome_init(toopen)
+ if args.has_key('pyscript'):
toimport = args['pyscript']
-
from salomeContextUtils import formatScriptsAndArgs
command = formatScriptsAndArgs(toimport)
if command:
def execScript(script_path):
print 'executing', script_path
- sys.path.insert(0, os.path.dirname(script_path))
+ sys.path.insert(0, os.path.realpath(os.path.dirname(script_path)))
execfile(script_path,globals())
del sys.path[0]
Register args, modules_list, modules_root_dir in a file
for further use, when SALOME is launched embedded in an other application.
"""
- if sys.platform == "win32":
- fileEnv = os.getenv('TEMP')
- else:
- fileEnv = '/tmp/'
-
- fileEnv += os.getenv('USER') + "_" + str(args['port']) \
+ from salome_utils import getTmpDir
+ fileEnv = getTmpDir()
+ from salome_utils import getUserName
+ fileEnv += getUserName() + "_" + str(args['port']) \
+ '_' + args['appname'].upper() + '_env'
fenv=open(fileEnv,'w')
pickle.dump((args, modules_list, modules_root_dir),fenv)
