From aca7cf73219872bddb349dc6efc5eda97871fb14 Mon Sep 17 00:00:00 2001 From: prascle Date: Fri, 2 Dec 2005 09:00:59 +0000 Subject: [PATCH] PR: merge from branch BR_OCC_For_3_1_0b1 tag mergeto_BR_UT_V310a3_01dec05 --- INSTALL | 2 +- bin/VERSION | 2 +- bin/killSalomeWithPort.py | 14 +++++++------- bin/runSalome.py | 6 ++++++ salome_adm/unix/config_files/check_qt.m4 | 4 ++-- src/NamingService/SALOME_NamingServicePy.py | 4 ++-- src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx | 5 ++--- src/SALOMEDS/SALOME_DriverPy.py | 1 - 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/INSTALL b/INSTALL index bf7c941f0..526e28e9f 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -This is the version 3.1.0a2 of KERNEL +This is the version 3.1.0b1 of KERNEL Previous versions : - 3.0.0 - 2.2.4 diff --git a/bin/VERSION b/bin/VERSION index 509227443..377576937 100755 --- a/bin/VERSION +++ b/bin/VERSION @@ -1 +1 @@ -THIS IS SALOME - KERNEL VERSION: 3.1.0a2 +THIS IS SALOME - KERNEL VERSION: 3.1.0b1 diff --git a/bin/killSalomeWithPort.py b/bin/killSalomeWithPort.py index 404c9ef8f..e52a25f88 100755 --- a/bin/killSalomeWithPort.py +++ b/bin/killSalomeWithPort.py @@ -3,16 +3,16 @@ import os, sys, pickle, signal, commands def getPiDict(port,appname='salome',full=True): from Utils_Identity import getShortHostName - - if os.getenv("HOSTNAME") == None: - if os.getenv("HOST") == None: - os.environ["HOSTNAME"]=getShortHostName() - else: - os.environ["HOSTNAME"]=os.getenv("HOST") + + host = os.getenv("HOSTNAME") + if not host: + host = os.getenv("HOST") + if not host: + host = getShortHostName() filedict = [] filedict.append( os.getenv('USER') ) # user name - filedict.append( os.getenv('HOSTNAME') ) # host name + filedict.append( host ) # host name filedict.append( str(port) ) # port number filedict.append( appname.upper() ) # application name filedict.append( 'pidict' ) # constant part diff --git a/bin/runSalome.py b/bin/runSalome.py index 94e17db92..c4773d189 100755 --- a/bin/runSalome.py +++ b/bin/runSalome.py @@ -408,6 +408,11 @@ class SessionServer(Server): self.SCMD2+=['GUI'] if self.args['splash']: self.SCMD2+=['SPLASH'] + if self.args.has_key('modules'): + self.SCMD2+=['--modules ('] + for mod in self.args['modules']: + self.SCMD2+=[mod + ':'] + self.SCMD2+=[')'] def setpath(self,modules_list,modules_root_dir): cata_path=[] @@ -610,6 +615,7 @@ def startSalome(args, modules_list, modules_root_dir): # # Lancement Session Server # + mySessionServ = SessionServer(args) mySessionServ.setpath(modules_list,modules_root_dir) mySessionServ.run() diff --git a/salome_adm/unix/config_files/check_qt.m4 b/salome_adm/unix/config_files/check_qt.m4 index 3faa1e990..ab2869c21 100644 --- a/salome_adm/unix/config_files/check_qt.m4 +++ b/salome_adm/unix/config_files/check_qt.m4 @@ -104,8 +104,8 @@ then AC_MSG_RESULT(QTDIR environment variable may be wrong) else AC_MSG_RESULT(yes) - QT_INCLUDES="-I${QT_ROOT}/include${QTINC} -DQT_THREAD_SUPPORT" - QT_MT_INCLUDES="-I${QT_ROOT}/include${QTINC} -DQT_THREAD_SUPPORT" + QT_INCLUDES="-I${QT_ROOT}/include${QTINC} -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE" + QT_MT_INCLUDES="-I${QT_ROOT}/include${QTINC} -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE" fi fi diff --git a/src/NamingService/SALOME_NamingServicePy.py b/src/NamingService/SALOME_NamingServicePy.py index ab7f2050d..8c36cf018 100644 --- a/src/NamingService/SALOME_NamingServicePy.py +++ b/src/NamingService/SALOME_NamingServicePy.py @@ -50,7 +50,7 @@ class SALOME_NamingServicePy_i: self._orb = orb # initialize root context and current context ok = 0 - steps = 40 + steps = 240 while steps > 0 and ok == 0: try: obj =self._orb.resolve_initial_references("NameService") @@ -68,7 +68,7 @@ class SALOME_NamingServicePy_i: MESSAGE(" Name service not found") time.sleep(0.25) steps = steps - 1 - if steps == 0: + if steps == 0 and self._root_context is None: MESSAGE ( "Name Service Reference is invalid" ) sys.exit(1) #------------------------------------------------------------------------- diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx index a020990f5..8e916a7f5 100644 --- a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx +++ b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx @@ -206,9 +206,8 @@ SALOMEDS::GenericAttribute_ptr SALOMEDS_StudyBuilder_i::FindOrCreateAttribute(SA { SALOMEDS::Locker lock; Handle(SALOMEDSImpl_SObject) aSO; - char* anID = anObject->GetID(); - aSO = Handle(SALOMEDSImpl_Study)::DownCast(_impl->GetOwner())->GetSObject(anID); - delete [] anID; + CORBA::String_var anID = anObject->GetID(); + aSO = Handle(SALOMEDSImpl_Study)::DownCast(_impl->GetOwner())->GetSObject(anID.inout()); Handle(TDF_Attribute) anAttr; try { anAttr = _impl->FindOrCreateAttribute(aSO, TCollection_AsciiString((char*)aTypeOfAttribute)); diff --git a/src/SALOMEDS/SALOME_DriverPy.py b/src/SALOMEDS/SALOME_DriverPy.py index c92c9fc33..d1f1c4e27 100644 --- a/src/SALOMEDS/SALOME_DriverPy.py +++ b/src/SALOMEDS/SALOME_DriverPy.py @@ -6,7 +6,6 @@ class SALOME_DriverPy_i(SALOMEDS__POA.Driver): Should be inherited by any Python module's engine to provide persistence mechanism. """ - def __init__ (self, componentDataType): print "SALOME_DriverPy.__init__: ",componentDataType self._ComponentDataType = componentDataType -- 2.39.2