? KERNEL_SRC_3.2.2/Makefile.in ? KERNEL_SRC_3.2.2/aclocal.m4 ? KERNEL_SRC_3.2.2/autom4te.cache ? KERNEL_SRC_3.2.2/configure ? KERNEL_SRC_3.2.2/bin/Makefile.in ? KERNEL_SRC_3.2.2/doc/Makefile.in ? KERNEL_SRC_3.2.2/doc/salome/Batch.info ? KERNEL_SRC_3.2.2/doc/salome/Makefile.in ? KERNEL_SRC_3.2.2/doc/salome/stamp-vti ? KERNEL_SRC_3.2.2/doc/salome/version.texi ? KERNEL_SRC_3.2.2/doc/salome/tui/Makefile.in ? KERNEL_SRC_3.2.2/idl/Makefile.in ? KERNEL_SRC_3.2.2/resources/Makefile.in ? KERNEL_SRC_3.2.2/salome_adm/Makefile.in ? KERNEL_SRC_3.2.2/salome_adm/unix/Makefile.in ? KERNEL_SRC_3.2.2/salome_adm/unix/pythonbe.pyc ? KERNEL_SRC_3.2.2/salome_adm/unix/config_files/Makefile.in ? KERNEL_SRC_3.2.2/salome_adm/unix/config_files/compile ? KERNEL_SRC_3.2.2/salome_adm/unix/config_files/config.guess ? KERNEL_SRC_3.2.2/salome_adm/unix/config_files/config.sub ? KERNEL_SRC_3.2.2/salome_adm/unix/config_files/depcomp ? KERNEL_SRC_3.2.2/salome_adm/unix/config_files/install-sh ? KERNEL_SRC_3.2.2/salome_adm/unix/config_files/ltmain.sh ? KERNEL_SRC_3.2.2/salome_adm/unix/config_files/mdate-sh ? KERNEL_SRC_3.2.2/salome_adm/unix/config_files/missing ? KERNEL_SRC_3.2.2/salome_adm/unix/config_files/py-compile ? KERNEL_SRC_3.2.2/salome_adm/unix/config_files/texinfo.tex ? KERNEL_SRC_3.2.2/src/Makefile.in ? KERNEL_SRC_3.2.2/src/Basics/Makefile.in ? KERNEL_SRC_3.2.2/src/Basics/Test/Makefile.in ? KERNEL_SRC_3.2.2/src/Batch/Makefile.in ? KERNEL_SRC_3.2.2/src/Batch_SWIG/Makefile.in ? KERNEL_SRC_3.2.2/src/CASCatch/Makefile.in ? KERNEL_SRC_3.2.2/src/Communication/Makefile.in ? KERNEL_SRC_3.2.2/src/Communication_SWIG/Makefile.in ? KERNEL_SRC_3.2.2/src/Container/Makefile.in ? KERNEL_SRC_3.2.2/src/GenericObj/Makefile.in ? KERNEL_SRC_3.2.2/src/HDFPersist/Makefile.in ? KERNEL_SRC_3.2.2/src/KERNEL_PY/Makefile.in ? KERNEL_SRC_3.2.2/src/LifeCycleCORBA/Makefile.in ? KERNEL_SRC_3.2.2/src/LifeCycleCORBA/Test/Makefile.in ? KERNEL_SRC_3.2.2/src/LifeCycleCORBA_SWIG/Makefile.in ? KERNEL_SRC_3.2.2/src/LifeCycleCORBA_SWIG/Test/Makefile.in ? KERNEL_SRC_3.2.2/src/Logger/Makefile.in ? KERNEL_SRC_3.2.2/src/Logger/Test/Makefile.in ? KERNEL_SRC_3.2.2/src/MPIContainer/Makefile.in ? KERNEL_SRC_3.2.2/src/ModuleCatalog/Makefile.in ? KERNEL_SRC_3.2.2/src/ModuleGenerator/Makefile.in ? KERNEL_SRC_3.2.2/src/NOTIFICATION_SWIG/Makefile.in ? KERNEL_SRC_3.2.2/src/NamingService/Makefile.in ? KERNEL_SRC_3.2.2/src/NamingService/Test/Makefile.in ? KERNEL_SRC_3.2.2/src/Notification/Makefile.in ? KERNEL_SRC_3.2.2/src/Registry/Makefile.in ? KERNEL_SRC_3.2.2/src/ResourcesManager/Makefile.in ? KERNEL_SRC_3.2.2/src/SALOMEDS/Makefile.in ? KERNEL_SRC_3.2.2/src/SALOMEDS/Test/Makefile.in ? KERNEL_SRC_3.2.2/src/SALOMEDSClient/Makefile.in ? KERNEL_SRC_3.2.2/src/SALOMEDSImpl/Makefile.in ? KERNEL_SRC_3.2.2/src/SALOMEDSImpl/Test/Makefile.in ? KERNEL_SRC_3.2.2/src/SALOMELocalTrace/Makefile.in ? KERNEL_SRC_3.2.2/src/SALOMELocalTrace/Test/Makefile.in ? KERNEL_SRC_3.2.2/src/SALOMETraceCollector/Makefile.in ? KERNEL_SRC_3.2.2/src/SALOMETraceCollector/Test/Makefile.in ? KERNEL_SRC_3.2.2/src/TOOLSDS/Makefile.in ? KERNEL_SRC_3.2.2/src/TestContainer/Makefile.in ? KERNEL_SRC_3.2.2/src/TestMPIContainer/Makefile.in ? KERNEL_SRC_3.2.2/src/UnitTests/Makefile.in ? KERNEL_SRC_3.2.2/src/Utils/Makefile.in ? KERNEL_SRC_3.2.2/src/Utils/Test/Makefile.in Index: KERNEL_SRC_3.2.2/bin/launchConfigureParser.py =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/bin/launchConfigureParser.py,v retrieving revision 1.14.2.7 retrieving revision 1.14.2.10 diff -c -u -r1.14.2.7 -r1.14.2.10 --- KERNEL_SRC_3.2.2/bin/launchConfigureParser.py 4 Sep 2006 11:19:19 -0000 1.14.2.7 +++ KERNEL_SRC_3.2.2/bin/launchConfigureParser.py 18 Oct 2006 12:36:16 -0000 1.14.2.10 @@ -16,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + import os, glob, string, sys, re import xml.sax @@ -30,6 +31,7 @@ # certain values in XML configuration file ("launch" section) lanch_nam = "launch" +help_nam = "help" gui_nam = "gui" splash_nam = "splash" logger_nam = "logger" @@ -44,6 +46,8 @@ key_nam = "key" interp_nam = "interp" except_nam = "noexcepthandler" +terminal_nam = "terminal" +case_nam = "test" # values in XML configuration file giving specific module parameters ( section) # which are stored in opts with key _ (eg SMESH_plugins) @@ -62,19 +66,32 @@ # values of list type listKeys = ( containers_nam, embedded_nam, key_nam, modules_nam, standalone_nam, plugins_nam ) -# return application version (uses GUI_ROOT_DIR (or KERNEL_ROOT_DIR in batch mode) +/bin/salome/VERSION) +### +# Get the application version +# Uses GUI_ROOT_DIR (or KERNEL_ROOT_DIR in batch mode) +/bin/salome/VERSION file +### def version(): - root_dir = os.environ.get( 'KERNEL_ROOT_DIR', '' ) # KERNEL_ROOT_DIR or "" if not found - root_dir = os.environ.get( 'GUI_ROOT_DIR', root_dir ) # GUI_ROOT_DIR or KERNEL_ROOT_DIR or "" if both not found - filename = root_dir+'/bin/salome/VERSION' - str = open( filename, "r" ).readline() # str = "THIS IS SALOME - SALOMEGUI VERSION: 3.0.0" - match = re.search( r':\s+([a-zA-Z0-9.]+)\s*$', str ) - if match : - return match.group( 1 ) + try: + filename = None + root_dir = os.environ.get( 'KERNEL_ROOT_DIR', '' ) # KERNEL_ROOT_DIR or "" if not found + if root_dir and os.path.exists( root_dir + "/bin/salome/VERSION" ): + filename = root_dir + "/bin/salome/VERSION" + root_dir = os.environ.get( 'GUI_ROOT_DIR', '' ) # GUI_ROOT_DIR "" if not found + if root_dir and os.path.exists( root_dir + "/bin/salome/VERSION" ): + filename = root_dir + "/bin/salome/VERSION" + if filename: + str = open( filename, "r" ).readline() # str = "THIS IS SALOME - SALOMEGUI VERSION: 3.0.0" + match = re.search( r':\s+([a-zA-Z0-9.]+)\s*$', str ) + if match : + return match.group( 1 ) + except: + pass return '' -# calculate and return configuration file id in order to unically identify it -# for example: for 3.1.0a1 the id is 301000101 +### +# Calculate and return configuration file unique ID +# For example: for SALOME version 3.1.0a1 the id is 300999701 +### def version_id( fname ): vers = fname.split(".") major = int(vers[0]) @@ -96,7 +113,9 @@ if dev > 0: ver = ver - 10000 + dev return ver -# get user configuration file name +### +# Get user configuration file name +### def userFile(): v = version() if not v: @@ -123,7 +142,9 @@ # ----------------------------------------------------------------------------- -### xml reader for launch configuration file usage +### +# XML reader for launch configuration file usage +### section_to_skip = "" @@ -212,96 +233,9 @@ # ----------------------------------------------------------------------------- -### searching for launch configuration files -# the rule: -# - environment variable {'appname'+'Config'} (SalomeAppConfig) contains list of directories (';' as devider) -# - these directories contain 'appname'+'.xml' (SalomeApp.xml) configuration files -# - these files are analyzed beginning with the last one (last directory in the list) -# - if a key is found in next analyzed cofiguration file - it will be replaced -# - the last configuration file to be analyzed - ~/.'appname'+'rc' (~/SalomeApprc) (if it exists) -# - but anyway, if user specifies a certain option in a command line - it will replace the values -# - specified in configuration file(s) -# - once again the order of settings (next setting replaces the previous ones): -# - SalomeApp.xml files in directories specified by SalomeAppConfig env variable -# - .SalomeApprc file in user's catalogue -# - command line - -config_var = appname+'Config' -# set resources variables if not yet set -dirs = [] -if os.getenv(config_var): - dirs += re.split('[;|:]', os.getenv(config_var)) -if os.getenv("GUI_ROOT_DIR"): - dirs += [os.getenv("GUI_ROOT_DIR") + "/share/salome/resources/gui"] -os.environ[config_var] = ":".join(dirs) - -dirs.reverse() # reverse order, like in "path" variable - FILO-style processing - -_opts = {} # assiciative array of options to be filled - -# SalomeApp.xml files in directories specified by SalomeAppConfig env variable -for dir in dirs: - filename = dir+'/'+appname+'.xml' - if not os.path.exists(filename): - print "Configure parser: Warning : could not find configuration file %s" % filename - else: - try: - p = xml_parser(filename, _opts) - _opts = p.opts - except: - print "Configure parser: Error : can not read configuration file %s" % filename - pass - -# SalomeApprc file in user's catalogue -filename = userFile() -if not filename or not os.path.exists(filename): - print "Configure parser: Warning : could not find user configuration file" -else: - try: - p = xml_parser(filename, _opts) - _opts = p.opts - except: - print 'Configure parser: Error : can not read user configuration file' - -args = _opts - -# --- setting default values of keys if they were NOT set in config files --- -for aKey in listKeys: - if not args.has_key( aKey ): - args[aKey]=[] - -for aKey in boolKeys: - if not args.has_key( aKey ): - args[aKey]=0 - -if args[file_nam]: - afile=args[file_nam] - args[file_nam]=[afile] - -args[appname_nam] = appname - -### searching for my port - -my_port = 2809 -try: - file = open(os.environ["OMNIORB_CONFIG"], "r") - s = file.read() - while len(s): - l = string.split(s, ":") - if string.split(l[0], " ")[0] == "ORBInitRef" or string.split(l[0], " ")[0] == "InitRef" : - my_port = int(l[len(l)-1]) - pass - s = file.read() - pass -except: - pass - -args[port_nam] = my_port - -# ----------------------------------------------------------------------------- - -### command line options reader - +### +# Command line options parser +### def options_parser(line): source = line list = [] @@ -319,11 +253,13 @@ if source[i][0] != '-': key = None elif source[i][1] == '-': - key = source[i][2] + key = source[i][2:] else: - key = source[i][1] + key = source[i][1:] pass + if key is None and not result: + raise Exception() result[key] = [] if key: i += 1 @@ -337,118 +273,253 @@ # ----------------------------------------------------------------------------- -### read command-line options : each arg given in command line supersedes arg from xml config file -cmd_opts = {} -try: - cmd_opts = options_parser(sys.argv[1:]) - kernel_root_dir=os.environ["KERNEL_ROOT_DIR"] -except: - cmd_opts["h"] = 1 - pass +### +# Get the environment +### + +# this attribute is obsolete +args = [] +def get_env(): + ### + # Collect launch configuration files: + # - The environment variable "Config" (SalomeAppConfig) which can + # define a list of directories (separated by ':' or ';' symbol) is checked + # - If the environment variable "Config" is not set, only + # ${GUI_ROOT_DIR}/share/salome/resources/gui is inspected + # - ${GUI_ROOT_DIR}/share/salome/resources/gui directory is always inspected + # so it is not necessary to put it in the "Config" variable + # - The directories which are inspected are checked for files ".xml" + # (SalomeApp.xml) which define SALOME configuration + # - These directories are analyzed beginning from the last one in the list, + # so the first directory listed in "Config" environment variable + # has higher priority: it means that if some configuration options + # is found in the next analyzed cofiguration file - it will be replaced + # - The last configuration file which is parsed is user configuration file + # situated in the home directory: "~/.rc[.]" (~/SalomeApprc.3.2.0) + # (if it exists) + # - Command line options have the highest priority and replace options + # specified in configuration file(s) + ### + + global args + config_var = appname+'Config' + + # set resources variable SaloemAppConfig if it is not set yet + dirs = [] + if os.getenv(config_var): + dirs += re.split('[;|:]', os.getenv(config_var)) + if os.getenv("GUI_ROOT_DIR") and os.path.isdir( os.getenv("GUI_ROOT_DIR") + "/share/salome/resources/gui" ): + dirs += [os.getenv("GUI_ROOT_DIR") + "/share/salome/resources/gui"] + os.environ[config_var] = ":".join(dirs) + + dirs.reverse() # reverse order, like in "path" variable - FILO-style processing + + _opts = {} # associative array of options to be filled + + # parse SalomeApp.xml files in directories specified by SalomeAppConfig env variable + for dir in dirs: + filename = dir+'/'+appname+'.xml' + if not os.path.exists(filename): + print "Configure parser: Warning : could not find configuration file %s" % filename + else: + try: + p = xml_parser(filename, _opts) + _opts = p.opts + except: + print "Configure parser: Error : can not read configuration file %s" % filename + pass -### check all options are right + # parse .SalomeApprc. file in user's home directory if it exists + # if user file for the current version is not found the nearest to it is used + filename = userFile() + if not filename or not os.path.exists(filename): + print "Configure parser: Warning : could not find user configuration file" + else: + try: + p = xml_parser(filename, _opts) + _opts = p.opts + except: + print 'Configure parser: Error : can not read user configuration file' -opterror=0 -for opt in cmd_opts: - if not opt in ("h","g","l","f","x","m","e","s","c","p","k","t","i","r"): - print "Configure parser: Error : command line error : -%s" % opt - opterror=1 - -if opterror == 1: - cmd_opts["h"] = 1 - -if cmd_opts.has_key("h"): - print """USAGE: runSalome.py [options] - [command line options] : - --help or -h : print this help - --gui or -g : launching with GUI - --terminal -t : launching without gui (to deny --gui) - or -t=PythonScript[,...] - : import of PythonScript(s) - --logger or -l : redirect messages in a CORBA collector - --file=filename or -f=filename: redirect messages in a log file - --xterm or -x : execute servers in xterm console (messages appear in xterm windows) - --modules=module1,module2,... : salome module list (modulen is the name of Salome module to load) - or -m=module1,module2,... - --embedded=registry,study,moduleCatalog,cppContainer - or -e=registry,study,moduleCatalog,cppContainer - : embedded CORBA servers (default: registry,study,moduleCatalog,cppContainer) - : (logger,pyContainer,supervContainer can't be embedded - --standalone=registry,study,moduleCatalog,cppContainer,pyContainer,supervContainer - or -s=registry,study,moduleCatalog,cppContainer,pyContainer,supervContainer - : standalone CORBA servers (default: pyContainer,supervContainer) - --containers=cpp,python,superv: (obsolete) launching of containers cpp, python and supervision - or -c=cpp,python,superv : = get default from -e and -s - --portkill or -p : kill the salome with current port - --killall or -k : kill all salome sessions - --interp=n or -i=n : number of additional xterm to open, with session environment - -z : display splash screen - -r : disable centralized exception handling mechanism - - For each Salome module, the environment variable _ROOT_DIR must be set. - The module name () must be uppercase. - KERNEL_ROOT_DIR is mandatory. - """ - sys.exit(1) - pass + args = _opts -### apply command-line options to the arguments -for opt in cmd_opts: - if opt == 'g': - args[gui_nam] = 1 - elif opt == 'z': - args[splash_nam] = 1 - elif opt == 'r': - args[except_nam] = 1 - elif opt == 'l': - args[logger_nam] = 1 - elif opt == 'f': - args[file_nam] = cmd_opts['f'] - elif opt == 'x': - args[xterm_nam] = 1 - elif opt == 'i': - args[interp_nam] = cmd_opts['i'] - elif opt == 'm': - args[modules_nam] = cmd_opts['m'] - elif opt == 'e': - args[embedded_nam] = cmd_opts['e'] - elif opt == 's': - args[standalone_nam] = cmd_opts['s'] - elif opt == 'c': - args[containers_nam] = cmd_opts['c'] - elif opt == 'p': - args[portkill_nam] = 1 - elif opt == 'k': - args[killall_nam] = 1 - pass - pass + # set default values for options which are NOT set in config files + for aKey in listKeys: + if not args.has_key( aKey ): + args[aKey]=[] -# if --modules (-m) command line option is not given -# try SALOME_MODULES environment variable -if not cmd_opts.has_key( "m" ) and os.getenv( "SALOME_MODULES" ): - args[modules_nam] = re.split( "[:;,]", os.getenv( "SALOME_MODULES" ) ) - pass + for aKey in boolKeys: + if not args.has_key( aKey ): + args[aKey]=0 -# 'terminal' must be processed in the end: to deny any 'gui' options -args[script_nam] = [] -if 't' in cmd_opts: - args[gui_nam] = 0 - args[script_nam] = cmd_opts['t'] - pass + if args[file_nam]: + afile=args[file_nam] + args[file_nam]=[afile] -if args[except_nam] == 1: - os.environ["DISABLE_FPE"] = "1" - pass + args[appname_nam] = appname + + # get the port number + my_port = 2809 + try: + file = open(os.environ["OMNIORB_CONFIG"], "r") + s = file.read() + while len(s): + l = string.split(s, ":") + if string.split(l[0], " ")[0] == "ORBInitRef" or string.split(l[0], " ")[0] == "InitRef" : + my_port = int(l[len(l)-1]) + pass + s = file.read() + pass + except: + pass + + args[port_nam] = my_port + + # read command-line options + # each option given in command line overrides the option from xml config file + cmd_opts = {} + try: + cmd_opts = options_parser(sys.argv[1:]) + kernel_root_dir=os.environ["KERNEL_ROOT_DIR"] + except: + cmd_opts["h"] = 1 + pass -# now modify SalomeAppConfig environment variable -dirs = re.split('[;|:]', os.environ[config_var] ) + # check if all command line options are correct + short_opts = ("h","g","l","f","x","m","e","s","c","p","k","t","i","r","z") + long_opts = (help_nam,gui_nam,logger_nam,file_nam,xterm_nam,modules_nam, + embedded_nam,standalone_nam,containers_nam,portkill_nam, + killall_nam,terminal_nam,interp_nam,except_nam,splash_nam, + case_nam) + opterror=0 + for opt in cmd_opts: + if opt not in short_opts and opt not in long_opts: + print "Configure parser: Error : command line error : -%s" % opt + opterror=1 + + if opterror == 1: + cmd_opts["h"] = 1 + + if cmd_opts.has_key("h") or cmd_opts.has_key(help_nam): + print """ + USAGE: runSalome.py [options] + + Command line options: + + --gui (-g) Launch in GUI mode [default]. + --terminal (-t) Launching without GUI (in the terminal mode). + --terminal=[,...] Launching without GUI (in the terminal mode) and + (-t=[,...]) additionally import python script(s). + --logger (-l) Redirect messages to the CORBA collector. + --file= (-f=) Redirect messages to the log file. + --xterm (-x) Launch each SALOME server in own xterm console. + --modules=,,... SALOME module list (where , + (-m=,,...) are the names of SALOME modules which should be + available in the SALOME session). + --embedded=,,... CORBA servers to be launched in the Session + (-e=,,...) embedded mode. + Valid values for : registry, study, + moduleCatalog, cppContainer + [default: all mentioned]. + --standalone=,,... CORBA servers to be launched in the standalone + (-s=,,...) mode (as separate processes). + Valid values for : registry, study, + moduleCatalog, cppContainer, pyContainer, + supervContainer + [default: pyContainer,supervContainer]. + --containers=,... [obsolete] SALOME containers to be launched. + (-c=,...) Valid values: cpp, python, superv + [default: use --embedded and --standalone + parameters]. + --portkill (-p) Kill SALOME with the current port. + --killall (-k) Kill all running SALOME sessions. + --interp= (-i=) The number of additional xterm sessions to open. + In each xterm session SALOME environment is set + properly. + --splash (-z) Display splash screen. + --noexcepthandler (-r) Disable centralized exception handling + mechanism. + --test= HDF file to be opened on GUI starting and/or + Python script(s) to be imported in the GUI + study. The files can appear in arbitrary order. + If the HDF file is given it is opened, otherwise + the new empty study is created. + Python scripts are imported in the order of + their appearance. + This option is avaiable only in GUI mode, + for batch mode use --terminal(-t) option. + --help (-h) Print this help info + + For each SALOME module, the environment variable _ROOT_DIR must be set. + KERNEL_ROOT_DIR is mandatory. + """ + sys.exit(1) + pass + + # apply command-line options to the arguments + BATCHMODE_FORCED = False + args[script_nam] = [] + for opt in cmd_opts: + if opt in [ 'g', gui_nam ] : + if not BATCHMODE_FORCED: args[gui_nam] = 1 + elif opt in [ 't', terminal_nam ] : + args[gui_nam] = 0 + args[script_nam] = cmd_opts[opt] + BATCHMODE_FORCED = True + elif opt in [ 'z', splash_nam ] : + args[splash_nam] = 1 + elif opt in [ 'r', except_nam ] : + args[except_nam] = 1 + elif opt in [ 'l', logger_nam ] : + args[logger_nam] = 1 + elif opt in [ 'f', file_nam ] : + args[file_nam] = cmd_opts[opt] + elif opt in [ 'x', xterm_nam ] : + args[xterm_nam] = 1 + elif opt in [ 'i', interp_nam ] : + args[interp_nam] = cmd_opts[opt] + elif opt in [ 'm', modules_nam ] : + args[modules_nam] = cmd_opts[opt] + elif opt in [ 'e', embedded_nam ] : + args[embedded_nam] = cmd_opts[opt] + elif opt in [ 's', standalone_nam ] : + args[standalone_nam] = cmd_opts[opt] + elif opt in [ 'c', containers_nam ] : + args[containers_nam] = cmd_opts[opt] + elif opt in [ 'p', portkill_nam ] : + args[portkill_nam] = 1 + elif opt in [ 'k', killall_nam ] : + args[killall_nam] = 1 + elif opt in [ case_nam ] : + args[case_nam] = cmd_opts[opt] + pass + + # if --modules (-m) command line option is not given + # try SALOME_MODULES environment variable + if not cmd_opts.has_key( "m" ) and \ + not cmd_opts.has_key( modules_nam ) and \ + os.getenv( "SALOME_MODULES" ): + args[modules_nam] = re.split( "[:;,]", os.getenv( "SALOME_MODULES" ) ) + pass + + # disable signals handling + if args[except_nam] == 1: + os.environ["NOT_INTERCEPT_SIGNALS"] = "1" + pass + + # now modify SalomeAppConfig environment variable + # to take into account the SALOME modules + dirs = re.split('[;|:]', os.environ[config_var] ) + + for m in args[modules_nam]: + if m not in ["KERNEL", "GUI", ""] and os.getenv("%s_ROOT_DIR"%m): + d1 = os.getenv("%s_ROOT_DIR"%m) + "/share/salome/resources/" + m.lower() + d2 = os.getenv("%s_ROOT_DIR"%m) + "/share/salome/resources" + if os.path.exists( "%s/%s.xml"%(d1, appname) ): + dirs.append( d1 ) + elif os.path.exists( "%s/%s.xml"%(d2, appname) ): + dirs.append( d2 ) + os.environ[config_var] = ":".join(dirs) -for m in args[modules_nam]: - if m not in ["KERNEL", "GUI", ""] and os.getenv("%s_ROOT_DIR"%m): - d1 = os.getenv("%s_ROOT_DIR"%m) + "/share/salome/resources/" + m.lower() - d2 = os.getenv("%s_ROOT_DIR"%m) + "/share/salome/resources" - if os.path.exists( "%s/%s.xml"%(d1, appname) ): - dirs.append( d1 ) - elif os.path.exists( "%s/%s.xml"%(d2, appname) ): - dirs.append( d2 ) -os.environ[config_var] = ":".join(dirs) + # return arguments + return args Index: KERNEL_SRC_3.2.2/bin/runSalome.py =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/bin/runSalome.py,v retrieving revision 1.33.2.6 retrieving revision 1.33.2.7 diff -c -u -r1.33.2.6 -r1.33.2.7 --- KERNEL_SRC_3.2.2/bin/runSalome.py 5 Sep 2006 06:13:58 -0000 1.33.2.6 +++ KERNEL_SRC_3.2.2/bin/runSalome.py 18 Oct 2006 12:36:16 -0000 1.33.2.7 @@ -80,7 +80,7 @@ # read args from launch configure xml file and command line options import launchConfigureParser - args = launchConfigureParser.args + args = launchConfigureParser.get_env() # Check variables _ROOT_DIR # and set list of used modules (without KERNEL) @@ -473,10 +473,9 @@ if self.args['noexcepthandler']: self.SCMD2+=['noexcepthandler'] if self.args.has_key('modules'): - self.SCMD2+=['--modules ('] - for mod in self.args['modules']: - self.SCMD2+=[mod + ':'] - self.SCMD2+=[')'] + self.SCMD2+=['--modules (%s)'%":".join(self.args['modules'])] + if self.args.has_key('test') and len(args['test']) > 0: + self.SCMD2+=['--test=%s'%(",".join(args['test']))] def setpath(self,modules_list,modules_root_dir): cata_path=[] Index: KERNEL_SRC_3.2.2/doc/salome/tui/Makefile.am =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/doc/salome/tui/Makefile.am,v retrieving revision 1.6.4.1 retrieving revision 1.6.4.2 diff -c -u -r1.6.4.1 -r1.6.4.2 --- KERNEL_SRC_3.2.2/doc/salome/tui/Makefile.am 7 Sep 2006 07:06:42 -0000 1.6.4.1 +++ KERNEL_SRC_3.2.2/doc/salome/tui/Makefile.am 22 Sep 2006 10:33:44 -0000 1.6.4.2 @@ -25,7 +25,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am -EXTRA_DIST = $(srcdir)/KERNEL $(srcdir)/pythfilter.py +EXTRA_DIST = KERNEL pythfilter.py dist-hook: rm -rf `find $(distdir) -name CVS` Index: KERNEL_SRC_3.2.2/idl/SALOMEDS.idl =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/idl/SALOMEDS.idl,v retrieving revision 1.11.2.3 retrieving revision 1.11.2.4 diff -c -u -r1.11.2.3 -r1.11.2.4 --- KERNEL_SRC_3.2.2/idl/SALOMEDS.idl 7 Sep 2006 07:08:55 -0000 1.11.2.3 +++ KERNEL_SRC_3.2.2/idl/SALOMEDS.idl 16 Oct 2006 13:22:12 -0000 1.11.2.4 @@ -400,7 +400,7 @@ \param thePID is a process ID of the caller \param isLocal is set True if the Study is launched locally with the caller */ - long GetLocalImpl(in string theHostname, in long thePID, out boolean isLocal); + long long GetLocalImpl(in string theHostname, in long thePID, out boolean isLocal); /*! @@ -842,7 +842,7 @@ \param thePID is a process ID of the caller \param isLocal is set True if the StudyManager is launched locally with the caller */ - long GetLocalImpl(in string theHostname, in long thePID, out boolean isLocal); + long long GetLocalImpl(in string theHostname, in long thePID, out boolean isLocal); }; @@ -959,7 +959,7 @@ \param thePID is a process ID of the caller \param isLocal is set True if the SObject is launched locally with the caller */ - long GetLocalImpl(in string theHostname, in long thePID, out boolean isLocal); + long long GetLocalImpl(in string theHostname, in long thePID, out boolean isLocal); }; @@ -996,7 +996,7 @@ \param thePID is a process ID of the caller \param isLocal is set True if the GenericAttribute is launched locally with the caller */ - long GetLocalImpl(in string theHostname, in long thePID, out boolean isLocal); + long long GetLocalImpl(in string theHostname, in long thePID, out boolean isLocal); }; Index: KERNEL_SRC_3.2.2/idl/SALOMEDS_Attributes.idl =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/idl/SALOMEDS_Attributes.idl,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -c -u -r1.8.2.1 -r1.8.2.2 --- KERNEL_SRC_3.2.2/idl/SALOMEDS_Attributes.idl 7 Sep 2006 07:08:55 -0000 1.8.2.1 +++ KERNEL_SRC_3.2.2/idl/SALOMEDS_Attributes.idl 17 Oct 2006 10:29:15 -0000 1.8.2.2 @@ -266,6 +266,24 @@ void SetValue(in string value); }; //========================================================================== +/*! \brief String attribute + + This attribute stores a string value containing arbitrary information. +*/ + //========================================================================== + interface AttributeString : GenericAttribute + { +/*! + Returns the value of this attribute +*/ + string Value(); +/*! + Sets the value of this attribute + \param value This string parameter defines the value of this attribute. +*/ + void SetValue(in string value); + }; + //========================================================================== /*! \brief IOR attribute This attribute stores a string value identifying a runtime object.In particular Index: KERNEL_SRC_3.2.2/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/salome_adm/unix/config_files/ac_cxx_depend_flag.m4,v retrieving revision 1.7 retrieving revision 1.7.48.2 diff -c -u -r1.7 -r1.7.48.2 --- KERNEL_SRC_3.2.2/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 17 Oct 2005 10:29:55 -0000 1.7 +++ KERNEL_SRC_3.2.2/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 12 Oct 2006 12:30:27 -0000 1.7.48.2 @@ -35,6 +35,85 @@ echo "conftest.o: conftest.c" > conftest.verif echo "int main() { return 0; }" > conftest.c +f77int="F77INT32" +case $host_os in + irix5.* | irix6.* | osf4.* | osf5.* | linux* ) + + linux64="true" + expr "$host_os" : 'linux' >/dev/null && test ! x"$host_cpu" = x"x86_64" && linux64="false" + if test ! x"$linux64" = "xfalse" ; then + echo "$as_me:$LINENO: checking for 64bits integers size in F77/F90" >&5 +echo $ECHO_N "checking for 64bits integers size in F77/F90... $ECHO_C" >&6 + # Check whether --enable-int64 or --disable-int64 was given. +if test "${enable_int64+set}" = set; then + enableval="$enable_int64" + +fi; + case "X-$enable_int64" in + X-no) + echo "$as_me:$LINENO: result: \"disabled\"" >&5 +echo "${ECHO_T}\"disabled\"" >&6 + SUFFIXES="_32" + ;; + *) + echo "$as_me:$LINENO: result: \"enabled\"" >&5 +echo "${ECHO_T}\"enabled\"" >&6 + SUFFIXES="" + f77int="F77INT64" + ;; + esac + fi + ;; + *) + ;; +esac + +case $host_os in + linux*) + if test x"$linux64" = x"true"; then \ + MACHINE="PCLINUX64${SUFFIXES}"; + CFLAGS=" -m64 ${CXXFLAGS}"; + CXXFLAGS=" -m64 ${CXXFLAGS}";\ + else \ + MACHINE=PCLINUX; \ + fi + ;; + hpux*) + MACHINE=HP9000 + ;; + aix4.*) + MACHINE=RS6000 + host_os_novers=aix4.x + ;; + irix5.*) + MACHINE="IRIX64${SUFFIXES}" + host_os_novers=irix5.x + ;; + irix6.*) + MACHINE="IRIX64${SUFFIXES}" + host_os_novers=irix6.x + ;; + osf4.*) + MACHINE="OSF1${SUFFIXES}" + host_os_novers=osf4.x + ;; + osf5.*) + MACHINE="OSF1${SUFFIXES}" + host_os_novers=osf5.x + ;; + solaris2.*) + MACHINE=SUN4SOL2 + host_os_novers=solaris2.x + ;; + uxpv*) + MACHINE=VPP5000 + ;; + *) + MACHINE= + host_os_novers=$host_os + ;; +esac + dnl Evolution portage sur CCRT/osf system case $host_os in osf*) @@ -44,14 +123,14 @@ DEPCXX=g++ DEPCXXFLAGS="-Wno-deprecated" DIFFFLAGS="-w" - MACHINE="OSF1" +dnl MACHINE="OSF1" ;; *) DEPCC=${CC-cc} DEPCXX=${CXX-c++} DEPCXXFLAGS="\${CXXFLAGS}" DIFFFLAGS="-b -B" - MACHINE="PCLINUX" +dnl MACHINE="PCLINUX" ;; esac C_DEPEND_FLAG= Index: KERNEL_SRC_3.2.2/salome_adm/unix/config_files/check_cppunit.m4 =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/salome_adm/unix/config_files/check_cppunit.m4,v retrieving revision 1.3 diff -c -u -r1.3 check_cppunit.m4 --- KERNEL_SRC_3.2.2/salome_adm/unix/config_files/check_cppunit.m4 13 Mar 2006 12:18:22 -0000 1.3 +++ KERNEL_SRC_3.2.2/salome_adm/unix/config_files/check_cppunit.m4 24 Oct 2006 08:09:55 -0000 @@ -24,10 +24,17 @@ exits_ok=no if test "x$exits_ok" = "xno"; then for d in /usr/local /usr ; do + AC_CHECK_FILE(${d}/lib64/libcppunit.so,exits_ok=yes,exits_ok=no) + if test "x$exits_ok" = "xyes"; then + CPPUNITHOME=$d + AC_MSG_RESULT(libcppunit.so detected in $d/lib64) + break + fi AC_CHECK_FILE(${d}/lib/libcppunit.so,exits_ok=yes,exits_ok=no) if test "x$exits_ok" = "xyes"; then CPPUNITHOME=$d AC_MSG_RESULT(libcppunit.so detected in $d/lib) + break fi done fi Index: KERNEL_SRC_3.2.2/src/Batch/Batch_Parametre.hxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/Batch/Batch_Parametre.hxx,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -c -u -r1.7 -r1.7.2.1 --- KERNEL_SRC_3.2.2/src/Batch/Batch_Parametre.hxx 1 Jun 2006 11:15:16 -0000 1.7 +++ KERNEL_SRC_3.2.2/src/Batch/Batch_Parametre.hxx 26 Sep 2006 08:11:59 -0000 1.7.2.1 @@ -54,7 +54,7 @@ Parametre(); // Constructeur par recopie - Parametre::Parametre(const Parametre & PM); + Parametre(const Parametre & PM); // Operateur de recherche dans la map Versatile & operator [] (const string &); Index: KERNEL_SRC_3.2.2/src/Container/Container_i.cxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/Container/Container_i.cxx,v retrieving revision 1.20.2.2 retrieving revision 1.20.2.3 diff -c -u -r1.20.2.2 -r1.20.2.3 --- KERNEL_SRC_3.2.2/src/Container/Container_i.cxx 4 Sep 2006 05:27:15 -0000 1.20.2.2 +++ KERNEL_SRC_3.2.2/src/Container/Container_i.cxx 16 Oct 2006 11:23:41 -0000 1.20.2.3 @@ -267,7 +267,16 @@ void Engines_Container_i::Shutdown() { MESSAGE("Engines_Container_i::Shutdown()"); + + /* For each component contained in this container + * tell it to self-destroy + */ + std::map::iterator itm; + for (itm = _listInstances_map.begin(); itm != _listInstances_map.end(); itm++) + itm->second->destroy(); + _NS->Destroy_FullDirectory(_containerName.c_str()); + _NS->Destroy_Name(_containerName.c_str()); //_remove_ref(); //_poa->deactivate_object(*_id); if(_isServantAloneInProcess) Index: KERNEL_SRC_3.2.2/src/KERNEL_PY/import_hook.py =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/KERNEL_PY/import_hook.py,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -c -u -r1.3.2.1 -r1.3.2.2 --- KERNEL_SRC_3.2.2/src/KERNEL_PY/import_hook.py 7 Jul 2006 10:27:17 -0000 1.3.2.1 +++ KERNEL_SRC_3.2.2/src/KERNEL_PY/import_hook.py 23 Oct 2006 07:46:01 -0000 1.3.2.2 @@ -149,7 +149,12 @@ #when fromlist is not specified and name is a dotted name, # module is the root package not the real module #so we need to retrieve it - m=get_real_module(module,name) + # note: some modules like xml.dom do not play the rule + # (import xml: no attribute dom, but import xml.dom OK) + try: + m=get_real_module(module,name) + except AttributeError: + m=None if type(m) == type(sys) and is_shared(m.__name__): set_shared_imported(m.__name__,m) Index: KERNEL_SRC_3.2.2/src/SALOMEDS/Makefile.am =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDS/Makefile.am,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -c -u -r1.4 -r1.4.4.1 --- KERNEL_SRC_3.2.2/src/SALOMEDS/Makefile.am 1 Jun 2006 11:15:18 -0000 1.4 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/Makefile.am 17 Oct 2006 10:32:13 -0000 1.4.4.1 @@ -140,6 +140,7 @@ SALOMEDS_AttributeStudyProperties_i.cxx \ SALOMEDS_AttributePythonObject_i.cxx \ SALOMEDS_AttributeParameter_i.cxx \ + SALOMEDS_AttributeString_i.cxx \ SALOMEDS_SObject.cxx \ SALOMEDS_SComponent.cxx \ SALOMEDS_GenericAttribute.cxx \ @@ -180,6 +181,7 @@ SALOMEDS_AttributeUserID.cxx \ SALOMEDS_TMPFile_i.cxx \ SALOMEDS_AttributeParameter.cxx \ + SALOMEDS_AttributeString.cxx \ SALOMEDS_IParameters.cxx \ \ Handle_SALOMEDS_DataMapNodeOfDataMapOfIntegerString.hxx \ @@ -322,6 +324,8 @@ SALOMEDS_UseCaseIterator_i.hxx \ SALOMEDS_AttributeParameter.hxx \ SALOMEDS_AttributeParameter_i.hxx \ + SALOMEDS_AttributeString.hxx \ + SALOMEDS_AttributeString_i.hxx \ SALOMEDS_TMPFile_i.hxx libSalomeDS_la_CPPFLAGS = $(COMMON_CPPFLAGS) Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_AttributeString.cxx =================================================================== RCS file: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_AttributeString.cxx diff -N KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_AttributeString.cxx --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_AttributeString.cxx 17 Oct 2006 10:32:13 -0000 1.1.2.1 @@ -0,0 +1,62 @@ +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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. +// +// This library is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SALOMEDS_AttributeString.cxx +// Author : Sergey RUIN +// Module : SALOME + +#include "SALOMEDS_AttributeString.hxx" +#include "SALOMEDS.hxx" + +#include +#include +#include + +SALOMEDS_AttributeString::SALOMEDS_AttributeString(const Handle(SALOMEDSImpl_AttributeString)& theAttr) +:SALOMEDS_GenericAttribute(theAttr) +{} + +SALOMEDS_AttributeString::SALOMEDS_AttributeString(SALOMEDS::AttributeString_ptr theAttr) +:SALOMEDS_GenericAttribute(theAttr) +{} + +SALOMEDS_AttributeString::~SALOMEDS_AttributeString() +{} + +std::string SALOMEDS_AttributeString::Value() +{ + std::string aValue; + if (_isLocal) { + SALOMEDS::Locker lock; + aValue = TCollection_AsciiString(Handle(SALOMEDSImpl_AttributeString):: + DownCast(_local_impl)->Value()).ToCString(); + } + else aValue = SALOMEDS::AttributeString::_narrow(_corba_impl)->Value(); + return aValue; +} + +void SALOMEDS_AttributeString::SetValue(const std::string& value) +{ + if (_isLocal) { + CheckLocked(); + SALOMEDS::Locker lock; + Handle(SALOMEDSImpl_AttributeString)::DownCast(_local_impl)->SetValue((char*)value.c_str()); + } + else SALOMEDS::AttributeString::_narrow(_corba_impl)->SetValue(value.c_str()); +} Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_AttributeString.hxx =================================================================== RCS file: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_AttributeString.hxx diff -N KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_AttributeString.hxx --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_AttributeString.hxx 17 Oct 2006 10:32:13 -0000 1.1.2.1 @@ -0,0 +1,47 @@ +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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. +// +// This library is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SALOMEDS_AttributeString.hxx +// Author : Sergey RUIN +// Module : SALOME + +#ifndef SALOMEDS_AttributeString_HeaderFile +#define SALOMEDS_AttributeString_HeaderFile + +#include "SALOMEDSClient_AttributeString.hxx" +#include "SALOMEDS_GenericAttribute.hxx" +#include "SALOMEDSImpl_AttributeString.hxx" + +// IDL headers +#include +#include CORBA_SERVER_HEADER(SALOMEDS) +#include CORBA_SERVER_HEADER(SALOMEDS_Attributes) + +class SALOMEDS_AttributeString: public SALOMEDS_GenericAttribute, public SALOMEDSClient_AttributeString +{ +public: + SALOMEDS_AttributeString(const Handle(SALOMEDSImpl_AttributeString)& theAttr); + SALOMEDS_AttributeString(SALOMEDS::AttributeString_ptr theAttr); + ~SALOMEDS_AttributeString(); + + virtual std::string Value(); + virtual void SetValue(const std::string& value); +}; + +#endif Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_AttributeString_i.cxx =================================================================== RCS file: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_AttributeString_i.cxx diff -N KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_AttributeString_i.cxx --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_AttributeString_i.cxx 17 Oct 2006 10:32:13 -0000 1.1.2.1 @@ -0,0 +1,49 @@ +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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. +// +// This library is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SALOMEDS_AttributeString_i.cxx +// Author : Sergey RUIN +// Module : SALOME + + +#include "SALOMEDS_AttributeString_i.hxx" + +#include +#include "SALOMEDS_SObject_i.hxx" +#include "SALOMEDS.hxx" + +using namespace std; + +char* SALOMEDS_AttributeString_i::Value() +{ + SALOMEDS::Locker lock; + + CORBA::String_var c_s = + CORBA::string_dup(TCollection_AsciiString(Handle(SALOMEDSImpl_AttributeString)::DownCast(_impl)->Value()).ToCString()); + return c_s._retn(); +} + +void SALOMEDS_AttributeString_i::SetValue(const char* value) +{ + SALOMEDS::Locker lock; + + CheckLocked(); + TCollection_AsciiString aStr((char*)value); + Handle(SALOMEDSImpl_AttributeString)::DownCast(_impl)->SetValue(TCollection_ExtendedString(aStr)); +} Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_AttributeString_i.hxx =================================================================== RCS file: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_AttributeString_i.hxx diff -N KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_AttributeString_i.hxx --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_AttributeString_i.hxx 17 Oct 2006 10:32:13 -0000 1.1.2.1 @@ -0,0 +1,47 @@ +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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. +// +// This library is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SALOMEDS_AttributeString_i.hxx +// Author : Sergey RUIN +// Module : SALOME + +#ifndef SALOMEDS_AttributeString_i_HeaderFile +#define SALOMEDS_AttributeString_i_HeaderFile + +// IDL headers +#include +#include CORBA_SERVER_HEADER(SALOMEDS_Attributes) + +#include "SALOMEDS_GenericAttribute_i.hxx" +#include "SALOMEDSImpl_AttributeString.hxx" + +class SALOMEDS_AttributeString_i: public virtual POA_SALOMEDS::AttributeString, + public virtual SALOMEDS_GenericAttribute_i +{ +public: + SALOMEDS_AttributeString_i(const Handle(SALOMEDSImpl_AttributeString)& theAttr, CORBA::ORB_ptr orb) + :SALOMEDS_GenericAttribute_i(theAttr, orb) {}; + + virtual ~SALOMEDS_AttributeString_i() {}; + + char* Value(); + void SetValue(const char* value); +}; + +#endif Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_Attributes.hxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_Attributes.hxx,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -c -u -r1.5 -r1.5.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_Attributes.hxx 1 Jun 2006 11:15:18 -0000 1.5 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_Attributes.hxx 17 Oct 2006 10:32:13 -0000 1.5.2.1 @@ -55,6 +55,7 @@ #include "SALOMEDSImpl_AttributeFlags.hxx" #include "SALOMEDSImpl_AttributeGraphic.hxx" #include "SALOMEDSImpl_AttributeParameter.hxx" +#include "SALOMEDSImpl_AttributeString.hxx" #include "SALOMEDS_GenericAttribute_i.hxx" #include "SALOMEDS_AttributeName_i.hxx" @@ -86,6 +87,7 @@ #include "SALOMEDS_AttributeFlags_i.hxx" #include "SALOMEDS_AttributeGraphic_i.hxx" #include "SALOMEDS_AttributeParameter_i.hxx" +#include "SALOMEDS_AttributeString_i.hxx" #define __CreateCORBAAttribute(CORBA_Name) if (strcmp(aTypeOfAttribute, #CORBA_Name) == 0) { \ Handle(SALOMEDSImpl_##CORBA_Name) A = Handle(SALOMEDSImpl_##CORBA_Name)::DownCast(theAttr); \ @@ -124,6 +126,7 @@ __CreateCORBAAttribute(AttributeGraphic) \ __CreateCORBAAttribute(AttributeTreeNode) \ __CreateCORBAAttribute(AttributeUserID) \ -__CreateCORBAAttribute(AttributeParameter) +__CreateCORBAAttribute(AttributeParameter) \ +__CreateCORBAAttribute(AttributeString) #endif Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_ClientAttributes.hxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_ClientAttributes.hxx,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -c -u -r1.5 -r1.5.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_ClientAttributes.hxx 1 Jun 2006 11:15:18 -0000 1.5 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_ClientAttributes.hxx 17 Oct 2006 10:32:13 -0000 1.5.2.1 @@ -56,6 +56,7 @@ #include "SALOMEDSImpl_AttributeFlags.hxx" #include "SALOMEDSImpl_AttributeGraphic.hxx" #include "SALOMEDSImpl_AttributeParameter.hxx" +#include "SALOMEDSImpl_AttributeString.hxx" #include "SALOMEDS_GenericAttribute.hxx" #include "SALOMEDS_AttributeName.hxx" @@ -87,6 +88,7 @@ #include "SALOMEDS_AttributeFlags.hxx" #include "SALOMEDS_AttributeGraphic.hxx" #include "SALOMEDS_AttributeParameter.hxx" +#include "SALOMEDS_AttributeString.hxx" #define __CreateClientAttributeLocal(CORBA_Name) if (strcmp(aTypeOfAttribute.c_str(), #CORBA_Name) == 0) { \ Handle(SALOMEDSImpl_##CORBA_Name) A = Handle(SALOMEDSImpl_##CORBA_Name)::DownCast(theGA); \ @@ -127,7 +129,8 @@ __CreateClientAttributeLocal(AttributeGraphic) \ __CreateClientAttributeLocal(AttributeTreeNode) \ __CreateClientAttributeLocal(AttributeUserID) \ -__CreateClientAttributeLocal(AttributeParameter) +__CreateClientAttributeLocal(AttributeParameter) \ +__CreateClientAttributeLocal(AttributeString) #define __CreateGenericClientAttributeCORBA \ __CreateClientAttributeCORBA(AttributeReal) \ @@ -158,6 +161,7 @@ __CreateClientAttributeCORBA(AttributeGraphic) \ __CreateClientAttributeCORBA(AttributeTreeNode) \ __CreateClientAttributeCORBA(AttributeUserID) \ -__CreateClientAttributeCORBA(AttributeParameter) +__CreateClientAttributeCORBA(AttributeParameter) \ +__CreateClientAttributeCORBA(AttributeString) #endif Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -c -u -r1.5 -r1.5.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx 1 Jun 2006 11:15:18 -0000 1.5 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx 16 Oct 2006 13:21:59 -0000 1.5.2.1 @@ -58,7 +58,7 @@ long pid = (long)getpid(); #endif - long addr = theGA->GetLocalImpl(GetHostname().c_str(), pid, _isLocal); + CORBA::LongLong addr = theGA->GetLocalImpl(GetHostname().c_str(), pid, _isLocal); if(_isLocal) { _local_impl = ((SALOMEDSImpl_GenericAttribute*)(addr)); _corba_impl = SALOMEDS::GenericAttribute::_nil(); Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -c -u -r1.12 -r1.12.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx 1 Jun 2006 11:15:18 -0000 1.12 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx 16 Oct 2006 13:22:00 -0000 1.12.2.1 @@ -131,7 +131,7 @@ //=========================================================================== // PRIVATE FUNCTIONS //=========================================================================== -CORBA::Long SALOMEDS_GenericAttribute_i::GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal) +CORBA::LongLong SALOMEDS_GenericAttribute_i::GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal) { #ifdef WIN32 long pid = (long)_getpid(); @@ -140,5 +140,5 @@ #endif isLocal = (strcmp(theHostname, GetHostname().c_str()) == 0 && pid == thePID)?1:0; TDF_Attribute* local_impl = _impl.operator->(); - return ((long)local_impl); + return ((CORBA::LongLong)local_impl); } Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -c -u -r1.9 -r1.9.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx 1 Jun 2006 11:15:18 -0000 1.9 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx 16 Oct 2006 13:22:00 -0000 1.9.2.1 @@ -57,7 +57,7 @@ static SALOMEDS::GenericAttribute_ptr CreateAttribute(const Handle(TDF_Attribute)& theAttr, CORBA::ORB_ptr theOrb); - virtual CORBA::Long GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal); + virtual CORBA::LongLong GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal); }; #endif Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_SObject.cxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_SObject.cxx,v retrieving revision 1.6 retrieving revision 1.6.2.2 diff -c -u -r1.6 -r1.6.2.2 --- KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_SObject.cxx 1 Jun 2006 11:15:18 -0000 1.6 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_SObject.cxx 16 Oct 2006 13:22:00 -0000 1.6.2.2 @@ -62,7 +62,9 @@ long pid = (long)getpid(); #endif - long addr = theSObject->GetLocalImpl(GetHostname().c_str(), pid, _isLocal); + CORBA::LongLong addr = // mpv: fix for IPAL13534: for 64-bit platforms use 8-bytes long for pointer storage + theSObject->GetLocalImpl(GetHostname().c_str(), pid, _isLocal); + if(_isLocal) { _local_impl = ((SALOMEDSImpl_SObject*)(addr)); _corba_impl = SALOMEDS::SObject::_duplicate(theSObject); Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_SObject_i.cxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_SObject_i.cxx,v retrieving revision 1.22 retrieving revision 1.22.2.1 diff -c -u -r1.22 -r1.22.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_SObject_i.cxx 1 Jun 2006 11:15:18 -0000 1.22 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_SObject_i.cxx 16 Oct 2006 13:22:00 -0000 1.22.2.1 @@ -318,7 +318,7 @@ //=========================================================================== // PRIVATE FUNCTIONS //=========================================================================== -CORBA::Long SALOMEDS_SObject_i::GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal) +CORBA::LongLong SALOMEDS_SObject_i::GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal) { #ifdef WIN32 long pid = (long)_getpid(); @@ -327,5 +327,5 @@ #endif isLocal = (strcmp(theHostname, GetHostname().c_str()) == 0 && pid == thePID)?1:0; SALOMEDSImpl_SObject* local_impl = _impl.operator->(); - return ((long)local_impl); + return ((CORBA::LongLong)local_impl); } Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_SObject_i.hxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_SObject_i.hxx,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -c -u -r1.15 -r1.15.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_SObject_i.hxx 1 Jun 2006 11:15:18 -0000 1.15 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_SObject_i.hxx 16 Oct 2006 13:22:00 -0000 1.15.2.1 @@ -76,7 +76,7 @@ virtual CORBA::Short Tag(); virtual CORBA::Short Depth(); - virtual CORBA::Long GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal); + virtual CORBA::LongLong GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal); }; #endif Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_Study.cxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_Study.cxx,v retrieving revision 1.7.2.3 retrieving revision 1.7.2.5 diff -c -u -r1.7.2.3 -r1.7.2.5 --- KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_Study.cxx 24 Aug 2006 12:16:55 -0000 1.7.2.3 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_Study.cxx 16 Oct 2006 13:22:00 -0000 1.7.2.5 @@ -83,7 +83,9 @@ long pid = (long)getpid(); #endif - long addr = theStudy->GetLocalImpl(GetHostname().c_str(), pid, _isLocal); + CORBA::LongLong addr = // mpv: fix for IPAL13534: for 64 bit platform use 8-bytes long for pointer storage + theStudy->GetLocalImpl(GetHostname().c_str(), pid, _isLocal); + if(_isLocal) { _local_impl = ((SALOMEDSImpl_Study*)(addr)); _corba_impl = SALOMEDS::Study::_duplicate(theStudy); Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_StudyManager.cxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_StudyManager.cxx,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -c -u -r1.5 -r1.5.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_StudyManager.cxx 1 Jun 2006 11:15:18 -0000 1.5 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_StudyManager.cxx 16 Oct 2006 13:22:00 -0000 1.5.2.1 @@ -61,7 +61,7 @@ long pid = (long)getpid(); #endif - long addr = theManager->GetLocalImpl(GetHostname().c_str(), pid, _isLocal); + CORBA::LongLong addr = theManager->GetLocalImpl(GetHostname().c_str(), pid, _isLocal); if(_isLocal) { _local_impl = ((SALOMEDSImpl_StudyManager*)(addr)); _corba_impl = SALOMEDS::StudyManager::_duplicate(theManager); @@ -89,7 +89,7 @@ long pid = (long)getpid(); #endif - long addr = theManager->GetLocalImpl(GetHostname().c_str(), pid, _isLocal); + CORBA::LongLong addr = theManager->GetLocalImpl(GetHostname().c_str(), pid, _isLocal); if(_isLocal) { _local_impl = ((SALOMEDSImpl_StudyManager*)(addr)); _corba_impl = SALOMEDS::StudyManager::_duplicate(theManager); Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -c -u -r1.18 -r1.18.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx 1 Jun 2006 11:15:18 -0000 1.18 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx 16 Oct 2006 13:22:00 -0000 1.18.2.1 @@ -456,7 +456,7 @@ //=========================================================================== // PRIVATE FUNCTIONS //=========================================================================== -CORBA::Long SALOMEDS_StudyManager_i::GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal) +CORBA::LongLong SALOMEDS_StudyManager_i::GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal) { #ifdef WIN32 long pid = (long)_getpid(); @@ -465,7 +465,7 @@ #endif isLocal = (strcmp(theHostname, GetHostname().c_str()) == 0 && pid == thePID)?1:0; SALOMEDSImpl_StudyManager* aManager = _impl.operator->(); - return ((long)aManager); + return ((CORBA::LongLong)aManager); } //=========================================================================== Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -c -u -r1.10 -r1.10.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx 1 Jun 2006 11:15:18 -0000 1.10 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx 16 Oct 2006 13:22:00 -0000 1.10.2.1 @@ -142,7 +142,7 @@ void ping(){}; - virtual CORBA::Long GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal); + virtual CORBA::LongLong GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal); static PortableServer::POA_ptr GetPOA(const SALOMEDS::Study_ptr theStudy); }; Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_Study_i.cxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_Study_i.cxx,v retrieving revision 1.13.2.3 retrieving revision 1.13.2.4 diff -c -u -r1.13.2.3 -r1.13.2.4 --- KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_Study_i.cxx 23 Aug 2006 14:13:08 -0000 1.13.2.3 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_Study_i.cxx 16 Oct 2006 13:22:00 -0000 1.13.2.4 @@ -883,7 +883,7 @@ //=========================================================================== // PRIVATE FUNCTIONS //=========================================================================== -CORBA::Long SALOMEDS_Study_i::GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal) +CORBA::LongLong SALOMEDS_Study_i::GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal) { #ifdef WIN32 long pid = (long)_getpid(); @@ -892,5 +892,5 @@ #endif isLocal = (strcmp(theHostname, GetHostname().c_str()) == 0 && pid == thePID)?1:0; SALOMEDSImpl_Study* local_impl = _impl.operator->(); - return ((long)local_impl); + return ((CORBA::LongLong)local_impl); } Index: KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_Study_i.hxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_Study_i.hxx,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.4 diff -c -u -r1.11.2.2 -r1.11.2.4 --- KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_Study_i.hxx 23 Aug 2006 14:13:08 -0000 1.11.2.2 +++ KERNEL_SRC_3.2.2/src/SALOMEDS/SALOMEDS_Study_i.hxx 16 Oct 2006 13:22:00 -0000 1.11.2.4 @@ -247,7 +247,7 @@ virtual SALOMEDS::Study::ListOfSObject* FindDependances(SALOMEDS::SObject_ptr anObject); - virtual SALOMEDS::AttributeStudyProperties_ptr SALOMEDS_Study_i::GetProperties(); + virtual SALOMEDS::AttributeStudyProperties_ptr GetProperties(); virtual char* GetLastModificationDate(); @@ -298,6 +298,6 @@ virtual Handle(SALOMEDSImpl_Study) GetImpl() { return _impl; } - virtual CORBA::Long GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal); + virtual CORBA::LongLong GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal); }; #endif Index: KERNEL_SRC_3.2.2/src/SALOMEDSClient/Makefile.am =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDSClient/Makefile.am,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -c -u -r1.5 -r1.5.4.1 --- KERNEL_SRC_3.2.2/src/SALOMEDSClient/Makefile.am 1 Jun 2006 11:15:19 -0000 1.5 +++ KERNEL_SRC_3.2.2/src/SALOMEDSClient/Makefile.am 17 Oct 2006 10:29:43 -0000 1.5.4.1 @@ -55,6 +55,7 @@ SALOMEDSClient_AttributeTreeNode.hxx \ SALOMEDSClient_AttributeUserID.hxx \ SALOMEDSClient_AttributeParameter.hxx \ + SALOMEDSClient_AttributeString.hxx \ SALOMEDSClient_ChildIterator.hxx \ SALOMEDSClient_GenericAttribute.hxx \ SALOMEDSClient_SComponent.hxx \ Index: KERNEL_SRC_3.2.2/src/SALOMEDSClient/SALOMEDSClient.hxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDSClient/SALOMEDSClient.hxx,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -c -u -r1.5 -r1.5.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDSClient/SALOMEDSClient.hxx 1 Jun 2006 11:15:19 -0000 1.5 +++ KERNEL_SRC_3.2.2/src/SALOMEDSClient/SALOMEDSClient.hxx 17 Oct 2006 10:29:43 -0000 1.5.2.1 @@ -50,6 +50,7 @@ #include "SALOMEDSClient_AttributeTreeNode.hxx" #include "SALOMEDSClient_AttributeUserID.hxx" #include "SALOMEDSClient_AttributeParameter.hxx" +#include "SALOMEDSClient_AttributeString.hxx" #include "SALOMEDSClient_ChildIterator.hxx" #include "SALOMEDSClient_GenericAttribute.hxx" #include "SALOMEDSClient_SComponent.hxx" Index: KERNEL_SRC_3.2.2/src/SALOMEDSClient/SALOMEDSClient_AttributeString.hxx =================================================================== RCS file: KERNEL_SRC_3.2.2/src/SALOMEDSClient/SALOMEDSClient_AttributeString.hxx diff -N KERNEL_SRC_3.2.2/src/SALOMEDSClient/SALOMEDSClient_AttributeString.hxx --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ KERNEL_SRC_3.2.2/src/SALOMEDSClient/SALOMEDSClient_AttributeString.hxx 17 Oct 2006 10:49:09 -0000 1.1.2.1 @@ -0,0 +1,38 @@ +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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. +// +// This library is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SALOMEDSClient_AttributeString.hxx +// Author : Sergey RUIN +// Module : SALOME + +#ifndef SALOMEDSClient_AttributeString_HeaderFile +#define SALOMEDSClient_AttributeString_HeaderFile + +#include "SALOMEDSClient_definitions.hxx" +#include "SALOMEDSClient_GenericAttribute.hxx" +#include + +class SALOMEDSClient_AttributeString: public virtual SALOMEDSClient_GenericAttribute +{ +public: + virtual std::string Value() = 0; + virtual void SetValue(const std::string& value) = 0; +}; + +#endif Index: KERNEL_SRC_3.2.2/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -c -u -r1.4 -r1.4.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx 1 Jun 2006 11:15:19 -0000 1.4 +++ KERNEL_SRC_3.2.2/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx 26 Sep 2006 08:13:44 -0000 1.4.2.1 @@ -30,7 +30,7 @@ template explicit clt_shared_ptr(Y * p) { - reset(p); + boost::shared_ptr::reset(p); } template Index: KERNEL_SRC_3.2.2/src/SALOMEDSImpl/Makefile.am =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDSImpl/Makefile.am,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -c -u -r1.4 -r1.4.4.1 --- KERNEL_SRC_3.2.2/src/SALOMEDSImpl/Makefile.am 1 Jun 2006 11:15:19 -0000 1.4 +++ KERNEL_SRC_3.2.2/src/SALOMEDSImpl/Makefile.am 17 Oct 2006 10:30:19 -0000 1.4.4.1 @@ -66,6 +66,7 @@ SALOMEDSImpl_AttributeComment.hxx \ SALOMEDSImpl_AttributeReference.hxx \ SALOMEDSImpl_AttributeParameter.hxx \ + SALOMEDSImpl_AttributeString.hxx \ SALOMEDSImpl_UseCaseBuilder.hxx \ SALOMEDSImpl_UseCaseIterator.hxx \ SALOMEDSImpl_SComponentIterator.hxx \ @@ -147,6 +148,7 @@ SALOMEDSImpl_AttributeComment.cxx \ SALOMEDSImpl_AttributeReference.cxx \ SALOMEDSImpl_AttributeParameter.cxx \ + SALOMEDSImpl_AttributeString.cxx \ SALOMEDSImpl_ChildNodeIterator.cxx \ SALOMEDSImpl_UseCaseBuilder.cxx \ SALOMEDSImpl_UseCaseIterator.cxx \ @@ -187,6 +189,8 @@ SALOMEDSImpl_AttributeTextHighlightColor.hxx \ SALOMEDSImpl_AttributeTreeNode.hxx \ SALOMEDSImpl_AttributeUserID.hxx \ + SALOMEDSImpl_AttributeParameter.hxx \ + SALOMEDSImpl_AttributeString.hxx \ SALOMEDSImpl_Callback.hxx \ SALOMEDSImpl_ChildIterator.hxx \ SALOMEDSImpl_ChildNodeIterator.hxx \ Index: KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeExpandable.cxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeExpandable.cxx,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -c -u -r1.5 -r1.5.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeExpandable.cxx 1 Jun 2006 11:15:19 -0000 1.5 +++ KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeExpandable.cxx 12 Oct 2006 14:24:09 -0000 1.5.2.1 @@ -67,7 +67,7 @@ SALOMEDSImpl_AttributeExpandable::SALOMEDSImpl_AttributeExpandable() :SALOMEDSImpl_GenericAttribute("AttributeExpandable") { - myValue = 0; + myValue = 1; } //======================================================================= Index: KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSelectable.cxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSelectable.cxx,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -c -u -r1.4 -r1.4.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSelectable.cxx 1 Jun 2006 11:15:19 -0000 1.4 +++ KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSelectable.cxx 12 Oct 2006 14:24:09 -0000 1.4.2.1 @@ -68,7 +68,7 @@ SALOMEDSImpl_AttributeSelectable::SALOMEDSImpl_AttributeSelectable() :SALOMEDSImpl_GenericAttribute("AttributeSelectable") { - myValue = 0; + myValue = 1; } //======================================================================= Index: KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeString.cxx =================================================================== RCS file: KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeString.cxx diff -N KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeString.cxx --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeString.cxx 17 Oct 2006 10:31:09 -0000 1.1.2.1 @@ -0,0 +1,108 @@ +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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. +// +// This library is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SALOMEDSImpl_AttributeString.cxx +// Author : Sergey RUIN +// Module : SALOME + +#include "SALOMEDSImpl_AttributeString.hxx" + +#ifndef WNT +using namespace std; +#endif + +IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeString, SALOMEDSImpl_GenericAttribute ) +IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeString, SALOMEDSImpl_GenericAttribute ) + +//======================================================================= +//function : GetID +//purpose : +//======================================================================= +const Standard_GUID& SALOMEDSImpl_AttributeString::GetID () +{ + static Standard_GUID CommentID ("1808A12F-AD0E-4a6a-B58A-395DCF469FE9"); + return CommentID; +} + +Handle(SALOMEDSImpl_AttributeString) SALOMEDSImpl_AttributeString::Set (const TDF_Label& L, + const TCollection_ExtendedString& Val) +{ + Handle(SALOMEDSImpl_AttributeString) A; + if (!L.FindAttribute(SALOMEDSImpl_AttributeString::GetID(), A)) { + A = new SALOMEDSImpl_AttributeString(); + L.AddAttribute(A); + } + + A->SetValue(Val); + + return A; +} + +//======================================================================= +//function : SetValue +//purpose : +//======================================================================= +void SALOMEDSImpl_AttributeString::SetValue (const TCollection_ExtendedString& S) +{ + CheckLocked(); + + if(myString == S) return; + + Backup(); + + myString = S; + + SetModifyFlag(); //SRN: Mark the study as being modified, so it could be saved +} + + +//======================================================================= +//function : ID +//purpose : +//======================================================================= +const Standard_GUID& SALOMEDSImpl_AttributeString::ID () const { return GetID(); } + +//======================================================================= +//function : NewEmpty +//purpose : +//======================================================================= +Handle(TDF_Attribute) SALOMEDSImpl_AttributeString::NewEmpty () const +{ + return new SALOMEDSImpl_AttributeString(); +} + +//======================================================================= +//function : Restore +//purpose : +//======================================================================= +void SALOMEDSImpl_AttributeString::Restore(const Handle(TDF_Attribute)& with) +{ + myString = Handle(SALOMEDSImpl_AttributeString)::DownCast (with)->Value (); +} + +//======================================================================= +//function : Paste +//purpose : +//======================================================================= + +void SALOMEDSImpl_AttributeString::Paste (const Handle(TDF_Attribute)& into, + const Handle(TDF_RelocationTable)& RT) const +{ + Handle(SALOMEDSImpl_AttributeString)::DownCast (into)->SetValue(myString); +} Index: KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeString.hxx =================================================================== RCS file: KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeString.hxx diff -N KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeString.hxx --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeString.hxx 17 Oct 2006 10:31:09 -0000 1.1.2.1 @@ -0,0 +1,70 @@ +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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. +// +// This library is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SALOMEDSImpl_AttributeIOR.hxx +// Author : Sergey RUIN +// Module : SALOME + +#ifndef _SALOMEDSImpl_AttributeString_HeaderFile +#define _SALOMEDSImpl_AttributeString_HeaderFile + +#include +#include +#include +#include +#include +#include +#include "SALOMEDSImpl_GenericAttribute.hxx" + +class Handle(TDF_Attribute); +class Handle(TDF_RelocationTable); + +DEFINE_STANDARD_HANDLE( SALOMEDSImpl_AttributeString, SALOMEDSImpl_GenericAttribute ) + +class SALOMEDSImpl_AttributeString : public SALOMEDSImpl_GenericAttribute +{ +private: + + TCollection_ExtendedString myString; + +public: + +Standard_EXPORT static const Standard_GUID& GetID() ; + +Standard_EXPORT SALOMEDSImpl_AttributeString() :SALOMEDSImpl_GenericAttribute("AttributeString") {} + +Standard_EXPORT static Handle(SALOMEDSImpl_AttributeString) Set(const TDF_Label& L, const TCollection_ExtendedString& Val); +Standard_EXPORT void SetValue (const TCollection_ExtendedString& S); +Standard_EXPORT TCollection_ExtendedString Value() const { return myString; } + +Standard_EXPORT virtual TCollection_AsciiString Save() { return myString; } +Standard_EXPORT virtual void Load(const TCollection_AsciiString& theValue) { myString = theValue; } + +Standard_EXPORT const Standard_GUID& ID() const; +Standard_EXPORT void Restore(const Handle(TDF_Attribute)& with) ; +Standard_EXPORT Handle_TDF_Attribute NewEmpty() const; +Standard_EXPORT void Paste(const Handle(TDF_Attribute)& into,const Handle(TDF_RelocationTable)& RT) const; + +Standard_EXPORT ~SALOMEDSImpl_AttributeString() {} + +public: + DEFINE_STANDARD_RTTI( SALOMEDSImpl_AttributeString ) +}; + +#endif Index: KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.hxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.hxx,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -c -u -r1.4 -r1.4.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.hxx 1 Jun 2006 11:15:19 -0000 1.4 +++ KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.hxx 26 Sep 2006 08:12:40 -0000 1.4.2.1 @@ -52,9 +52,9 @@ Standard_EXPORT static const Standard_GUID& GetID() ; Standard_EXPORT static Handle_SALOMEDSImpl_AttributeTarget Set(const TDF_Label& label) ; Standard_EXPORT SALOMEDSImpl_AttributeTarget(); -Standard_EXPORT void SALOMEDSImpl_AttributeTarget::Add(const Handle(SALOMEDSImpl_SObject)& theSO); -Standard_EXPORT Handle(TColStd_HSequenceOfTransient) SALOMEDSImpl_AttributeTarget::Get(); -Standard_EXPORT void SALOMEDSImpl_AttributeTarget::Remove(const Handle(SALOMEDSImpl_SObject)& theSO); +Standard_EXPORT void Add(const Handle(SALOMEDSImpl_SObject)& theSO); +Standard_EXPORT Handle(TColStd_HSequenceOfTransient) Get(); +Standard_EXPORT void Remove(const Handle(SALOMEDSImpl_SObject)& theSO); Standard_EXPORT TCollection_ExtendedString GetRelation() { return myRelation; } Standard_EXPORT void SetRelation(const TCollection_ExtendedString& theRelation); Standard_EXPORT TDF_AttributeList& GetVariables() { return myVariables; } Index: KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTextColor.cxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTextColor.cxx,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -c -u -r1.4 -r1.4.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTextColor.cxx 1 Jun 2006 11:15:19 -0000 1.4 +++ KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTextColor.cxx 12 Oct 2006 14:24:09 -0000 1.4.2.1 @@ -49,7 +49,7 @@ SALOMEDSImpl_AttributeTextColor::SALOMEDSImpl_AttributeTextColor() :SALOMEDSImpl_GenericAttribute("AttributeTextColor") { - myValue = new TColStd_HArray1OfReal(1, 3, RealFirst()); + myValue = new TColStd_HArray1OfReal(1, 3, 0.); } //======================================================================= Index: KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTextHighlightColor.cxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTextHighlightColor.cxx,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -c -u -r1.4 -r1.4.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTextHighlightColor.cxx 1 Jun 2006 11:15:19 -0000 1.4 +++ KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTextHighlightColor.cxx 12 Oct 2006 14:24:09 -0000 1.4.2.1 @@ -50,7 +50,7 @@ SALOMEDSImpl_AttributeTextHighlightColor::SALOMEDSImpl_AttributeTextHighlightColor() :SALOMEDSImpl_GenericAttribute("AttributeTextHighlightColor") { - myValue = new TColStd_HArray1OfReal(1, 3, RealFirst()); + myValue = new TColStd_HArray1OfReal(1, 3, 0.); } //======================================================================= Index: KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_Attributes.hxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_Attributes.hxx,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -c -u -r1.5 -r1.5.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_Attributes.hxx 1 Jun 2006 11:15:19 -0000 1.5 +++ KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_Attributes.hxx 17 Oct 2006 10:30:19 -0000 1.5.2.1 @@ -64,6 +64,7 @@ #include "SALOMEDSImpl_AttributeFlags.hxx" #include "SALOMEDSImpl_AttributeGraphic.hxx" #include "SALOMEDSImpl_AttributeParameter.hxx" +#include "SALOMEDSImpl_AttributeString.hxx" #define __AttributeTypeToGUIDForSObject \ @@ -95,7 +96,8 @@ if(theType == "AttributeFlags") return SALOMEDSImpl_AttributeFlags::GetID(); \ if(theType == "AttributeGraphic") return SALOMEDSImpl_AttributeGraphic::GetID(); \ if(theType == "AttributeReference") return SALOMEDSImpl_AttributeReference::GetID(); \ - if(theType == "AttributeParameter") return SALOMEDSImpl_AttributeParameter::GetID(); + if(theType == "AttributeParameter") return SALOMEDSImpl_AttributeParameter::GetID(); \ + if(theType == "AttributeString") return SALOMEDSImpl_AttributeString::GetID(); #define __FindOrCreateAttributeLocked(ClassName) if (strcmp(aTypeOfAttribute.ToCString(), #ClassName) == 0) { \ @@ -132,6 +134,7 @@ __FindOrCreateAttributeLocked(AttributeTableOfString) \ __FindOrCreateAttributeLocked(AttributePythonObject) \ __FindOrCreateAttributeLocked(AttributeParameter) \ +__FindOrCreateAttributeLocked(AttributeString) \ __FindOrCreateAttribute(AttributePersistentRef) \ __FindOrCreateAttribute(AttributeDrawable) \ __FindOrCreateAttribute(AttributeSelectable) \ Index: KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.hxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.hxx,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -c -u -r1.3 -r1.3.4.1 --- KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.hxx 1 Jun 2006 11:15:19 -0000 1.3 +++ KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.hxx 26 Sep 2006 08:12:40 -0000 1.3.4.1 @@ -76,12 +76,12 @@ /*! Returns all parameter names of the given entry */ - virtual std::vector SALOMEDSImpl_IParameters::getAllParameterNames(const std::string& entry); + virtual std::vector getAllParameterNames(const std::string& entry); /*! Returns all parameter values of the given entry */ - virtual std::vector SALOMEDSImpl_IParameters::getAllParameterValues(const std::string& entry); + virtual std::vector getAllParameterValues(const std::string& entry); /*! Returns a number of parameters of the given entry Index: KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx,v retrieving revision 1.7.2.6 retrieving revision 1.7.2.7 diff -c -u -r1.7.2.6 -r1.7.2.7 --- KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx 23 Aug 2006 14:13:37 -0000 1.7.2.6 +++ KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx 27 Sep 2006 11:21:40 -0000 1.7.2.7 @@ -1361,7 +1361,7 @@ if(aDriver == NULL) continue; - bool isValidScript; + bool isValidScript = false; long aStreamLength = 0; Handle(SALOMEDSImpl_TMPFile) aStream = aDriver->DumpPython(this, isPublished, isValidScript, aStreamLength); if ( !isValidScript ) Index: KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -c -u -r1.5.2.2 -r1.5.2.3 --- KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx 23 Aug 2006 14:13:37 -0000 1.5.2.2 +++ KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx 26 Sep 2006 08:12:40 -0000 1.5.2.3 @@ -219,7 +219,7 @@ Standard_EXPORT virtual Handle(TColStd_HSequenceOfTransient) FindDependances(const Handle(SALOMEDSImpl_SObject)& anObject); - Standard_EXPORT virtual Handle(SALOMEDSImpl_AttributeStudyProperties) SALOMEDSImpl_Study::GetProperties(); + Standard_EXPORT virtual Handle(SALOMEDSImpl_AttributeStudyProperties) GetProperties(); Standard_EXPORT virtual TCollection_AsciiString GetLastModificationDate(); Index: KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx =================================================================== RCS file: /home/server/cvs/KERNEL/KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -c -u -r1.7 -r1.7.2.1 --- KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx 1 Jun 2006 11:15:19 -0000 1.7 +++ KERNEL_SRC_3.2.2/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx 17 Oct 2006 11:31:54 -0000 1.7.2.1 @@ -503,7 +503,7 @@ if (aLocked) aStudy->GetProperties()->SetLocked(false); Handle(SALOMEDSImpl_StudyBuilder) SB= aStudy->NewBuilder(); - map aMapTypeDriver; + map aMapTypeDriver; // IPAL13339 if(aStudy.IsNull()) { _errorCode = "Study is null";