From 7a8c8a266c74690ca0ecb1a593b74d3066dfb18f Mon Sep 17 00:00:00 2001 From: jfa Date: Sat, 6 May 2006 08:53:15 +0000 Subject: [PATCH] Join modifications from branch OCC_debug_for_3_2_0b1 --- INSTALL | 6 +- Makefile.in | 20 +++ adm_local/Makefile.in | 19 +++ adm_local/unix/make_commence.in | 19 ++- bin/VERSION | 2 +- build_configure | 4 +- doc/Makefile.in | 19 +++ doc/salome/Makefile.in | 19 +++ doc/salome/tui/Makefile.in | 16 ++ doc/salome/tui/SUPERV/doxyfile | 120 +++++++++----- doc/salome/tui/SUPERV/sources/footer.html | 5 + doc/salome/tui/SUPERV/sources/myheader.html | 12 -- .../tui/SUPERV/sources/static/doxygen.css | 153 ++++++++++++++++-- doc/salome/tui/SUPERV/sources/static/tree.js | 2 +- resources/SUPERVCatalog.xml | 2 +- resources/SalomeApp.xml | 11 ++ src/GraphBase/DataFlowBase_ComputingNode.cxx | 12 +- src/GraphBase/DataFlowBase_Graph.cxx | 4 +- src/GraphBase/DataFlowBase_Port.cxx | 2 +- src/GraphBase/DataFlowBase_Port.hxx | 2 +- src/GraphBase/DataFlowBase_StreamGraph.cxx | 8 +- src/GraphBase/DataFlowBase_StreamGraph.hxx | 8 +- src/GraphBase/DataFlowBase_XmlHandler.cxx | 7 +- src/GraphEditor/DataFlowEditor_DataFlow.hxx | 2 +- src/GraphEditor/DataFlowEditor_DataFlow.lxx | 7 +- src/GraphEditor/DataFlowEditor_OutNode.cxx | 2 +- src/GraphEditor/DataFlowEditor_OutNode.hxx | 2 +- .../DataFlowExecutor_PyDynInvoke.cxx | 120 +++++++++----- src/GraphExecutor/Makefile.in | 19 +++ src/SUPERVGUI/SUPERVGUI.cxx | 39 ++++- src/SUPERVGUI/SUPERVGUI.h | 7 + src/SUPERVGUI/SUPERVGUI_BrowseNodeDlg.cxx | 30 +++- src/SUPERVGUI/SUPERVGUI_CanvasLink.cxx | 4 +- src/SUPERVGUI/SUPERVGUI_DataModel.cxx | 4 +- src/SUPERVGUI/SUPERVGUI_Information.cxx | 11 +- src/SUPERVGUI/SUPERVGUI_Main.cxx | 36 ++++- src/SUPERVGUI/SUPERVGUI_Main.h | 5 + src/SUPERVGUI/SUPERVGUI_Notification.cxx | 9 +- src/SUPERVGUI/SUPERVGUI_Service.cxx | 10 +- src/SUPERVGUI/SUPERVGUI_Service.h | 4 +- src/SUPERVGUI/SUPERV_msg_en.po | 8 +- src/Supervision/CNode_Impl.cxx | 30 ++-- src/Supervision/CNode_Impl.hxx | 18 +-- src/Supervision/Graph_Impl.cxx | 36 ++--- src/Supervision/Graph_Impl.hxx | 20 +-- src/Supervision/Link_Impl.cxx | 20 +-- src/Supervision/Link_Impl.hxx | 18 +-- src/Supervision/SUPERV_shared_modules.py | 19 +++ src/Supervision/StreamGraph_Impl.cxx | 18 +-- src/Supervision/StreamGraph_Impl.hxx | 12 +- src/Supervision/StreamPort_Impl.cxx | 6 +- src/Supervision/StreamPort_Impl.hxx | 4 +- 52 files changed, 730 insertions(+), 262 deletions(-) create mode 100755 doc/salome/tui/SUPERV/sources/footer.html create mode 100644 resources/SalomeApp.xml diff --git a/INSTALL b/INSTALL index e004a3c..7775821 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -This is the version 3.2.0a2 of SUPERV +This is the version 3.2.0b1 of SUPERV Compatible with : - - KERNEL 3.2.0a2 - - SALOMEGUI 3.2.0a2 + - KERNEL 3.2.0b1 + - SALOMEGUI 3.2.0b1 diff --git a/Makefile.in b/Makefile.in index 613445c..b79c130 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,3 +1,22 @@ +# 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/ +# # -* Makefile *- # # Author : Patrick GOLDBRONN (CEA) @@ -32,6 +51,7 @@ SUPERV_en.xml \ SUPERV_fr.xml \ SUPERV.config \ SUPERVCatalog.xml \ +SalomeApp.xml \ suspend-resume.gif \ Superv_tree_superv.png diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in index 9b5e810..734bc82 100644 --- a/adm_local/Makefile.in +++ b/adm_local/Makefile.in @@ -1,3 +1,22 @@ +# 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/ +# # source path top_srcdir=@top_srcdir@ top_builddir=.. diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 6c4587d..cbea167 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -177,6 +177,8 @@ LIBS+=$(CORBA_LIBS) LIBSFORBIN+=$(CORBA_LIBS) DOXYGEN = @DOXYGEN@ +DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@ +DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@ ## Shared libraries LT_STATIC_EXEC=@LT_STATIC_EXEC@ @@ -236,7 +238,13 @@ all: Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in cd $(top_builddir) ; ./config.status -$(top_builddir)/config.status: $(top_srcdir)/configure +LOCAL_MAKE = make_commence make_omniorb + +KERNEL_MAKE = make_module make_conclude depend SALOMEconfig.h F77config.h sstream envScript + +$(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ + $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) cd $(top_builddir) ; ./config.status --recheck # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) @@ -251,7 +259,7 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base cd $(top_srcdir) && ./build_configure -ACLOCAL_SRC = \ +ACLOCAL_KERNEL = \ ac_cxx_bool.m4 check_corba.m4 \ ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ @@ -264,7 +272,8 @@ ACLOCAL_GUI = \ check_vtk.m4 check_opengl.m4 check_qt.m4 \ check_GUI.m4 check_corba_in_GUI.m4 -$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ +$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) - cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \ - -I @GUI_ROOT_DIR@/adm_local/unix/config_files + cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files \ + -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \ + -I @GUI_ROOT_DIR@/adm_local/unix/config_files diff --git a/bin/VERSION b/bin/VERSION index 7f76220..29eafc1 100755 --- a/bin/VERSION +++ b/bin/VERSION @@ -1 +1 @@ -THIS IS SALOME - SUPERV VERSION: 3.2.0a2 +THIS IS SALOME - SUPERV VERSION: 3.2.0b1 diff --git a/build_configure b/build_configure index 71e3063..9590506 100755 --- a/build_configure +++ b/build_configure @@ -133,9 +133,9 @@ echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 -echo " ./adm_local/unix/make_omniorb \\" >> configure.in_tmp1 +echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 -echo " ./adm_local/unix/make_commence \\" >> configure.in_tmp1 +echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 diff --git a/doc/Makefile.in b/doc/Makefile.in index 7295ede..59e6c59 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,3 +1,22 @@ +# 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/ +# # -* Makefile *- # diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in index 1fbba94..c86250e 100644 --- a/doc/salome/Makefile.in +++ b/doc/salome/Makefile.in @@ -1,3 +1,22 @@ +# 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/ +# # -* Makefile *- # diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.in index c81ebd8..cff3021 100644 --- a/doc/salome/tui/Makefile.in +++ b/doc/salome/tui/Makefile.in @@ -20,6 +20,22 @@ docs: cp -fr $(srcdir)/SUPERV ./INPUT; \ cd INPUT; \ sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \ + sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \ + sed "s|version|`cut -d: -f2 $(root_srcdir)/bin/VERSION`|" ./doxyfile2 > ./doxyfile3; \ + mv -f doxyfile3 doxyfile1; \ + echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \ + if( test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \ + sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \ + mv -f doxyfile2 doxyfile1; \ + $(doxygen) -u ./doxyfile1; \ + else \ + sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \ + mv -f doxyfile2 doxyfile1; \ + fi; \ + if( test "x@DOXYGEN_WITH_STL@" = "xyes"); then \ + sed -e 's|BUILTIN_STL_SUPPORT = NO|BUILTIN_STL_SUPPORT = YES|' ./doxyfile1 > ./doxyfile2; \ + mv -f doxyfile2 doxyfile1; \ + fi; \ mv -f doxyfile1 doxyfile; \ $(doxygen) ./doxyfile; \ cd ..; \ diff --git a/doc/salome/tui/SUPERV/doxyfile b/doc/salome/tui/SUPERV/doxyfile index d3d870f..1ff5f65 100755 --- a/doc/salome/tui/SUPERV/doxyfile +++ b/doc/salome/tui/SUPERV/doxyfile @@ -1,64 +1,86 @@ -# Doxyfile 1.3-rc1 +# Doxyfile 1.4.6 #--------------------------------------------------------------------------- -# General configuration options +# Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME - SUPERV - v.3.2.0a2" -PROJECT_NUMBER = id#1.0 +PROJECT_NAME = "SALOME - SUPERV - v.version" +PROJECT_NUMBER = OUTPUT_DIRECTORY = ../ +CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English +USE_WINDOWS_ENCODING = NO +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = NO +ABBREVIATE_BRIEF = +ALWAYS_DETAILED_SEC = YES +INLINE_INHERITED_MEMB = YES +FULL_PATH_NAMES = YES +STRIP_FROM_PATH = ../../../share/salome \ + ../../../build/salome +STRIP_FROM_INC_PATH = +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = YES +MULTILINE_CPP_IS_BRIEF = NO +DETAILS_AT_TOP = NO +INHERIT_DOCS = YES +SEPARATE_MEMBER_PAGES = NO +TAB_SIZE = 5 +ALIASES = +OPTIMIZE_OUTPUT_FOR_C = YES +OPTIMIZE_OUTPUT_JAVA = YES +BUILTIN_STL_SUPPORT = NO +DISTRIBUTE_GROUP_DOC = NO +SUBGROUPING = YES + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- EXTRACT_ALL = YES EXTRACT_PRIVATE = YES EXTRACT_STATIC = YES EXTRACT_LOCAL_CLASSES = YES +EXTRACT_LOCAL_METHODS = NO HIDE_UNDOC_MEMBERS = NO HIDE_UNDOC_CLASSES = NO HIDE_FRIEND_COMPOUNDS = NO HIDE_IN_BODY_DOCS = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = NO -ALWAYS_DETAILED_SEC = YES -INLINE_INHERITED_MEMB = YES -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = INTERNAL_DOCS = YES CASE_SENSE_NAMES = YES -SHORT_NAMES = NO HIDE_SCOPE_NAMES = NO -VERBATIM_HEADERS = YES SHOW_INCLUDE_FILES = YES -JAVADOC_AUTOBRIEF = YES -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES INLINE_INFO = YES SORT_MEMBER_DOCS = NO -DISTRIBUTE_GROUP_DOC = NO -TAB_SIZE = 5 +SORT_BRIEF_DOCS = NO +SORT_BY_SCOPE_NAME = NO GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES GENERATE_DEPRECATEDLIST= YES -ALIASES = ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 25 -OPTIMIZE_OUTPUT_FOR_C = YES -OPTIMIZE_OUTPUT_JAVA = YES SHOW_USED_FILES = NO +SHOW_DIRECTORIES = NO +FILE_VERSION_FILTER = + #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- QUIET = NO WARNINGS = YES WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_NO_PARAMDOC = NO WARN_FORMAT = "$file:$line: $text" WARN_LOGFILE = log.txt + #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ../../../share/salome/idl/SUPERV.idl -FILE_PATTERNS = -RECURSIVE = NO +INPUT = ../../../share/salome/src \ + ../../../share/salome/idl \ + ../../../build/salome/bin +FILE_PATTERNS = *.hxx *.cxx *.h *.c *.hh *.cc *.idl python_extension_must_be_here +RECURSIVE = YES EXCLUDE = EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = @@ -67,7 +89,9 @@ EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO IMAGE_PATH = sources/ INPUT_FILTER = +FILTER_PATTERNS = FILTER_SOURCE_FILES = YES + #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- @@ -76,12 +100,16 @@ INLINE_SOURCES = NO STRIP_CODE_COMMENTS = YES REFERENCED_BY_RELATION = NO REFERENCES_RELATION = YES +USE_HTAGS = NO +VERBATIM_HEADERS = YES + #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = NO -COLS_IN_ALPHA_INDEX = 5 +ALPHABETICAL_INDEX = YES +COLS_IN_ALPHA_INDEX = 3 IGNORE_PREFIX = + #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- @@ -89,8 +117,8 @@ GENERATE_HTML = YES HTML_OUTPUT = SUPERV HTML_FILE_EXTENSION = .html HTML_HEADER = sources/myheader.html -HTML_FOOTER = -HTML_STYLESHEET = +HTML_FOOTER = sources/footer.html +HTML_STYLESHEET = sources/static/doxygen.css HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO CHM_FILE = @@ -98,10 +126,11 @@ HHC_LOCATION = GENERATE_CHI = NO BINARY_TOC = YES TOC_EXPAND = YES -DISABLE_INDEX = YES +DISABLE_INDEX = NO ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = YES +GENERATE_TREEVIEW = NO TREEVIEW_WIDTH = 250 + #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- @@ -116,6 +145,8 @@ LATEX_HEADER = PDF_HYPERLINKS = NO USE_PDFLATEX = NO LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO + #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- @@ -125,6 +156,7 @@ COMPACT_RTF = NO RTF_HYPERLINKS = NO RTF_STYLESHEET_FILE = RTF_EXTENSIONS_FILE = + #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- @@ -132,16 +164,21 @@ GENERATE_MAN = NO MAN_OUTPUT = man MAN_EXTENSION = .3 MAN_LINKS = NO + #--------------------------------------------------------------------------- # configuration options related to the XML output #--------------------------------------------------------------------------- GENERATE_XML = NO +XML_OUTPUT = xml XML_SCHEMA = XML_DTD = +XML_PROGRAMLISTING = YES + #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- GENERATE_AUTOGEN_DEF = NO + #--------------------------------------------------------------------------- # configuration options related to the Perl module output #--------------------------------------------------------------------------- @@ -149,11 +186,12 @@ GENERATE_PERLMOD = NO PERLMOD_LATEX = NO PERLMOD_PRETTY = YES PERLMOD_MAKEVAR_PREFIX = + #--------------------------------------------------------------------------- # Configuration options related to the preprocessor #--------------------------------------------------------------------------- ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = YES +MACRO_EXPANSION = NO EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = @@ -161,14 +199,16 @@ INCLUDE_FILE_PATTERNS = PREDEFINED = EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = NO + #--------------------------------------------------------------------------- -# Configuration::addtions related to external references +# Configuration::additions related to external references #--------------------------------------------------------------------------- TAGFILES = GENERATE_TAGFILE = ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = /usr/bin/perl + #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- @@ -177,24 +217,26 @@ HIDE_UNDOC_RELATIONS = NO HAVE_DOT = YES CLASS_GRAPH = YES COLLABORATION_GRAPH = NO +GROUP_GRAPHS = NO +UML_LOOK = NO TEMPLATE_RELATIONS = YES INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = NO +CALL_GRAPH = NO GRAPHICAL_HIERARCHY = YES +DIRECTORY_GRAPH = YES DOT_IMAGE_FORMAT = jpg DOT_PATH = DOTFILE_DIRS = MAX_DOT_GRAPH_WIDTH = 1024 MAX_DOT_GRAPH_HEIGHT = 1200 +MAX_DOT_GRAPH_DEPTH = 0 +DOT_TRANSPARENT = NO +DOT_MULTI_TARGETS = NO GENERATE_LEGEND = NO DOT_CLEANUP = YES + #--------------------------------------------------------------------------- -# Configuration::addtions related to the search engine +# Configuration::additions related to the search engine #--------------------------------------------------------------------------- SEARCHENGINE = NO -CGI_NAME = search.cgi -CGI_URL = -DOC_URL = -DOC_ABSPATH = -BIN_ABSPATH = /usr/local/bin/ -EXT_DOC_PATHS = diff --git a/doc/salome/tui/SUPERV/sources/footer.html b/doc/salome/tui/SUPERV/sources/footer.html new file mode 100755 index 0000000..cb55f39 --- /dev/null +++ b/doc/salome/tui/SUPERV/sources/footer.html @@ -0,0 +1,5 @@ + +
+Generated on $datetime for $projectname by doxygen $doxygenversion
+ + diff --git a/doc/salome/tui/SUPERV/sources/myheader.html b/doc/salome/tui/SUPERV/sources/myheader.html index 83ca543..1dc1ce7 100755 --- a/doc/salome/tui/SUPERV/sources/myheader.html +++ b/doc/salome/tui/SUPERV/sources/myheader.html @@ -8,17 +8,5 @@   -
- - - - - - -
-
-
- - diff --git a/doc/salome/tui/SUPERV/sources/static/doxygen.css b/doc/salome/tui/SUPERV/sources/static/doxygen.css index 0a8e93d..88e613d 100755 --- a/doc/salome/tui/SUPERV/sources/static/doxygen.css +++ b/doc/salome/tui/SUPERV/sources/static/doxygen.css @@ -1,21 +1,139 @@ -H1 { text-align: center; } -CAPTION { font-weight: bold } +H1 { + text-align: center; +} + +CAPTION { + font-weight: bold +} + +/* Link in the top navbar */ A.qindex {} + A.qindexRef {} -A.el { text-decoration: none; font-weight: bold } -A.elRef { font-weight: bold } -A.code { text-decoration: none; font-weight: normal; color: #4444ee } -A.codeRef { font-weight: normal; color: #4444ee } -A:hover { text-decoration: none; background-color: lightblue } -DL.el { margin-left: -1cm } -DIV.fragment { width: 100%; border: none; background-color: #CCCCCC } -DIV.ah { background-color: #CCCCCC; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px } -TD.md { background-color: lightblue; font-weight: bold; } -TD.mdname1 { background-color: lightblue; font-weight: bold; color: #602020; } -TD.mdname { background-color: lightblue; font-weight: bold; color: #602020; width: 600px; } -DIV.groupHeader { margin-left: 16px; margin-top: 12px; margin-bottom: 6px; font-weight: bold } -DIV.groupText { margin-left: 16px; font-style: italic; font-size: smaller } -BODY { background: url(sources/bg_salome.gif) } + +/* Link to any cross-referenced Doxygen element */ +A.el { + text-decoration: none; + font-weight: bold +} + +A.elRef { + font-weight: bold +} + +/* Link to any cross-referenced Doxygen element inside a code section + (ex: header) +*/ +A.code { + text-decoration: none; + font-weight: normal; + color: #4444ee +} + +A.codeRef { + font-weight: normal; + color: #4444ee +} + +A:hover { + text-decoration: none; + background-color: lightblue +} + +DL.el { + margin-left: -1cm +} + +/* A code fragment (ex: header) */ +DIV.fragment { + width: 100%; + border: none; + background-color: #CCCCCC +} + +/* In the alpha list (coumpound index), style of an alphabetical index letter */ +DIV.ah { + background-color: #CCCCCC; + font-weight: bold; + color: #ffffff; + margin-bottom: 3px; + margin-top: 3px +} + +/* Method name (+ type) */ +TD.md { + background-color: lightblue; + font-weight: bold; +} + +/* Method parameter (some of them) */ +TD.mdname1 { + background-color: lightblue; + font-weight: bold; color: #602020; +} + +/* Method parameter (some of them) */ +TD.mdname { + background-color: lightblue; + font-weight: bold; + color: #602020; + width: 600px; +} + +/* Separator between methods group (usually empty, seems not supported by IE) */ +DIV.groupHeader { + margin-left: 16px; + margin-top: 12px; + margin-bottom: 6px; + font-weight: bold +} + +DIV.groupText { + margin-left: 16px; + font-style: italic; + font-size: smaller +} + +BODY { + background: #FFFFFF; +} + +/*div.div-page { + background-color: #FFFFFF; + margin-left: 1em; + margin-right: 1em; + margin-top: 1em; + margin-bottom: 0.1em; + + padding-left: 1em; + padding-right: 1em; + padding-top: 0.5em; + padding-bottom: 0.5em; + + border: 2px solid #0D299A; + border-width: 2px; + border-color: #0D299A; +}*/ + +div.tabs { + text-align: justify; + margin-left : 2px; + margin-right : 2px; + margin-top : 2px; + margin-bottom : 2px + font-weight: bold; + color: #FFFFFF; +} + +DIV.div-footer { + margin-left: 1em; + margin-right: 1em; + margin-bottom: 0.2em; + text-align: right; + font-size: 9pt; +} + +/* In File List, Coumpound List, etc, 1st column of the index */ TD.indexkey { background-color: #CCCCCC; font-weight: bold; @@ -28,6 +146,8 @@ TD.indexkey { margin-top : 2px; margin-bottom : 2px } + +/* In File List, Coumpound List, etc, 2nd column of the index */ TD.indexvalue { background-color: #CCCCCC; font-style: italic; @@ -40,6 +160,7 @@ TD.indexvalue { margin-top : 2px; margin-bottom : 2px } + span.keyword { color: #008000 } span.keywordtype { color: #604020 } span.keywordflow { color: #e08000 } diff --git a/doc/salome/tui/SUPERV/sources/static/tree.js b/doc/salome/tui/SUPERV/sources/static/tree.js index 9420aa4..01df59e 100755 --- a/doc/salome/tui/SUPERV/sources/static/tree.js +++ b/doc/salome/tui/SUPERV/sources/static/tree.js @@ -1,4 +1,4 @@ -foldersTree = gFld("SALOME v.3.2.0a2 ", "", "") +foldersTree = gFld("SALOME v.3.2.0b1 ", "", "") insDoc(foldersTree, gLnk("Main Page", "", "main.html")) aux1 = insFld(foldersTree, gFld("TUI Reference Guide", "")) diff --git a/resources/SUPERVCatalog.xml b/resources/SUPERVCatalog.xml index b206b1e..2d5cf41 100644 --- a/resources/SUPERVCatalog.xml +++ b/resources/SUPERVCatalog.xml @@ -16,7 +16,7 @@ Supervisor SUPERV ARS - 3.2.0a2 + 3.2.0b1 Supervisor component 1 ModuleSupervision.png diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml new file mode 100644 index 0000000..4848fae --- /dev/null +++ b/resources/SalomeApp.xml @@ -0,0 +1,11 @@ + +
+ + + +
+
+ + +
+ diff --git a/src/GraphBase/DataFlowBase_ComputingNode.cxx b/src/GraphBase/DataFlowBase_ComputingNode.cxx index d8c606e..cafe851 100644 --- a/src/GraphBase/DataFlowBase_ComputingNode.cxx +++ b/src/GraphBase/DataFlowBase_ComputingNode.cxx @@ -375,9 +375,9 @@ GraphBase::SNode * GraphBase::ComputingNode::GetInfo() { Info->theName = Name() ; Info->theKind = Kind() ; if ( IsDataStreamNode() ) { - long Timeout ; + CORBA::Long Timeout ; SUPERV::KindOfDataStreamTrace DataStreamTrace ; - double DeltaTime ; + CORBA::Double DeltaTime ; ((GraphBase::StreamGraph * ) this)->StreamParams( Timeout , DataStreamTrace , DeltaTime ) ; Info->theTimeout = Timeout ; Info->theDataStreamTrace = DataStreamTrace ; @@ -1167,9 +1167,9 @@ bool GraphBase::ComputingNode::SaveXML( QDomDocument & Graph , QDomElement & inf kind.appendChild( aField ) ; if ( IsDataStreamNode() && HasDataStream() != 0 ) { - long Timeout ; + CORBA::Long Timeout ; SUPERV::KindOfDataStreamTrace DataStreamTrace ; - double DeltaTime ; + CORBA::Double DeltaTime ; ((GraphBase::StreamGraph * ) this)->StreamParams( Timeout , DataStreamTrace , DeltaTime ) ; QDomElement timeout = Graph.createElement("streamgraph-timeout") ; @@ -1536,9 +1536,9 @@ bool GraphBase::ComputingNode::SavePY( ostream &f , const char * aGraphName , } else if ( IsDataStreamNode() && HasDataStream() != 0 ) { f << " " << Name() << " = StreamGraph( '" << Name() << "' )" << endl ; - long Timeout ; + CORBA::Long Timeout ; SUPERV::KindOfDataStreamTrace DataStreamTrace ; - double DeltaTime ; + CORBA::Double DeltaTime ; ((GraphBase::StreamGraph * ) this)->StreamParams( Timeout , DataStreamTrace , DeltaTime ) ; f << " " << aGraphName << ".SetStreamParams( " << Timeout << " , SUPERV." << DataStreamTrace << " , " << DeltaTime << " )" << endl ; diff --git a/src/GraphBase/DataFlowBase_Graph.cxx b/src/GraphBase/DataFlowBase_Graph.cxx index 7b63c99..e0963cf 100644 --- a/src/GraphBase/DataFlowBase_Graph.cxx +++ b/src/GraphBase/DataFlowBase_Graph.cxx @@ -100,9 +100,9 @@ GraphBase::SNode * GraphBase::Graph::GetInfo() const { Info->theName = Name() ; Info->theKind = Kind() ; if ( IsDataStreamNode() ) { - long Timeout ; + CORBA::Long Timeout ; SUPERV::KindOfDataStreamTrace DataStreamTrace ; - double DeltaTime ; + CORBA::Double DeltaTime ; ((GraphBase::StreamGraph * ) this)->StreamParams( Timeout , DataStreamTrace , DeltaTime ) ; Info->theTimeout = Timeout ; Info->theDataStreamTrace = DataStreamTrace ; diff --git a/src/GraphBase/DataFlowBase_Port.cxx b/src/GraphBase/DataFlowBase_Port.cxx index 7a6e685..9dfed9a 100644 --- a/src/GraphBase/DataFlowBase_Port.cxx +++ b/src/GraphBase/DataFlowBase_Port.cxx @@ -147,7 +147,7 @@ const GraphBase::ListOfCoords * GraphBase::Port::Coords() const { return _list_Coords ; } -bool GraphBase::Port::GetCoord( const int index , long &x , long &y ) const { +bool GraphBase::Port::GetCoord( const int index , CORBA::Long &x , CORBA::Long &y ) const { if ( IsEndSwitch() ) { return false ; } diff --git a/src/GraphBase/DataFlowBase_Port.hxx b/src/GraphBase/DataFlowBase_Port.hxx index 6077468..cfc0c5d 100644 --- a/src/GraphBase/DataFlowBase_Port.hxx +++ b/src/GraphBase/DataFlowBase_Port.hxx @@ -146,7 +146,7 @@ namespace GraphBase { int GetCoord() const ; bool GetCoord( int *x , int *y ) const ; const GraphBase::ListOfCoords * Coords() const ; - bool GetCoord( const int index , long &x , long &y ) const ; + bool GetCoord( const int index , CORBA::Long &x , CORBA::Long &y ) const ; } ; diff --git a/src/GraphBase/DataFlowBase_StreamGraph.cxx b/src/GraphBase/DataFlowBase_StreamGraph.cxx index f142364..176852a 100644 --- a/src/GraphBase/DataFlowBase_StreamGraph.cxx +++ b/src/GraphBase/DataFlowBase_StreamGraph.cxx @@ -84,9 +84,9 @@ GraphBase::StreamGraph::~StreamGraph() { cdebug << "GraphBase::StreamGraph::~StreamGraph" << endl ; } -bool GraphBase::StreamGraph::SetStreamParams( const long Timeout , +bool GraphBase::StreamGraph::SetStreamParams( CORBA::Long Timeout , const SUPERV::KindOfDataStreamTrace DataStreamTrace , - const double DeltaTime ) { + CORBA::Double DeltaTime ) { _Timeout = Timeout ; _DataStreamTrace = DataStreamTrace ; _DeltaTime = DeltaTime ; @@ -95,9 +95,9 @@ bool GraphBase::StreamGraph::SetStreamParams( const long Timeout , return true ; } -void GraphBase::StreamGraph::StreamParams( long & Timeout , +void GraphBase::StreamGraph::StreamParams( CORBA::Long & Timeout , SUPERV::KindOfDataStreamTrace & DataStreamTrace , - double & DeltaTime ) const { + CORBA::Double & DeltaTime ) const { Timeout = _Timeout ; DataStreamTrace = _DataStreamTrace ; DeltaTime = _DeltaTime ; diff --git a/src/GraphBase/DataFlowBase_StreamGraph.hxx b/src/GraphBase/DataFlowBase_StreamGraph.hxx index c33133a..6f6378d 100644 --- a/src/GraphBase/DataFlowBase_StreamGraph.hxx +++ b/src/GraphBase/DataFlowBase_StreamGraph.hxx @@ -60,12 +60,12 @@ namespace GraphBase { ~StreamGraph() ; - bool SetStreamParams( const long Timeout , + bool SetStreamParams( CORBA::Long Timeout , const SUPERV::KindOfDataStreamTrace DataStreamTrace , - const double DeltaTime ) ; - void StreamParams( long & Timeout , + CORBA::Double DeltaTime ) ; + void StreamParams( CORBA::Long & Timeout , SUPERV::KindOfDataStreamTrace & DataStreamTrace , - double & DeltaTime ) const ; + CORBA::Double & DeltaTime ) const ; bool CreateStreamTopology( const char * aDirectory ) ; diff --git a/src/GraphBase/DataFlowBase_XmlHandler.cxx b/src/GraphBase/DataFlowBase_XmlHandler.cxx index 8f3a223..2c8dcda 100644 --- a/src/GraphBase/DataFlowBase_XmlHandler.cxx +++ b/src/GraphBase/DataFlowBase_XmlHandler.cxx @@ -262,7 +262,7 @@ bool GraphBase::XmlHandler::endElement( const QString&, int sizedata = aListOfDataFlows[ GraphsNumber ].Datas.size() ; aListOfDataFlows[ GraphsNumber ].Datas.resize( sizedata+1 ) ; - if ( aLinkValue.type()->kind() == CORBA::tk_double ) + if ( aLink.aLinkValue.type()->kind() == CORBA::tk_double ) // mkr : PAL12235 aLink.aLinkValue = *aLinkDoubleValue ; aListOfDataFlows[ GraphsNumber ].Datas[ sizedata ] = aLink ; @@ -1117,8 +1117,9 @@ bool GraphBase::XmlHandler::endElement( const QString&, break ; case 9 : if ( qName == "PyFunc" ) { - if ( fieldvalue[depth] == NULLSTRING ) - return returnfalse( this , "depth5-9" , qName ) ; + // mkr : commented for PAL12309 (the function body can contains spaces, tabs, etc.) + //if ( fieldvalue[depth] == NULLSTRING ) + // return returnfalse( this , "depth5-9" , qName ) ; int l = aNode.theListOfPythonFunctions.size() - 1 ; SUPERV::ListOfStrings aPythonFunction = *aNode.theListOfPythonFunctions[ l ] ; int ll = aPythonFunction.length() ; diff --git a/src/GraphEditor/DataFlowEditor_DataFlow.hxx b/src/GraphEditor/DataFlowEditor_DataFlow.hxx index bbe2312..4699d22 100644 --- a/src/GraphEditor/DataFlowEditor_DataFlow.hxx +++ b/src/GraphEditor/DataFlowEditor_DataFlow.hxx @@ -199,7 +199,7 @@ namespace GraphEditor { const char * FromServiceParameterName , const char * ToNodeName , const char * ToServiceParameterName , - const int index , long &X , long &Y ) ; + const int index , CORBA::Long &X , CORBA::Long &Y ) ; bool AddInputData( const char * ToNodeName , const char * ToParameterName , diff --git a/src/GraphEditor/DataFlowEditor_DataFlow.lxx b/src/GraphEditor/DataFlowEditor_DataFlow.lxx index 24f63f6..0dde219 100644 --- a/src/GraphEditor/DataFlowEditor_DataFlow.lxx +++ b/src/GraphEditor/DataFlowEditor_DataFlow.lxx @@ -378,7 +378,7 @@ inline bool GraphEditor::DataFlow::GetLinkCoord( const char* FromServiceParameterName , const char* ToNodeName , const char* ToServiceParameterName , - const int index , long &X , long &Y ) { + const int index , CORBA::Long &X , CORBA::Long &Y ) { return GraphEditor::OutNode::GetLinkCoord( FromNodeName , FromServiceParameterName , ToNodeName , @@ -489,7 +489,10 @@ inline long GraphEditor::DataFlow::LevelMax() { inline SUPERV::ListOfStrings * GraphEditor::DataFlow::LevelNodes(long aLevel ) { // if ( !IsValid( false ) ) { // if ( !IsExecutable() ) { - if ( !IsValid() ) { // mkr : IPAL9974 + // mkr : IPAL11571 --> + int SubStreamGraphsNumber = 0 ; + if ( !IsValid() || !Graph()->Sort( SubStreamGraphsNumber ) ) { // mkr : IPAL9974 + // mkr : IPAL11571 <-- return ((SUPERV::ListOfStrings * ) NULL ) ; } return Graph()->LevelNodes( aLevel ) ; diff --git a/src/GraphEditor/DataFlowEditor_OutNode.cxx b/src/GraphEditor/DataFlowEditor_OutNode.cxx index 52d6601..6bc6b01 100644 --- a/src/GraphEditor/DataFlowEditor_OutNode.cxx +++ b/src/GraphEditor/DataFlowEditor_OutNode.cxx @@ -925,7 +925,7 @@ bool GraphEditor::OutNode::GetLinkCoord( const char* FromNodeName , const char* FromServiceParameterName , const char* ToNodeName , const char* ToServiceParameterName , - const int index , long &X , long &Y ) { + const int index , CORBA::Long &X , CORBA::Long &Y ) { GraphBase::InPort * anInPort = Graph()->GetChangeInPort( ToNodeName , ToServiceParameterName ) ; // cdebug << "GraphEditor::OutNode::GetLinkCoord " << ToNodeName << "( " << ToServiceParameterName diff --git a/src/GraphEditor/DataFlowEditor_OutNode.hxx b/src/GraphEditor/DataFlowEditor_OutNode.hxx index 4369702..f5a30c6 100644 --- a/src/GraphEditor/DataFlowEditor_OutNode.hxx +++ b/src/GraphEditor/DataFlowEditor_OutNode.hxx @@ -276,7 +276,7 @@ namespace GraphEditor { const char* FromServiceParameterName , const char* ToNodeName , const char* ToServiceParameterName , - const int index , long &X , long &Y ) ; + const int index , CORBA::Long &X , CORBA::Long &Y ) ; // bool IsValid(bool kLoopSwitch = true ) { diff --git a/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx b/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx index 68211da..09dcf69 100644 --- a/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx +++ b/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx @@ -40,6 +40,15 @@ bool GraphExecutor::InNode::InitPython() { Py_InitModule( "InitPyRunMethod" , MethodPyRunMethod ) ; // asv : 20.01.05 : changes involved with switching to old (HEAD) KERNEL //_OutNode->SuperVisionContainer()->ActivatePythonExecution( "InitPyRunMethod" , MethodPyRunMethod ) ; + + // PAL10310: patch on omniORB + string aPyFunc; + aPyFunc = "import omnipatch\n" ; + if ( PyRun_SimpleString( (char *) aPyFunc.c_str() ) ) { + cdebug << ThreadNo() << " " << Name() << " PyRun_SimpleString ERROR " << endl << aPyFunc << endl ; + Automaton()->PyUnLock() ; + return false ; + } } // PyObject * Dictionnary = PyModule_GetDict( Module ) ; // InitPyDynInvokeError = PyErr_NewException( "InitPyDynInvokeError" , NULL , NULL ) ; @@ -83,8 +92,9 @@ bool GraphExecutor::InNode::InitPython() { aPyFunc += "import sys\n" ; aPyFunc += "import CORBA\n" ; aPyFunc += "import omniORB\n" ; + aPyFunc += "orb = CORBA.ORB_init( sys.argv , CORBA.ORB_ID )\n" ; aPyFunc += "def PyObjRef( IORObjStr ) :\n" ; - aPyFunc += " orb = CORBA.ORB_init( sys.argv , CORBA.ORB_ID )\n" ; + // aPyFunc += " orb = CORBA.ORB_init( sys.argv , CORBA.ORB_ID )\n" ; aPyFunc += " objref = orb.string_to_object( IORObjStr )\n" ; aPyFunc += " return objref\n" ; aPyFunc += "InitPyRunMethod.RunMethod( PyObjRef )\n" ; @@ -109,8 +119,9 @@ bool GraphExecutor::InNode::InitPython() { aPyFunc += "import sys\n" ; aPyFunc += "import CORBA\n" ; aPyFunc += "import omniORB\n" ; + aPyFunc += "orb = CORBA.ORB_init( sys.argv , CORBA.ORB_ID )\n" ; aPyFunc += "def PyObjIor( ObjRef ) :\n" ; - aPyFunc += " orb = CORBA.ORB_init( sys.argv , CORBA.ORB_ID )\n" ; + // aPyFunc += " orb = CORBA.ORB_init( sys.argv , CORBA.ORB_ID )\n" ; aPyFunc += " objIor = orb.object_to_string( ObjRef )\n" ; aPyFunc += " return objIor\n" ; aPyFunc += "InitPyRunMethod.RunMethod( PyObjIor )\n" ; @@ -157,7 +168,21 @@ PyObject * GraphExecutor::InNode::InitPyDynInvoke( char * PyFuncName , if ( strlen( PyFuncName ) ) { Automaton()->PyLock() ; + thePyRunMethod = Automaton()->PyFunction( PyFuncName ) ; + + //thePyRunMethod = NULL; + // asv 28.02.05 : VERY BAD fix of the following problem: after change of a function, + // the changes are NOT taken into account by Automation - it returns PyObject of the OLD function. + // so here we force re-automating the PyObject EVERY TIME, regardless if the function has changed or not. + // Once again - it is a very bad solution, it fully discards the whole idea of automation, + // here is it done as a quick fix for a bug. + // A better solution (to be implemented): store the PyObject NOT in Automation map, but in + // InLine node itself! And if the method is changed - remove the PyObject and force to regenerate it. + // But this means that PyObject must be stored in Editor's data model. + // asv 01.03.05 : the fix is not needed, the described bug is not reproduced. To investigate: + // WHERE PyObject is removed from Automation map on function change. + if ( (*aPythonFunction).length() ) { if ( thePyRunMethod == NULL ) { unsigned int i ; @@ -261,9 +286,9 @@ bool GraphExecutor::InNode::PyDynInvoke( PyObject * MyPyRunMethod , PyObject * ArgsList = NULL ; PyObject * ArgValue = NULL ; PyObject * Result = NULL ; - PyObject * MyPyObjRefList = NULL ; + //PyObject * MyPyObjRefList = NULL ; PyObject * ResultObj = NULL ; - PyObject * MyPyObjIorList = NULL ; + //PyObject * MyPyObjIorList = NULL ; PyObject * ResultIor = NULL ; CORBA::Object_ptr ObjRef ; @@ -370,27 +395,27 @@ bool GraphExecutor::InNode::PyDynInvoke( PyObject * MyPyRunMethod , break ; } case CORBA::tk_objref : { - MyPyObjRefList = PyTuple_New( 1 ) ; - PyObject * ObjValue ; + //MyPyObjRefList = PyTuple_New( 1 ) ; + //PyObject * ObjValue ; #if OMNIORB_VERSION >= 4 data >>= (CORBA::Any::to_object ) ObjRef ; #else data >>= ObjRef ; #endif IORObjRef = ObjectToString( ObjRef ) ; - ObjValue = Py_BuildValue( "s" , IORObjRef ) ; - PyTuple_SetItem( MyPyObjRefList , 0 , ObjValue ) ; + //ObjValue = Py_BuildValue( "s" , IORObjRef ) ; + //PyTuple_SetItem( MyPyObjRefList , 0 , ObjValue ) ; #if PyDynInvokeTrace - cdebug << "ArgIn" << i << " : " << sname << " " << method << " " << " Value " << IORObjRef << " (objref) " - << MyPyObjRef->ob_refcnt << "/" << MyPyObjRefList->ob_refcnt << endl ; + cdebug << "ArgIn" << i << " : " << sname << " " << method << " " << " Value " << IORObjRef << " (objref) "<< endl ; + // << MyPyObjRef->ob_refcnt << "/" << MyPyObjRefList->ob_refcnt << endl ; #endif // ResultObj = PyEval_CallObject( MyPyObjRef , MyPyObjRefList ) ; - ResultObj = PyEvalCallObject( "PyObjRef" , MyPyObjRef , MyPyObjRefList ) ; + //ResultObj = PyEvalCallObject( "PyObjRef" , MyPyObjRef , MyPyObjRefList ) ; #if PyDynInvokeTrace - cdebug << "ObjValue->ob_refcnt" << ObjValue->ob_refcnt << endl ; + //cdebug << "ObjValue->ob_refcnt" << ObjValue->ob_refcnt << endl ; #endif - ArgValue = Py_BuildValue( "O" , ResultObj ) ; - PyTuple_SetItem( ArgsList , i , ArgValue ) ; + //ArgValue = Py_BuildValue( "O" , ResultObj ) ; + //PyTuple_SetItem( ArgsList , i , ArgValue ) ; #if PyDynInvokeTrace if ( ArgValue ) cdebug << "ArgIn" << i << " : " << sname << " " << method << " Value (objref) ArgsList->ob_refcnt" @@ -398,22 +423,33 @@ bool GraphExecutor::InNode::PyDynInvoke( PyObject * MyPyRunMethod , else cdebug << "ArgIn" << i << " : " << sname << " " << method << " Value (objref) ArgsList->ob_refcnt" << ArgsList->ob_refcnt << " ArgValue is NULL" << endl ; - cdebug << "MyPyObjRefList->ob_refcnt " << MyPyObjRefList->ob_refcnt-1 << endl ; -#endif - Py_DECREF( MyPyObjRefList ) ; - if ( CORBA::is_nil( ObjRef ) ) { - ResultObj = NULL ; - } - else { -#if PyDynInvokeTrace - if ( ResultObj ) - cdebug << "ResultObj->ob_refcnt " << ResultObj->ob_refcnt-1 << endl ; - else - cdebug << "ResultObj is NULL" << endl ; -#endif - if ( ResultObj ) - Py_DECREF( ResultObj ) ; - } + //cdebug << "MyPyObjRefList->ob_refcnt " << MyPyObjRefList->ob_refcnt-1 << endl ; +#endif + ResultObj = PyObject_CallFunction( MyPyObjRef , "s",IORObjRef ) ; + if(ResultObj == NULL){ + PyErr_Print(); + ResultObj=Py_None; + Py_INCREF(ResultObj) ; + } + PyTuple_SetItem( ArgsList , i , ResultObj ) ; + cdebug << "ArgIn" << i << " : " << sname << " " << method << " Value (objref) ArgsList->ob_refcnt" + << ArgsList->ob_refcnt << " ArgValue->ob_refcnt" << ResultObj->ob_refcnt << endl ; +// << ArgsList->ob_refcnt << " ArgValue->ob_refcnt" << ArgValue->ob_refcnt << endl ; + //cdebug << "MyPyObjRefList->ob_refcnt " << MyPyObjRefList->ob_refcnt-1 << endl ; + //Py_DECREF( MyPyObjRefList ) ; + //if ( CORBA::is_nil( ObjRef ) ) { + // ResultObj = NULL ; + //} + //else { + //#if PyDynInvokeTrace + //if ( ResultObj ) + //cdebug << "ResultObj->ob_refcnt " << ResultObj->ob_refcnt-1 << endl ; + //else + //cdebug << "ResultObj is NULL" << endl ; + //#endif + //if ( ResultObj ) + //Py_DECREF( ResultObj ) ; + //} break ; } default : { @@ -432,6 +468,7 @@ bool GraphExecutor::InNode::PyDynInvoke( PyObject * MyPyRunMethod , if ( Result == NULL ) { cdebug_out << "GraphExecutor::InNode::PyDynInvoke Node " << Name() << " " << method << " Error Result == NULL" << endl ; + PyErr_Print(); RetVal = false ; } else { @@ -617,7 +654,7 @@ bool GraphExecutor::InNode::PyDynInvoke( PyObject * MyPyRunMethod , } case CORBA::tk_objref : { PyObject * ObjIor ; - MyPyObjIorList = PyTuple_New( 1 ) ; + //MyPyObjIorList = PyTuple_New( 1 ) ; if ( PyTuple_Check( Result ) ) { ObjIor = PyTuple_GetItem( Result , i ) ; } @@ -629,21 +666,22 @@ bool GraphExecutor::InNode::PyDynInvoke( PyObject * MyPyRunMethod , << " Result->ob_refcnt" << Result->ob_refcnt << " ObjIor->ob_refcnt" << ObjIor->ob_refcnt << endl ; #endif - Py_INCREF( ObjIor ) ; + //Py_INCREF( ObjIor ) ; // PyObject_Print( ObjIor , stdout , 0 ) ; - PyTuple_SetItem( MyPyObjIorList , 0 , ObjIor ) ; + //PyTuple_SetItem( MyPyObjIorList , 0 , ObjIor ) ; // ResultIor = PyEval_CallObject( MyPyObjIor , MyPyObjIorList ) ; - ResultIor = PyEvalCallObject( "PyObjIor" , MyPyObjIor , MyPyObjIorList ) ; + //ResultIor = PyEvalCallObject( "PyObjIor" , MyPyObjIor , MyPyObjIorList ) ; + ResultIor = PyObject_CallFunction( MyPyObjIor , "O",ObjIor ) ; #if PyDynInvokeTrace cdebug << "ObjIor->ob_refcnt " << ObjIor->ob_refcnt-1 << endl ; #endif - Py_DECREF( ObjIor ) ; + //Py_DECREF( ObjIor ) ; #if PyDynInvokeTrace - cdebug << "MyPyObjIorList->ob_refcnt " << MyPyObjIorList->ob_refcnt-1 << endl ; + //cdebug << "MyPyObjIorList->ob_refcnt " << MyPyObjIorList->ob_refcnt-1 << endl ; #endif - Py_DECREF( MyPyObjIorList ) ; + //Py_DECREF( MyPyObjIorList ) ; #if PyDynInvokeTrace - cdebug << "MyPyObjIor->ob_refcnt " << MyPyObjIor->ob_refcnt << endl ; + //cdebug << "MyPyObjIor->ob_refcnt " << MyPyObjIor->ob_refcnt << endl ; #endif if ( ResultIor ) { char * IOR = NULL ; @@ -710,7 +748,8 @@ bool GraphExecutor::InNode::PyDynInvoke( PyObject * MyPyRunMethod , } } else { - cdebug_out << "GraphExecutor::InNode::PyDynInvoke Error ResultIor == NULL Node " + PyErr_Print(); + cdebug_out << "GraphExecutor::InNode::PyDynInvoke Error ResultIor == NULL Node " << Name() << " method " << method << " " << endl ; RetVal = false ; } @@ -777,6 +816,9 @@ bool GraphExecutor::InNode::PyDynInvoke( PyObject * MyPyRunMethod , Py_DECREF( ArgsList ) ; } + fflush(stdout); + fflush(stderr); + #if 0 { int i ; diff --git a/src/GraphExecutor/Makefile.in b/src/GraphExecutor/Makefile.in index b10fe35..ec591a8 100644 --- a/src/GraphExecutor/Makefile.in +++ b/src/GraphExecutor/Makefile.in @@ -1,3 +1,22 @@ +# 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/ +# #============================================================================== # File : Makefile.in # Created : aug 21 2001 diff --git a/src/SUPERVGUI/SUPERVGUI.cxx b/src/SUPERVGUI/SUPERVGUI.cxx index 2442a96..b1cf1a5 100644 --- a/src/SUPERVGUI/SUPERVGUI.cxx +++ b/src/SUPERVGUI/SUPERVGUI.cxx @@ -488,7 +488,8 @@ void SUPERVGUI::displayDataflow() { // second case : get empty initial view frame as new ViewFrame object aViewFrame = myInitialViewFrame; // mkr : PAL8237 : remove first "gag" Main from children - aViewFrame->removeChild( aViewFrame->queryList("SUPERVGUI_Main")->first() ); + // srn: commented as it cases on application exit "X Windows error" + //aViewFrame->removeChild( aViewFrame->queryList("SUPERVGUI_Main")->first() ); } if( aViewFrame ) { @@ -538,6 +539,22 @@ void SUPERVGUI::renameDataflow() { updateObjBrowser(); //QApplication::restoreOverrideCursor(); + + // mkr : PAL7037 => rename engine of the graph (i.e. corresponding SUPERV_Graph) --> + if ( obj->FindAttribute(anAttr, "AttributeIOR") ) { + _PTR(AttributeIOR) anIOR ( anAttr ); + SUPERV_Graph aDataFlow = engine->getGraph(anIOR->Value().c_str()); + if ( !SUPERV_isNull(aDataFlow) ) { + if ( aDataFlow->IsStreamGraph() ) { + SUPERV_StreamGraph aStreamDataFlow = aDataFlow->ToStreamGraph(); + if ( !SUPERV_isNull(aStreamDataFlow) ) + aStreamDataFlow->SetName( nm.latin1() ); + } + else + aDataFlow->SetName( nm.latin1() ); + } + } + // mkr : PAL7037 <-- } } } @@ -679,7 +696,8 @@ bool SUPERVGUI::createDataflow( const NEW_DF_MODE mode, bool theInitialDF ) { // 2. get empty initial view frame as new ViewFrame object aViewFrame = myInitialViewFrame; // mkr : PAL8237 : remove first "gag" Main from children - aViewFrame->removeChild( aViewFrame->queryList("SUPERVGUI_Main")->first() ); + // srn: commented as it cases on application exit "X Windows error" + //aViewFrame->removeChild( aViewFrame->queryList("SUPERVGUI_Main")->first() ); } if ( aViewFrame ) { @@ -1023,3 +1041,20 @@ void SUPERVGUI::fillInterfaceNameMap() { QMap SUPERVGUI::getInterfaceNameMap() const { return myInterfaceNameMap; } + +bool SUPERVGUI::updateDataFlowSOName( SUPERV::Graph_ptr theDataflow ) { + if ( !SUPERV_isNull(theDataflow) ) { + _PTR(Study) aStudy = (( SalomeApp_Study* )study)->studyDS(); + _PTR(SObject) aSO ( aStudy->FindObjectIOR( theDataflow->getIOR() ) ); + + _PTR(GenericAttribute) anAttr; + if ( aSO ) // i.e. if theDataflow is in study + if ( aSO->FindAttribute(anAttr, "AttributeName") ) { + _PTR(AttributeName) aName ( anAttr ); + aName->SetValue( theDataflow->Name() ); + updateObjBrowser(); + return true; + } + } + return false; +} diff --git a/src/SUPERVGUI/SUPERVGUI.h b/src/SUPERVGUI/SUPERVGUI.h index 2092a9f..803043e 100644 --- a/src/SUPERVGUI/SUPERVGUI.h +++ b/src/SUPERVGUI/SUPERVGUI.h @@ -122,6 +122,13 @@ class SUPERVGUI: public SalomeApp_Module { QColor getIVFBackgroundColor() { return myIVFBackgroundColor; } void setIVFBackgroundColor( QColor theColor ) { if ( myInitialViewFrame ) myIVFBackgroundColor = theColor; } + // mkr : PAL7037 + /*! + * \brief The method update name of the given dataflow, if this dataflow is in study. + * Returns true if update was done. + */ + bool updateDataFlowSOName( SUPERV::Graph_ptr theDataflow ); + signals: void KillMainThread(bool theValue); diff --git a/src/SUPERVGUI/SUPERVGUI_BrowseNodeDlg.cxx b/src/SUPERVGUI/SUPERVGUI_BrowseNodeDlg.cxx index 54cf5fa..6d05fb7 100644 --- a/src/SUPERVGUI/SUPERVGUI_BrowseNodeDlg.cxx +++ b/src/SUPERVGUI/SUPERVGUI_BrowseNodeDlg.cxx @@ -44,7 +44,7 @@ SUPERVGUI_PortField::SUPERVGUI_PortField( QWidget* theParent, SUPERV_Port thePor QString aLabelTxt(myPort->Name()); - SUPERV_CNode aNode = myPort->Node(); + /*SUPERV_CNode aNode = myPort->Node(); SALOME_ModuleCatalog::Service* aService = aNode->Service(); SALOME_ModuleCatalog::ListOfServicesParameter aList; aList = (myPort->IsInput())? aService->ServiceinParameter : aService->ServiceoutParameter; @@ -55,8 +55,12 @@ SUPERVGUI_PortField::SUPERVGUI_PortField( QWidget* theParent, SUPERV_Port thePor break; } } - - aLabelTxt += QString(":"); + aLabelTxt += QString(":");*/ + + // mkr : the following way is easyer to get ports' type than commented above + QString aPortType = QString(myPort->Type()); + aLabelTxt += QString(" (") + aPortType + QString("):"); + myLabel = new QLabel(aLabelTxt, theParent ); myValue = new QLineEdit( theParent ); @@ -67,7 +71,25 @@ SUPERVGUI_PortField::SUPERVGUI_PortField( QWidget* theParent, SUPERV_Port thePor aPalette.setInactive(aPalette.disabled()); aPalette.setActive(aPalette.disabled()); myValue->setPalette(aPalette); - } + } + // mkr : PAL6276 --> + else { + if ( !aPortType.compare(QString("boolean")) ) + myValue->setValidator( new QIntValidator( 0, 1, theParent ) ); + + if ( !aPortType.compare(QString("short")) || !aPortType.compare(QString("int")) || !aPortType.compare(QString("long")) ) + myValue->setValidator( new QIntValidator( theParent ) ); + + if ( !aPortType.compare(QString("float")) || !aPortType.compare(QString("double")) ) + myValue->setValidator( new QDoubleValidator( theParent ) ); + + if ( !aPortType.compare(QString("char")) ) { + QRegExp aRX( "." ); + myValue->setValidator( new QRegExpValidator( aRX, theParent ) ); + + } + } + // mkr : PAL6276 <-- myValue->installEventFilter( this ); } diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasLink.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasLink.cxx index a58cbb5..c2fe717 100644 --- a/src/SUPERVGUI/SUPERVGUI_CanvasLink.cxx +++ b/src/SUPERVGUI/SUPERVGUI_CanvasLink.cxx @@ -73,8 +73,8 @@ void SUPERVGUI_CanvasLink::createPrs() addPoint(myInputPort->getConnectionPoint()); } if (!myMain->getCanvas()->isControlView()) { - long x, y; - for (int i = 0; i < myLink->CoordsSize(); i++) { + CORBA::Long x, y; + for (CORBA::Long i = 0; i < myLink->CoordsSize(); i++) { myLink->Coords(i+1, x, y); addPoint(QPoint(x, y), i+1); } diff --git a/src/SUPERVGUI/SUPERVGUI_DataModel.cxx b/src/SUPERVGUI/SUPERVGUI_DataModel.cxx index e9cac64..0c2a7a3 100644 --- a/src/SUPERVGUI/SUPERVGUI_DataModel.cxx +++ b/src/SUPERVGUI/SUPERVGUI_DataModel.cxx @@ -79,8 +79,8 @@ bool SUPERVGUI_DataModel::close() //================================================================ bool SUPERVGUI_DataModel::isModified() const { - SalomeApp_Study* study = getStudy(); - if(study) return study->studyDS()->IsModified(); + //SalomeApp_Study* study = getStudy(); + //if(study) return study->studyDS()->IsModified(); return false; } diff --git a/src/SUPERVGUI/SUPERVGUI_Information.cxx b/src/SUPERVGUI/SUPERVGUI_Information.cxx index d747448..7452268 100644 --- a/src/SUPERVGUI/SUPERVGUI_Information.cxx +++ b/src/SUPERVGUI/SUPERVGUI_Information.cxx @@ -26,6 +26,7 @@ // Module : SUPERV #include "SUPERVGUI_Information.h" +#include "SUPERVGUI.h" #include "CAM_Application.h" #include "SUIT_Desktop.h" @@ -36,7 +37,6 @@ #include #include - /*! Constructor */ @@ -278,11 +278,18 @@ void SUPERVGUI_Information::okButton() { Trace("SUPERVGUI_Information::okButton"); //mkr : modifications for fixing bug IPAL9972 bool aIsAccept = true; - if ( QString( myNode->Name() ).compare( nameV->text() ) != 0 ) + if ( QString( myNode->Name() ).compare( nameV->text() ) != 0 ) { if ( !myNode->SetName( nameV->text().latin1()) ) { QMessageBox::warning( SUIT_Session::session()->activeApplication()->desktop(), tr( "ERROR" ), tr( "MSG_CANT_RENAMENODE" ) ); aIsAccept = false; } + // mkr : PAL7037 => update dataflow name in object browser if this dialog called for the dataflow and the dataflow is in study --> + if ( myNode->IsGraph() || myNode->IsStreamGraph() ) { + SUPERVGUI* aSupMod = SUPERVGUI::Supervision(); + if ( aSupMod ) aSupMod->updateDataFlowSOName(SUPERV::Graph::_narrow(myNode)); + } + // mkr : PAL7037 <-- + } myNode->SetAuthor( authV->text().latin1() ); if (myNode->IsFactory()) { SUPERV_FNode aFNode = SUPERV::FNode::_narrow(myNode); diff --git a/src/SUPERVGUI/SUPERVGUI_Main.cxx b/src/SUPERVGUI/SUPERVGUI_Main.cxx index e9160aa..4e4079b 100644 --- a/src/SUPERVGUI/SUPERVGUI_Main.cxx +++ b/src/SUPERVGUI/SUPERVGUI_Main.cxx @@ -649,6 +649,7 @@ void SUPERVGUI_Main::onPutInStudy( QString* theNodePortName ) } } } + SUPERVGUI_Main::setModifiedFlag(); } } } @@ -1270,7 +1271,9 @@ bool SUPERVGUI_Main::putDataStudy( SUPERV_Port p, const char* inout ) { aSupMod->updateObjBrowser(); } else MESSAGE("NULL Supervision module!"); - + + SalomeApp_Application* app = (SalomeApp_Application*)(SUIT_Session::session()->activeApplication()); + if(app) app->updateActions(); isIn = false; return true; } @@ -1492,6 +1495,32 @@ void SUPERVGUI_Main::resizeView( QResizeEvent* theEvent ) getCanvasArray()->resize( theEvent->size().width(), theEvent->size().height() ); } +/*! + Sets a modified flag in an active study + */ +void SUPERVGUI_Main::setModifiedFlag() +{ + SalomeApp_Application* app = dynamic_cast(SUIT_Session::session()->activeApplication()); + if(app) { + SalomeApp_Study* study = dynamic_cast(app->activeStudy()); + if(study) { + _PTR(Study) studyDS = study->studyDS(); + _PTR(SComponent) sco = studyDS->FindComponent(STUDY_SUPERVISION); + if(sco) { + _PTR(StudyBuilder) builder = studyDS->NewBuilder(); + _PTR(GenericAttribute) ga; + ga = builder->FindOrCreateAttribute(sco, "AttributeParameter"); + _PTR(AttributeParameter) ap(ga); + if(ap) { + ap->SetBool("SUPERVISOR_MODIFIED_FLAG",1); + app->updateActions(); + } + } + } + } +} + + /******************************* SUPERVGUI_Thread class ****************************************/ SUPERVGUI_Thread::SUPERVGUI_Thread() :QThread() @@ -1721,8 +1750,8 @@ SUPERVGUI_DSGraphParameters::~SUPERVGUI_DSGraphParameters() { Sets data function */ void SUPERVGUI_DSGraphParameters::setData() { - double aDeltaTime; - long aTimeOut; + CORBA::Double aDeltaTime; + CORBA::Long aTimeOut; SUPERV::KindOfDataStreamTrace aDataStreamTrace; // myGraph->StreamParams(aTimeOut, aDataStreamTrace, aDeltaTime); @@ -1753,3 +1782,4 @@ void SUPERVGUI_DSGraphParameters::accept() { } QDialog::accept(); } + diff --git a/src/SUPERVGUI/SUPERVGUI_Main.h b/src/SUPERVGUI/SUPERVGUI_Main.h index a6a6ac8..7af3055 100644 --- a/src/SUPERVGUI/SUPERVGUI_Main.h +++ b/src/SUPERVGUI/SUPERVGUI_Main.h @@ -140,6 +140,11 @@ class SUPERVGUI_Main: public SUPERVGraph_View { void setRunTime( QDateTime theRunTime ) { myRunTime = theRunTime; } QDateTime getRunTime() const { return myRunTime; } + // srn: marks an active study as being modified by the Supervisor + // Note: to set the modified flag the method requires that Supervision + // component was previously added to study. + static void setModifiedFlag(); + signals: void KillMyThread(bool theValue); void EventToSync(); // mkr : IPAL11362 diff --git a/src/SUPERVGUI/SUPERVGUI_Notification.cxx b/src/SUPERVGUI/SUPERVGUI_Notification.cxx index 7d1e7ef..94e98a3 100644 --- a/src/SUPERVGUI/SUPERVGUI_Notification.cxx +++ b/src/SUPERVGUI/SUPERVGUI_Notification.cxx @@ -94,7 +94,14 @@ SUPERVGUI_Notification::SUPERVGUI_Notification( SUPERVGUI_Main* m ) myMainNotif->setVerbose( false ); /* nodes notification */ - QObjectList* ihmList = myMain->/*getGraph()->*/queryList( "SUPERVGUI_CanvasNode" ); + // mkr : PAL7037 --> + //QObjectList* ihmList = myMain->/*getGraph()->*/queryList( "SUPERVGUI_CanvasNode" ); + QObjectList* ihmList; + if ( myMain->getViewType() == CANVASTABLE ) + ihmList = myMain->getCanvasArray()->queryList( "SUPERVGUI_CanvasNode" ); + else + ihmList = myMain->getCanvas()->queryList( "SUPERVGUI_CanvasNode" ); + // mkr : PAL7037 <-- QObjectListIt i( *ihmList ); SUPERVGUI_CanvasNode* theNode; while ( ( theNode = ( ( SUPERVGUI_CanvasNode* )i.current() ) ) != 0) { diff --git a/src/SUPERVGUI/SUPERVGUI_Service.cxx b/src/SUPERVGUI/SUPERVGUI_Service.cxx index 3f49540..a6bb0fa 100644 --- a/src/SUPERVGUI/SUPERVGUI_Service.cxx +++ b/src/SUPERVGUI/SUPERVGUI_Service.cxx @@ -958,6 +958,7 @@ SUPERVGUI_EditPythonDlg::SUPERVGUI_EditPythonDlg( bool isLoop ) resize( 500, 250 ); QVBoxLayout* aMainLayout = new QVBoxLayout(this, 7, 4); int a,b; // dummies for PythonEditPane, not used, since library = false and myX, myY are not used in PythonEditPane + myIsLoop = isLoop; // mkr : PAL12236 if (isLoop) { QTabWidget* aLoopTabPane = new QTabWidget(this); myInitPane = new SUPERVGUI_PythonEditPane( this, false, a, b ); // library == false, since no creation of a node is needed here @@ -998,7 +999,12 @@ SUPERVGUI_EditPythonDlg::SUPERVGUI_EditPythonDlg( bool isLoop ) // will call with null python function name void SUPERVGUI_EditPythonDlg::clickOnOk() { - if ( getFuncName().isEmpty() ) + // mkr : PAL12236 + bool hasEmptyName = myIsLoop ? + ( getInitFuncName().isEmpty() || getMoreFuncName().isEmpty() || getNextFuncName().isEmpty() ) : + getFuncName().isEmpty(); + + if ( hasEmptyName ) QMessageBox::warning( SUIT_Session::session()->activeApplication()->desktop(), tr( "ERROR" ), tr( "MSG_INCORRECT_INDENT" ) ); else accept(); @@ -1045,7 +1051,7 @@ void SUPERVGUI_Service::addNode( SUPERV::CNode_var theNode, SUPERV::INode_var th aMain->addMacroNode( theNode ); else if ( theNode->IsLoop() || theNode->IsSwitch() ) aMain->addControlNode( theNode, SUPERV::CNode::_narrow( theEndNode ), true ); - else + else aMain->addComputeNode( theNode ); aSupMod->nullifyInitialVF(); } diff --git a/src/SUPERVGUI/SUPERVGUI_Service.h b/src/SUPERVGUI/SUPERVGUI_Service.h index 3a46679..6b00762 100644 --- a/src/SUPERVGUI/SUPERVGUI_Service.h +++ b/src/SUPERVGUI/SUPERVGUI_Service.h @@ -53,7 +53,7 @@ public: SUPERV_Strings getFunction(); void setFunction(SUPERV_Strings theStr); - + public slots: // load all functions from an XML file into internal structures void loadFile(); @@ -202,6 +202,8 @@ public slots: void clickOnOk(); private: + bool myIsLoop; // mkr : PAL12236 + SUPERVGUI_PythonEditPane* myEditPane; SUPERVGUI_PythonEditPane* myInitPane; SUPERVGUI_PythonEditPane* myMorePane; diff --git a/src/SUPERVGUI/SUPERV_msg_en.po b/src/SUPERVGUI/SUPERV_msg_en.po index b729f5d..785d577 100644 --- a/src/SUPERVGUI/SUPERV_msg_en.po +++ b/src/SUPERVGUI/SUPERV_msg_en.po @@ -579,12 +579,6 @@ msgstr "Ports" msgid "TIT_BROWSENODE" msgstr "Browse Node " -msgid "BUT_APPLY" -msgstr "Ok" - -msgid "BUT_CLOSE" -msgstr "Close" - msgid "TIT_SETVALUE_PORT" msgstr "Set Value" @@ -980,7 +974,7 @@ msgid "TOOL_EXECUTION" msgstr "Execution" msgid "MSG_INCORRECT_INDENT" -msgstr "Incorrect indent of the python function name (must be 0)!" +msgstr "Incorrect indent of the python function name (must be 0) or \nthe name(s) of inline function(s) of this node is(are) empty !" msgid "MEN_SHOW_TOOLBAR" msgstr "Show toolbar" diff --git a/src/Supervision/CNode_Impl.cxx b/src/Supervision/CNode_Impl.cxx index 31a2dbe..ba0bbb8 100644 --- a/src/Supervision/CNode_Impl.cxx +++ b/src/Supervision/CNode_Impl.cxx @@ -373,8 +373,8 @@ bool CNode_Impl::IsHeadGraph() { endService( "CNode_Impl::IsHeadGraph" ); return RetVal ; } -long CNode_Impl::GraphLevel() { - long RetVal = 0 ; +CORBA::Long CNode_Impl::GraphLevel() { + CORBA::Long RetVal = 0 ; beginService( "CNode_Impl::GraphLevel" ); RetVal = DataFlowEditor()->Graph()->GraphMacroLevel() ; endService( "CNode_Impl::GraphLevel" ); @@ -569,7 +569,7 @@ bool CNode_Impl::SetComment( const char * aDataFlowComment ) { return RetVal ; } -void CNode_Impl::Coords(long X , long Y ) { +void CNode_Impl::Coords(CORBA::Long X , CORBA::Long Y ) { // beginService( "CNode_Impl::Coords" ); if ( DataFlowEditor()->IsEditing() ) { if ( _IsNode ) { @@ -581,9 +581,9 @@ void CNode_Impl::Coords(long X , long Y ) { } // endService( "CNode_Impl::Coords" ); } -long CNode_Impl::X() { +CORBA::Long CNode_Impl::X() { // beginService( "CNode_Impl::X" ); - long RetVal ; + CORBA::Long RetVal ; if ( _IsNode ) { RetVal = DataFlowNode()->XCoordinate() ; } @@ -593,9 +593,9 @@ long CNode_Impl::X() { // endService( "CNode_Impl::X" ); return RetVal ; } -long CNode_Impl::Y() { +CORBA::Long CNode_Impl::Y() { // beginService( "CNode_Impl::Y" ); - long RetVal ; + CORBA::Long RetVal ; if ( _IsNode ) { RetVal = DataFlowNode()->YCoordinate() ; } @@ -1488,9 +1488,9 @@ SUPERV::ListOfStreamLinks * CNode_Impl::StreamLinks() { return ( RetVal._retn() ) ; } -long CNode_Impl::SubGraph() { +CORBA::Long CNode_Impl::SubGraph() { // beginService( "CNode_Impl::SubGraph" ); - long RetVal = 0 ; + CORBA::Long RetVal = 0 ; if ( _IsNode ) { RetVal = DataFlowNode()->SubGraph() ; } @@ -1498,9 +1498,9 @@ long CNode_Impl::SubGraph() { return RetVal ; } -long CNode_Impl::SubStreamGraph() { +CORBA::Long CNode_Impl::SubStreamGraph() { // beginService( "CNode_Impl::SubStreamGraph" ); - long RetVal = 0 ; + CORBA::Long RetVal = 0 ; if ( _IsNode ) { RetVal = DataFlowNode()->SubStreamGraph() ; } @@ -1540,9 +1540,9 @@ SUPERV::GraphState CNode_Impl::State() { // endService( "CNode_Impl::State" ); return RetVal ; } -long CNode_Impl::Thread() { +CORBA::Long CNode_Impl::Thread() { // beginService( "CNode_Impl::Thread" ); - long RetVal = 0 ; + CORBA::Long RetVal = 0 ; GraphExecutor::DataFlow * aDataFlowExecutor = DataFlowEditor()->Executor() ; if ( aDataFlowExecutor ) { if ( _IsNode ) { @@ -1864,8 +1864,8 @@ bool CNode_Impl::Resume() { return RetVal ; } -long CNode_Impl::CpuUsed() { - long RetVal = 0 ; +CORBA::Long CNode_Impl::CpuUsed() { + CORBA::Long RetVal = 0 ; GraphExecutor::DataFlow * aDataFlowExecutor = DataFlowEditor()->Executor() ; if ( aDataFlowExecutor ) { if ( _IsNode ) { diff --git a/src/Supervision/CNode_Impl.hxx b/src/Supervision/CNode_Impl.hxx index 19ca441..23c53d4 100644 --- a/src/Supervision/CNode_Impl.hxx +++ b/src/Supervision/CNode_Impl.hxx @@ -158,9 +158,9 @@ class CNode_Impl : public POA_SUPERV::CNode , } } ; - virtual void Coords( const long X , const long Y ) ; - virtual long X() ; - virtual long Y() ; + virtual void Coords( CORBA::Long X , CORBA::Long Y ) ; + virtual CORBA::Long X() ; + virtual CORBA::Long Y() ; virtual SUPERV::Port_ptr Port( const char * aParameterName ) ; @@ -202,7 +202,7 @@ class CNode_Impl : public POA_SUPERV::CNode , virtual bool IsFlowMacro() ; virtual bool IsStreamMacro() ; virtual bool IsHeadGraph() ; - virtual long GraphLevel() ; + virtual CORBA::Long GraphLevel() ; virtual bool IsComputing() ; virtual bool IsFactory() ; virtual bool IsInLine() ; @@ -212,8 +212,8 @@ class CNode_Impl : public POA_SUPERV::CNode , virtual bool IsSwitch() ; virtual bool IsEndSwitch() ; - virtual long SubGraph() ; - virtual long SubStreamGraph() ; + virtual CORBA::Long SubGraph() ; + virtual CORBA::Long SubStreamGraph() ; // mkr : PAL8060 : this method is not used //virtual bool IsLinked(const char * ToServiceParameterName ) ; @@ -232,7 +232,7 @@ class CNode_Impl : public POA_SUPERV::CNode , virtual SUPERV::ControlState Control() ; virtual void ControlClear() ; - virtual long Thread() ; + virtual CORBA::Long Thread() ; GraphExecutor::AutomatonState AutoState() ; @@ -251,9 +251,9 @@ class CNode_Impl : public POA_SUPERV::CNode , virtual bool SuspendDone() ; virtual bool Resume() ; - virtual long CpuUsed() ; + virtual CORBA::Long CpuUsed() ; - virtual bool IsExecuting(); + virtual CORBA::Boolean IsExecuting(); } ; diff --git a/src/Supervision/Graph_Impl.cxx b/src/Supervision/Graph_Impl.cxx index a00e43f..5eb33e4 100644 --- a/src/Supervision/Graph_Impl.cxx +++ b/src/Supervision/Graph_Impl.cxx @@ -1743,16 +1743,16 @@ bool Graph_Impl::IsReadOnly() { return RetVal ; } -long Graph_Impl::LevelMax() { +CORBA::Long Graph_Impl::LevelMax() { // beginService( "Graph_Impl::LevelMax" ); - long RetVal = 0 ; + CORBA::Long RetVal = 0 ; if ( !IsMacro() ) { RetVal = DataFlowEditor()->LevelMax() ; } // endService( "Graph_Impl::LevelMax" ); return RetVal ; } -SUPERV::ListOfNodes * Graph_Impl::LevelNodes(long aLevel ) { +SUPERV::ListOfNodes * Graph_Impl::LevelNodes(CORBA::Long aLevel ) { // beginService( "Graph_Impl::LevelNodes" ); SUPERV::ListOfNodes_var RetVal = new SUPERV::ListOfNodes; if ( !IsMacro() ) { @@ -1778,27 +1778,27 @@ SUPERV::ListOfNodes * Graph_Impl::LevelNodes(long aLevel ) { // endService( "Graph_Impl::LevelNodes" ); return ( RetVal._retn() ) ; } -long Graph_Impl::ThreadsMax() { +CORBA::Long Graph_Impl::ThreadsMax() { // beginService( "Graph_Impl::ThreadsMax" ); - long RetVal = 0 ; + CORBA::Long RetVal = 0 ; if ( !IsMacro() ) { RetVal = DataFlowEditor()->ThreadsMax() ; } // endService( "Graph_Impl::ThreadsMax" ); return RetVal ; } -long Graph_Impl::Threads() { +CORBA::Long Graph_Impl::Threads() { // beginService( "Node_Impl::Threads" ); - long RetVal = false ; + CORBA::Long RetVal = false ; if ( !IsMacro() ) { RetVal = DataFlowExecutor()->Threads() ; } // endService( "Node_Impl::Threads" ); return RetVal ; } -long Graph_Impl::SuspendedThreads() { +CORBA::Long Graph_Impl::SuspendedThreads() { // beginService( "Node_Impl::SuspendedThreads" ); - long RetVal = false ; + CORBA::Long RetVal = false ; if ( !IsMacro() ) { RetVal = DataFlowExecutor()->SuspendedThreads() ; } @@ -2021,9 +2021,9 @@ bool Graph_Impl::EventW( SUPERV::CNode_out aNode , return RetVal ; } -long Graph_Impl::EventQSize() { +CORBA::Long Graph_Impl::EventQSize() { // beginService( "Graph_Impl::EventQSize" ); - long QSize = -1 ; + CORBA::Long QSize = -1 ; if ( pthread_mutex_lock( &_MutexExecutorWait ) ) { perror("pthread_mutex_lock _MutexExecutorWait") ; exit( 0 ) ; @@ -2039,13 +2039,13 @@ long Graph_Impl::EventQSize() { return QSize ; } -long Graph_Impl::LastLevelDone() { +CORBA::Long Graph_Impl::LastLevelDone() { // beginService( "Graph_Impl::LastLevelDone" ); if ( pthread_mutex_lock( &_MutexExecutorWait ) ) { perror("pthread_mutex_lock _MutexExecutorWait") ; exit( 0 ) ; } - long RetVal = 0 ; + CORBA::Long RetVal = 0 ; if ( DataFlowExecutor() && !IsMacro() ) { RetVal = DataFlowExecutor()->LastLevelDone() ; } @@ -2057,9 +2057,9 @@ long Graph_Impl::LastLevelDone() { return RetVal ; } -long Graph_Impl::SubGraphsNumber() { +CORBA::Long Graph_Impl::SubGraphsNumber() { // beginService( "Graph_Impl::SubGraphsNumber" ); - long RetVal = 0 ; + CORBA::Long RetVal = 0 ; if ( DataFlowEditor()->IsExecutable() && !IsMacro() ) { RetVal = DataFlowEditor()->SubGraphsNumber() ; } @@ -2067,7 +2067,7 @@ long Graph_Impl::SubGraphsNumber() { return RetVal ; } -SUPERV::ListOfNodes * Graph_Impl::SubGraphsNodes( const long aSubGraphNumber ) { +SUPERV::ListOfNodes * Graph_Impl::SubGraphsNodes( CORBA::Long aSubGraphNumber ) { beginService( "Graph_Impl::SubGraphsNodes" ); SUPERV::ListOfNodes_var RetVal = new SUPERV::ListOfNodes ; if ( DataFlowEditor()->IsEditing() && !IsMacro() ) { @@ -2459,9 +2459,9 @@ bool Graph_Impl::Merge(const SUPERV::Graph_ptr aGraph , map< string , int > & aM DataFlowEditor()->Graph()->GetGraphNode( aMapOfNodes[ aLinkToNodeName->c_str() ] )->Name() , InPort->Name() ) ; if ( RetVal ) { - int j ; + CORBA::Long j ; for ( j = 1 ; j <= aLink->CoordsSize() ; j++ ) { - long X , Y ; + CORBA::Long X , Y ; RetVal = aLink->Coords( j , X , Y ) ; if ( !RetVal ) break ; diff --git a/src/Supervision/Graph_Impl.hxx b/src/Supervision/Graph_Impl.hxx index b8515c7..e8060f0 100644 --- a/src/Supervision/Graph_Impl.hxx +++ b/src/Supervision/Graph_Impl.hxx @@ -176,21 +176,21 @@ class Graph_Impl : public POA_SUPERV::Graph , virtual bool IsExecutable() ; virtual bool IsEditing() ; - virtual bool IsExecuting() ; + virtual CORBA::Boolean IsExecuting() ; virtual bool IsReadOnly() ; - virtual long LevelMax() ; - virtual SUPERV::ListOfNodes * LevelNodes(long aLevel ) ; - virtual long ThreadsMax() ; - virtual long Threads() ; - virtual long SuspendedThreads() ; + virtual CORBA::Long LevelMax() ; + virtual SUPERV::ListOfNodes * LevelNodes(CORBA::Long aLevel ) ; + virtual CORBA::Long ThreadsMax() ; + virtual CORBA::Long Threads() ; + virtual CORBA::Long SuspendedThreads() ; virtual bool Run() ; // called on "Execute Graph" command virtual bool Start() ; // called on "Execute Graph Step-by-Step" command virtual bool Begin() ; - virtual long LastLevelDone() ; + virtual CORBA::Long LastLevelDone() ; virtual bool EventNoW( SUPERV::CNode_out aNode , SUPERV::GraphEvent & anEvent , @@ -201,10 +201,10 @@ class Graph_Impl : public POA_SUPERV::Graph , virtual bool EventW( SUPERV::CNode_out aNode , SUPERV::GraphEvent & anEvent , SUPERV::GraphState & aState ) ; - virtual long EventQSize() ; + virtual CORBA::Long EventQSize() ; - virtual long SubGraphsNumber() ; - virtual SUPERV::ListOfNodes * SubGraphsNodes( const long aSubGraphNumber ) ; + virtual CORBA::Long SubGraphsNumber() ; + virtual SUPERV::ListOfNodes * SubGraphsNodes( CORBA::Long aSubGraphNumber ) ; virtual bool Merge(const SUPERV::Graph_ptr aGraph ) ; virtual bool Merge(const SUPERV::Graph_ptr aGraph , map< string , int > & aMapOfNodes ) ; diff --git a/src/Supervision/Link_Impl.cxx b/src/Supervision/Link_Impl.cxx index cf36025..ed09d8e 100644 --- a/src/Supervision/Link_Impl.cxx +++ b/src/Supervision/Link_Impl.cxx @@ -217,18 +217,18 @@ GraphBase::SLink * Link_Impl::Info() { return RetVal ; } -long Link_Impl::CoordsSize() { +CORBA::Long Link_Impl::CoordsSize() { // beginService( "Link_Impl::CoordsSize" ) ; - long RetVal = _DataFlowEditor->GetLinkCoordSize( _DataFlowOutNode->Name() , + CORBA::Long RetVal = _DataFlowEditor->GetLinkCoordSize( _DataFlowOutNode->Name() , _OutputParameterName , _DataFlowNode->Name() , _InputParameterName ) ; // endService( "Link_Impl::CoordsSize" ); return RetVal ; } -bool Link_Impl::AddCoord( const long index , - const long X , - const long Y ) { +bool Link_Impl::AddCoord( CORBA::Long index , + CORBA::Long X , + CORBA::Long Y ) { // beginService( "Link_Impl::AddCoord" ) ; bool RetVal = _DataFlowEditor->AddLinkCoord( _DataFlowOutNode->Name() , _OutputParameterName , @@ -238,9 +238,9 @@ bool Link_Impl::AddCoord( const long index , // endService( "Link_Impl::AddCoord" ); return RetVal ; } -bool Link_Impl::ChangeCoord( const long index , - const long X , - const long Y ) { +bool Link_Impl::ChangeCoord( CORBA::Long index , + CORBA::Long X , + CORBA::Long Y ) { // beginService( "Link_Impl::ChangeCoord" ) ; bool RetVal = _DataFlowEditor->ChangeLinkCoord( _DataFlowOutNode->Name() , _OutputParameterName , @@ -250,7 +250,7 @@ bool Link_Impl::ChangeCoord( const long index , // endService( "Link_Impl::ChangeCoord" ); return RetVal ; } -bool Link_Impl::RemoveCoord( const long index ) { +bool Link_Impl::RemoveCoord( CORBA::Long index ) { // beginService( "Link_Impl::RemoveCoord" ) ; bool RetVal = _DataFlowEditor->RemoveLinkCoord( _DataFlowOutNode->Name() , _OutputParameterName , @@ -260,7 +260,7 @@ bool Link_Impl::RemoveCoord( const long index ) { // endService( "Link_Impl::RemoveCoord" ); return RetVal ; } -bool Link_Impl::Coords( const long index , long & X , long & Y ) { +bool Link_Impl::Coords( CORBA::Long index , CORBA::Long & X , CORBA::Long & Y ) { // beginService( "Link_Impl::Coords" ) ; bool RetVal = _DataFlowEditor->GetLinkCoord( _DataFlowOutNode->Name() , _OutputParameterName , diff --git a/src/Supervision/Link_Impl.hxx b/src/Supervision/Link_Impl.hxx index 059cb6b..1f58e3a 100644 --- a/src/Supervision/Link_Impl.hxx +++ b/src/Supervision/Link_Impl.hxx @@ -98,15 +98,15 @@ class Link_Impl : public POA_SUPERV::Link , virtual GraphBase::SLink * Info() ; - virtual long CoordsSize() ; - virtual bool AddCoord( const long index , - const long X , - const long Y ) ; - virtual bool ChangeCoord( const long index , - const long X , - const long Y ) ; - virtual bool RemoveCoord( const long index ) ; - virtual bool Coords( const long index , long & X , long & Y ) ; + virtual CORBA::Long CoordsSize() ; + virtual bool AddCoord( CORBA::Long index , + CORBA::Long X , + CORBA::Long Y ) ; + virtual bool ChangeCoord( CORBA::Long index , + CORBA::Long X , + CORBA::Long Y ) ; + virtual bool RemoveCoord( CORBA::Long index ) ; + virtual bool Coords( CORBA::Long index , CORBA::Long & X , CORBA::Long & Y ) ; virtual bool IsValid(); // returns true if inPort() and outPort() are type-compatible diff --git a/src/Supervision/SUPERV_shared_modules.py b/src/Supervision/SUPERV_shared_modules.py index 77df1cd..4d520a4 100644 --- a/src/Supervision/SUPERV_shared_modules.py +++ b/src/Supervision/SUPERV_shared_modules.py @@ -1,3 +1,22 @@ +# 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/ +# """ """ diff --git a/src/Supervision/StreamGraph_Impl.cxx b/src/Supervision/StreamGraph_Impl.cxx index d123cf0..4999305 100644 --- a/src/Supervision/StreamGraph_Impl.cxx +++ b/src/Supervision/StreamGraph_Impl.cxx @@ -425,9 +425,9 @@ SUPERV::ListOfStreamLinks * StreamGraph_Impl::StreamLinks( GraphBase::ComputingN return ( RetVal._retn() ) ; } -bool StreamGraph_Impl::SetStreamParams( const long Timeout , +bool StreamGraph_Impl::SetStreamParams( CORBA::Long Timeout , const SUPERV::KindOfDataStreamTrace DataStreamTrace , - const double DeltaTime ) { + CORBA::Double DeltaTime ) { bool sts = false ; if ( !IsMacro() ) { sts = DataFlowEditor()->StreamGraph()->SetStreamParams( Timeout , DataStreamTrace , DeltaTime ) ; @@ -438,17 +438,17 @@ bool StreamGraph_Impl::SetStreamParams( const long Timeout , return sts ; } -void StreamGraph_Impl::StreamParams( long & Timeout , +void StreamGraph_Impl::StreamParams( CORBA::Long & Timeout , SUPERV::KindOfDataStreamTrace & DataStreamTrace , - double & DeltaTime ) { + CORBA::Double & DeltaTime ) { if ( !IsMacro() ) { DataFlowEditor()->StreamGraph()->StreamParams( Timeout , DataStreamTrace , DeltaTime ) ; } } -long StreamGraph_Impl::SubStreamGraphsNumber() { +CORBA::Long StreamGraph_Impl::SubStreamGraphsNumber() { // beginService( "StreamGraph_Impl::StreamGraphsNumber" ); - long RetVal = 0 ; + CORBA::Long RetVal = 0 ; if ( DataFlowEditor()->IsExecutable() && !IsMacro() ) { RetVal = DataFlowEditor()->SubStreamGraphsNumber() ; } @@ -456,7 +456,7 @@ long StreamGraph_Impl::SubStreamGraphsNumber() { return RetVal ; } -SUPERV::ListOfNodes * StreamGraph_Impl::SubStreamGraphsNodes( const long aSubStreamGraphNumber ) { +SUPERV::ListOfNodes * StreamGraph_Impl::SubStreamGraphsNodes( CORBA::Long aSubStreamGraphNumber ) { beginService( "StreamGraph_Impl::SubStreamGraphsNodes" ); SUPERV::ListOfNodes_var RetVal = new SUPERV::ListOfNodes ; if ( DataFlowEditor()->IsEditing() && !IsMacro() ) { @@ -566,9 +566,9 @@ bool StreamGraph_Impl::StreamMerge(const SUPERV::StreamGraph_ptr aStreamGraph ) //cout << "Graph_Impl::StreamMerge " << aLinkFromNodeName << "(" << OutPort->Name() << ") ---> " // << aLinkToNodeName << "(" << InPort->Name() << ") RetVal" << RetVal << endl ; if ( RetVal ) { - int j ; + CORBA::Long j ; for ( j = 1 ; j <= aLink->CoordsSize() ; j++ ) { - long X , Y ; + CORBA::Long X , Y ; RetVal = aLink->Coords( j , X , Y ) ; if ( !RetVal ) break ; diff --git a/src/Supervision/StreamGraph_Impl.hxx b/src/Supervision/StreamGraph_Impl.hxx index 58bca48..474a4e3 100644 --- a/src/Supervision/StreamGraph_Impl.hxx +++ b/src/Supervision/StreamGraph_Impl.hxx @@ -80,15 +80,15 @@ class StreamGraph_Impl : public POA_SUPERV::StreamGraph , virtual SUPERV::ListOfStreamLinks * StreamLinks( GraphBase::ComputingNode * aNode , const char * anInputParam ) ; - virtual bool SetStreamParams( const long Timeout , + virtual bool SetStreamParams( CORBA::Long Timeout , const SUPERV::KindOfDataStreamTrace DataStreamTrace , - const double DeltaTime ) ; - virtual void StreamParams( long & Timeout , + CORBA::Double DeltaTime ) ; + virtual void StreamParams( CORBA::Long & Timeout , SUPERV::KindOfDataStreamTrace & DataStreamTrace , - double & DeltaTime ) ; + CORBA::Double & DeltaTime ) ; - virtual long SubStreamGraphsNumber() ; - virtual SUPERV::ListOfNodes * SubStreamGraphsNodes( const long aSubStreamGraphNumber ) ; + virtual CORBA::Long SubStreamGraphsNumber() ; + virtual SUPERV::ListOfNodes * SubStreamGraphsNodes( CORBA::Long aSubStreamGraphNumber ) ; virtual SUPERV::Graph_ptr ToFlowGraph() ; diff --git a/src/Supervision/StreamPort_Impl.cxx b/src/Supervision/StreamPort_Impl.cxx index 9ca3891..4fb7a79 100644 --- a/src/Supervision/StreamPort_Impl.cxx +++ b/src/Supervision/StreamPort_Impl.cxx @@ -225,7 +225,7 @@ bool StreamPort_Impl::Params( SUPERV::KindOfSchema & aKindOfSchema , return RetVal ; } -bool StreamPort_Impl::SetNumberOfValues( const long aNumberOfValues ) { +bool StreamPort_Impl::SetNumberOfValues( CORBA::Long aNumberOfValues ) { // beginService( "StreamPort_Impl::SetNumberOfValues" ); bool RetVal = false ; if ( !IsInput() ) { @@ -241,9 +241,9 @@ bool StreamPort_Impl::SetNumberOfValues( const long aNumberOfValues ) { return RetVal ; } -long StreamPort_Impl::NumberOfValues() { +CORBA::Long StreamPort_Impl::NumberOfValues() { // beginService( "StreamPort_Impl::NumberOfValues" ); - long RetVal = -1 ; + CORBA::Long RetVal = -1 ; if ( !IsInput() ) { GraphBase::OutDataStreamPort * anOutStreamPort = (GraphBase::OutDataStreamPort * ) DataFlowPort() ; RetVal = anOutStreamPort->NumberOfValues() ; diff --git a/src/Supervision/StreamPort_Impl.hxx b/src/Supervision/StreamPort_Impl.hxx index f351535..2b00067 100644 --- a/src/Supervision/StreamPort_Impl.hxx +++ b/src/Supervision/StreamPort_Impl.hxx @@ -77,8 +77,8 @@ class StreamPort_Impl : public Port_Impl , SUPERV::KindOfInterpolation & aKindOfInterpolation , SUPERV::KindOfExtrapolation & aKindOfExtrapolation ) ; - virtual bool SetNumberOfValues( const long aNumberOfValues ) ; - virtual long NumberOfValues() ; + virtual bool SetNumberOfValues( CORBA::Long aNumberOfValues ) ; + virtual CORBA::Long NumberOfValues() ; } ; -- 2.39.2