-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
+# 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)
SUPERV_fr.xml \
SUPERV.config \
SUPERVCatalog.xml \
+SalomeApp.xml \
suspend-resume.gif \
Superv_tree_superv.png
+# 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=..
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@
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 :-)
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 \
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
-THIS IS SALOME - SUPERV VERSION: 3.2.0a2
+THIS IS SALOME - SUPERV VERSION: 3.2.0b1
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
+# 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 *-
#
+# 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 *-
#
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 ..; \
-# 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 =
EXAMPLE_RECURSIVE = NO
IMAGE_PATH = sources/
INPUT_FILTER =
+FILTER_PATTERNS =
FILTER_SOURCE_FILES = YES
+
#---------------------------------------------------------------------------
# configuration options related to source browsing
#---------------------------------------------------------------------------
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
#---------------------------------------------------------------------------
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 =
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
#---------------------------------------------------------------------------
PDF_HYPERLINKS = NO
USE_PDFLATEX = NO
LATEX_BATCHMODE = NO
+LATEX_HIDE_INDICES = NO
+
#---------------------------------------------------------------------------
# configuration options related to the RTF output
#---------------------------------------------------------------------------
RTF_HYPERLINKS = NO
RTF_STYLESHEET_FILE =
RTF_EXTENSIONS_FILE =
+
#---------------------------------------------------------------------------
# configuration options related to the man page output
#---------------------------------------------------------------------------
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
#---------------------------------------------------------------------------
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 =
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
#---------------------------------------------------------------------------
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 =
--- /dev/null
+</DIV>
+<DIV class="div-footer">
+Generated on $datetime for $projectname by <A href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></A> $doxygenversion</DIV>
+</BODY>
+</HTML>
</head>
<body>
-<center><table WIDTH="96%" >
-<tr>
-<td><a href="http://www.opencascade.com"><img src="sources/logocorp.gif" BORDER=0 height=46 width=122></a></td>
-
-
-<td>
-<div align=right><a href="http://www.opencascade.org/SALOME/"><img src="sources/application.gif" BORDER=0 height=46 width=108></a></div>
-</td>
-</tr>
-</table></center>
-
-
</body>
</html>
-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;
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;
margin-top : 2px;
margin-bottom : 2px
}
+
span.keyword { color: #008000 }
span.keywordtype { color: #604020 }
span.keywordflow { color: #e08000 }
-foldersTree = gFld("<b>SALOME v.3.2.0a2 </b>", "", "")
+foldersTree = gFld("<b>SALOME v.3.2.0b1 </b>", "", "")
insDoc(foldersTree, gLnk("Main Page", "", "main.html"))
aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))
<component-username>Supervisor</component-username>
<component-type>SUPERV</component-type>
<component-author>ARS</component-author>
- <component-version>3.2.0a2</component-version>
+ <component-version>3.2.0b1</component-version>
<component-comment>Supervisor component</component-comment>
<component-multistudy>1</component-multistudy>
<component-icone>ModuleSupervision.png</component-icone>
--- /dev/null
+<document>
+ <section name="SUPERV">
+ <!-- Major module parameters -->
+ <parameter name="name" value="Supervisor"/>
+ <parameter name="icon" value="ModuleSupervision.png"/>
+ </section>
+ <section name="resources">
+ <!-- Module resources -->
+ <parameter name="SUPERV" value="${SUPERV_ROOT_DIR}/share/salome/resources"/>
+ </section>
+</document>
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 ;
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") ;
}
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 ;
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 ;
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 ;
}
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 ;
} ;
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 ;
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 ;
~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 ) ;
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 ;
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() ;
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 ,
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 ,
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 ) ;
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
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 ) {
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 ) ;
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" ;
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" ;
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 ;
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 ;
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"
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 : {
if ( Result == NULL ) {
cdebug_out << "GraphExecutor::InNode::PyDynInvoke Node " << Name() << " " << method << " Error Result == NULL"
<< endl ;
+ PyErr_Print();
RetVal = false ;
}
else {
}
case CORBA::tk_objref : {
PyObject * ObjIor ;
- MyPyObjIorList = PyTuple_New( 1 ) ;
+ //MyPyObjIorList = PyTuple_New( 1 ) ;
if ( PyTuple_Check( Result ) ) {
ObjIor = PyTuple_GetItem( Result , i ) ;
}
<< " 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 ;
}
}
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 ;
}
Py_DECREF( ArgsList ) ;
}
+ fflush(stdout);
+ fflush(stderr);
+
#if 0
{
int i ;
+# 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
// 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 ) {
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 <--
}
}
}
// 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 ) {
QMap<QString, QString> 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;
+}
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);
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;
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 );
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 );
}
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);
}
//================================================================
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;
}
// Module : SUPERV
#include "SUPERVGUI_Information.h"
+#include "SUPERVGUI.h"
#include "CAM_Application.h"
#include "SUIT_Desktop.h"
#include <qgroupbox.h>
#include <qlayout.h>
-
/*!
Constructor
*/
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);
}
}
}
+ SUPERVGUI_Main::setModifiedFlag();
}
}
}
aSupMod->updateObjBrowser();
}
else MESSAGE("NULL Supervision module!");
-
+
+ SalomeApp_Application* app = (SalomeApp_Application*)(SUIT_Session::session()->activeApplication());
+ if(app) app->updateActions();
isIn = false;
return true;
}
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<SalomeApp_Application*>(SUIT_Session::session()->activeApplication());
+ if(app) {
+ SalomeApp_Study* study = dynamic_cast<SalomeApp_Study*>(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()
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);
}
QDialog::accept();
}
+
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
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) {
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
// 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();
aMain->addMacroNode( theNode );
else if ( theNode->IsLoop() || theNode->IsSwitch() )
aMain->addControlNode( theNode, SUPERV::CNode::_narrow( theEndNode ), true );
- else
+ else
aMain->addComputeNode( theNode );
aSupMod->nullifyInitialVF();
}
SUPERV_Strings getFunction();
void setFunction(SUPERV_Strings theStr);
-
+
public slots:
// load all functions from an XML file into internal structures
void loadFile();
void clickOnOk();
private:
+ bool myIsLoop; // mkr : PAL12236
+
SUPERVGUI_PythonEditPane* myEditPane;
SUPERVGUI_PythonEditPane* myInitPane;
SUPERVGUI_PythonEditPane* myMorePane;
msgid "TIT_BROWSENODE"
msgstr "Browse Node "
-msgid "BUT_APPLY"
-msgstr "Ok"
-
-msgid "BUT_CLOSE"
-msgstr "Close"
-
msgid "TIT_SETVALUE_PORT"
msgstr "Set Value"
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"
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" );
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 ) {
}
// 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() ;
}
// 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() ;
}
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() ;
}
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() ;
}
// 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 ) {
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 ) {
}
} ;
- 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 ) ;
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() ;
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 ) ;
virtual SUPERV::ControlState Control() ;
virtual void ControlClear() ;
- virtual long Thread() ;
+ virtual CORBA::Long Thread() ;
GraphExecutor::AutomatonState AutoState() ;
virtual bool SuspendDone() ;
virtual bool Resume() ;
- virtual long CpuUsed() ;
+ virtual CORBA::Long CpuUsed() ;
- virtual bool IsExecuting();
+ virtual CORBA::Boolean IsExecuting();
} ;
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() ) {
// 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() ;
}
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 ) ;
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() ;
}
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() ;
}
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() ) {
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 ;
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 ,
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 ) ;
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 ,
// 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 ,
// 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 ,
// 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 ,
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
+# 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/
+#
"""
"""
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 ) ;
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() ;
}
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() ) {
//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 ;
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() ;
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() ) {
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() ;
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() ;
} ;
