From: vsr Date: Fri, 14 May 2010 15:08:31 +0000 (+0000) Subject: Merge from V5_1_main 14/05/2010 X-Git-Tag: mergefrom_V5_1_main_14May10~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=43ac4bca0b3831bed6ba417dba4ee14e6d99680b;p=modules%2Fvisu.git Merge from V5_1_main 14/05/2010 --- diff --git a/Makefile.am b/Makefile.am index 8cd880ea..a33fca9e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Patrick GOLDBRONN (CEA) # Date : 28/06/2001 diff --git a/VISU_version.h.in b/VISU_version.h.in index 0ea0965a..82f367ce 100644 --- a/VISU_version.h.in +++ b/VISU_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,6 +19,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : VISU_version.h // Author : Vadim SANDLER // Module : SALOME diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 0b795445..8c38d3d2 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = unix cmake_files diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index 5f6d5f75..19064045 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = config_files diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index 170a21c9..281847bf 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am dist_admlocalm4_DATA = \ diff --git a/adm_local/unix/config_files/check_VISU.m4 b/adm_local/unix/config_files/check_VISU.m4 index 1fde1814..770279f2 100755 --- a/adm_local/unix/config_files/check_VISU.m4 +++ b/adm_local/unix/config_files/check_VISU.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE dnl dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,6 +19,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + ########################################################### # File : check_Visu.m4 # Author : Vadim SANDLER (OCN) diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index dba276dd..889320e0 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -24,6 +21,7 @@ # The following is to avoid PACKAGE_... env variable # redefinition compilation warnings # ============================================================ +# AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h diff --git a/bin/Makefile.am b/bin/Makefile.am index 15df8dbd..b6633307 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am # non-distributed files diff --git a/build_cmake b/build_cmake index 3a96af4f..43e9cdb8 100755 --- a/build_cmake +++ b/build_cmake @@ -1,8 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/build_cmake.bat b/build_cmake.bat index 2e01c285..e7ca5925 100644 --- a/build_cmake.bat +++ b/build_cmake.bat @@ -1,2 +1,20 @@ - +@REM Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +@REM +@REM This library is free software; you can redistribute it and/or +@REM modify it under the terms of the GNU Lesser General Public +@REM License as published by the Free Software Foundation; either +@REM version 2.1 of the License. +@REM +@REM This library is distributed in the hope that it will be useful, +@REM but WITHOUT ANY WARRANTY; without even the implied warranty of +@REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +@REM Lesser General Public License for more details. +@REM +@REM You should have received a copy of the GNU Lesser General Public +@REM License along with this library; if not, write to the Free Software +@REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +@REM +@REM See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +@REM + %PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --visu diff --git a/build_configure b/build_configure index a9d38bdc..8820f1cb 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -20,6 +20,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # Tool for updating list of .in file for the SALOME project # and regenerating configure script # Author : Marc Tajchman - CEA diff --git a/clean_configure b/clean_configure index f57f7b3b..36652087 100755 --- a/clean_configure +++ b/clean_configure @@ -1,8 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -20,6 +17,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + rm -rf autom4te.cache aclocal.m4 configure make_config find . -name "*~" -print -exec rm {} \; find . -name "*.pyc" -print -exec rm {} \; diff --git a/configure.ac b/configure.ac index e0080ef8..f67815fd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,13 +16,14 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # Author : Marc Tajchman (CEA) # Date : 28/06/2001 # Modified by : Patrick GOLDBRONN (CEA) # Modified by : Marc Tajchman (CEA) # Modified by : Mikhail Ponikarov (OCN) # -AC_INIT([Salome2 Project VISU module], [5.1.3], [webmaster.salome@opencascade.com], [SalomeVISU]) +AC_INIT([Salome2 Project VISU module], [5.1.4], [webmaster.salome@opencascade.com], [SalomeVISU]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -377,8 +375,10 @@ AC_OUTPUT([ \ doc/salome/gui/VISU/Makefile \ doc/salome/gui/VISU/doxyfile \ doc/salome/gui/VISU/doxyfile_idl \ + doc/salome/gui/VISU/static/header.html \ doc/salome/tui/Makefile \ doc/salome/tui/doxyfile \ + doc/salome/tui/static/header.html \ idl/Makefile \ resources/VISUCatalog.xml \ resources/Makefile \ @@ -386,8 +386,6 @@ AC_OUTPUT([ \ src/CONVERTOR/Makefile \ src/PIPELINE/Makefile \ src/OBJECT/Makefile \ - src/VVTK/Makefile \ - src/GUITOOLS/Makefile \ src/VISU_I/Makefile \ src/VISUGUI/Makefile \ src/VISU_SWIG/Makefile \ diff --git a/doc/Makefile.am b/doc/Makefile.am index 34a233c1..de721b61 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + SUBDIRS = salome usr_docs: diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am index 7e1ed335..04df9d8f 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # $Header$ # SUBDIRS = tui gui diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am index 85aabb8c..6fee2a4e 100644 --- a/doc/salome/gui/Makefile.am +++ b/doc/salome/gui/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # File : Makefile.am # Author : Vasily Rusyaev (Open Cascade NN) # Module : doc diff --git a/doc/salome/gui/VISU/Makefile.am b/doc/salome/gui/VISU/Makefile.am index 6f320dc9..86577d7e 100644 --- a/doc/salome/gui/VISU/Makefile.am +++ b/doc/salome/gui/VISU/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,13 +16,17 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # File : Makefile.am # Author : Vasily Rusyaev (Open Cascade NN) # Module : doc # include $(top_srcdir)/adm_local/unix/make_common_starter.am -EXTRA_DIST += images input static +EXTRA_DIST += images input static/footer.html static/doxygen.css + +guidocdir = $(docdir)/gui/VISU +guidoc_DATA = images/head.png usr_docs: doxyfile_idl doxyfile @echo "===========================================" ; \ diff --git a/doc/salome/gui/VISU/doxyfile.in b/doc/salome/gui/VISU/doxyfile.in index 010fa709..9d8dfd62 100755 --- a/doc/salome/gui/VISU/doxyfile.in +++ b/doc/salome/gui/VISU/doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -22,7 +22,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "Post-Pro Module Reference Manual v.@VERSION@" +PROJECT_NAME = "SALOME Post-Pro User's Guide" OUTPUT_DIRECTORY = . CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English @@ -48,9 +48,9 @@ EXAMPLE_PATH = #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = . -HTML_HEADER = @srcdir@/static/header.html +HTML_HEADER = @builddir@/static/header.html HTML_FOOTER = @srcdir@/static/footer.html -#HTML_STYLESHEET = @srcdir@/static/doxygen.css +HTML_STYLESHEET = @srcdir@/static/doxygen.css TOC_EXPAND = YES DISABLE_INDEX = NO GENERATE_TREEVIEW = YES diff --git a/doc/salome/gui/VISU/doxyfile_idl.in b/doc/salome/gui/VISU/doxyfile_idl.in index c9e84611..8f306271 100755 --- a/doc/salome/gui/VISU/doxyfile_idl.in +++ b/doc/salome/gui/VISU/doxyfile_idl.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -22,7 +22,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "Post-Pro Module Reference Manual v.@VERSION@" +PROJECT_NAME = "SALOME Post-Pro User's Guide" OUTPUT_DIRECTORY = . CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English @@ -108,9 +108,9 @@ RECURSIVE = NO #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = visugen_doc -HTML_HEADER = @srcdir@/static/header.html +HTML_HEADER = @builddir@/static/header.html HTML_FOOTER = @srcdir@/static/footer.html -#HTML_STYLESHEET = @srcdir@/static/doxygen.css +HTML_STYLESHEET = @srcdir@/static/doxygen.css TOC_EXPAND = YES DISABLE_INDEX = YES GENERATE_TREEVIEW = NO diff --git a/doc/salome/gui/VISU/images/animation.png b/doc/salome/gui/VISU/images/animation.png index 24518926..95965a24 100644 Binary files a/doc/salome/gui/VISU/images/animation.png and b/doc/salome/gui/VISU/images/animation.png differ diff --git a/doc/salome/gui/VISU/images/axis_bottom_left.png b/doc/salome/gui/VISU/images/axis_bottom_left.png new file mode 100644 index 00000000..97a9a279 Binary files /dev/null and b/doc/salome/gui/VISU/images/axis_bottom_left.png differ diff --git a/doc/salome/gui/VISU/images/axis_bottom_right.png b/doc/salome/gui/VISU/images/axis_bottom_right.png new file mode 100644 index 00000000..a7d1f156 Binary files /dev/null and b/doc/salome/gui/VISU/images/axis_bottom_right.png differ diff --git a/doc/salome/gui/VISU/images/createcurves.png b/doc/salome/gui/VISU/images/createcurves.png index 20b93a38..6ae91d76 100644 Binary files a/doc/salome/gui/VISU/images/createcurves.png and b/doc/salome/gui/VISU/images/createcurves.png differ diff --git a/doc/salome/gui/VISU/images/custom_point_marker.png b/doc/salome/gui/VISU/images/custom_point_marker.png new file mode 100755 index 00000000..29b2dd90 Binary files /dev/null and b/doc/salome/gui/VISU/images/custom_point_marker.png differ diff --git a/doc/salome/gui/VISU/images/exporttables1.png b/doc/salome/gui/VISU/images/exporttables1.png new file mode 100644 index 00000000..8f13bb00 Binary files /dev/null and b/doc/salome/gui/VISU/images/exporttables1.png differ diff --git a/doc/salome/gui/VISU/images/exporttables2.png b/doc/salome/gui/VISU/images/exporttables2.png new file mode 100644 index 00000000..07093b17 Binary files /dev/null and b/doc/salome/gui/VISU/images/exporttables2.png differ diff --git a/doc/salome/gui/VISU/images/head.png b/doc/salome/gui/VISU/images/head.png new file mode 100755 index 00000000..307d9ef9 Binary files /dev/null and b/doc/salome/gui/VISU/images/head.png differ diff --git a/doc/salome/gui/VISU/images/importtables.png b/doc/salome/gui/VISU/images/importtables.png new file mode 100644 index 00000000..8b903c2b Binary files /dev/null and b/doc/salome/gui/VISU/images/importtables.png differ diff --git a/doc/salome/gui/VISU/images/point_marker_dlg1.png b/doc/salome/gui/VISU/images/point_marker_dlg1.png new file mode 100755 index 00000000..9bcecefc Binary files /dev/null and b/doc/salome/gui/VISU/images/point_marker_dlg1.png differ diff --git a/doc/salome/gui/VISU/images/point_marker_dlg2.png b/doc/salome/gui/VISU/images/point_marker_dlg2.png new file mode 100755 index 00000000..3a67294c Binary files /dev/null and b/doc/salome/gui/VISU/images/point_marker_dlg2.png differ diff --git a/doc/salome/gui/VISU/images/std_point_marker.png b/doc/salome/gui/VISU/images/std_point_marker.png new file mode 100755 index 00000000..f35b0df7 Binary files /dev/null and b/doc/salome/gui/VISU/images/std_point_marker.png differ diff --git a/doc/salome/gui/VISU/images/viewtable.png b/doc/salome/gui/VISU/images/viewtable.png index 13a0e5da..697cdd31 100644 Binary files a/doc/salome/gui/VISU/images/viewtable.png and b/doc/salome/gui/VISU/images/viewtable.png differ diff --git a/doc/salome/gui/VISU/input/3d_management.doc b/doc/salome/gui/VISU/input/3d_management.doc index 962f0d57..2b54a0cd 100755 --- a/doc/salome/gui/VISU/input/3d_management.doc +++ b/doc/salome/gui/VISU/input/3d_management.doc @@ -38,6 +38,8 @@ module are: presentations on fields.
  • \subpage evolution_page - tracing of temporal evolution of a variable at a given point.
    • +
  • \subpage point_marker_page - allows to change the representation +of points, using standard or custom markers.
  • \subpage translate_presentation_page - displacement of presentations in the viewer.
  • \subpage recording_page - allows to dump user actions in an AVI diff --git a/doc/salome/gui/VISU/input/3d_presentations.doc b/doc/salome/gui/VISU/input/3d_presentations.doc index 701400df..694582d7 100755 --- a/doc/salome/gui/VISU/input/3d_presentations.doc +++ b/doc/salome/gui/VISU/input/3d_presentations.doc @@ -14,6 +14,6 @@ presentations can be seen only in Salome VTK Viewer (ALT+K). Created presentations can be edited, animaded, recorded and viewed in -different modes. The whole range of such operations is described in \subpage a3d_management_page "Managing 3D Presentations" section. +different modes. The whole range of such operations is described in \ref a3d_management_page "Managing 3D Presentations" section. */ diff --git a/doc/salome/gui/VISU/input/animating.doc b/doc/salome/gui/VISU/input/animating.doc index 09afa84c..02ad4ba3 100644 --- a/doc/salome/gui/VISU/input/animating.doc +++ b/doc/salome/gui/VISU/input/animating.doc @@ -112,6 +112,11 @@ cycled animation of your presentation. your animation with proportional periods of time between every frame (not depending on the time stamps).

    +Time stamp frequency spin box: this option is available if +Save animation to AVI file mode is turned on. It provides a +possibility to capture only timestamps with indices divisible by the +specified frequency, that allows to generate less voluminous films. +

    Clean memory at each frame - this option allows to optimize the performance of the operation. diff --git a/doc/salome/gui/VISU/input/creating_curves.doc b/doc/salome/gui/VISU/input/creating_curves.doc index 040eb240..71c6d5d0 100644 --- a/doc/salome/gui/VISU/input/creating_curves.doc +++ b/doc/salome/gui/VISU/input/creating_curves.doc @@ -24,12 +24,22 @@ the data table by checking them in the \b Axis part of the dialog box: The column \b Assigned allows to represent the values assigned to the -points of the curve (possible for V-rows only). Any row, even +points of the curve (possible for V- and V2-rows only). Any row, even coinciding with the current or empty (no values assigned), can be represented. All values are indicated with tool tips over the corresponding curve points in the Plot2d viewer. diff --git a/doc/salome/gui/VISU/input/importing_exporting_tables_page.doc b/doc/salome/gui/VISU/input/importing_exporting_tables_page.doc index 84de7c94..9b9a4fd1 100644 --- a/doc/salome/gui/VISU/input/importing_exporting_tables_page.doc +++ b/doc/salome/gui/VISU/input/importing_exporting_tables_page.doc @@ -10,10 +10,14 @@ select Table from File item.
  • From the following standard dialog box: -\image html importtablefromfile.png +\image html importtables.png + +choose the necessary *.txt, *.tab or *.csv file containing tables and +click \b Open button. + +Checkbox "Use first string as title" is checked if it is needed to use +information from first string of file as titles of columns of table. -choose the necessary *.txt or *.tab file containing tables and -click \b Open button.
  • In the Object Browser \b Post-Pro will create a new folder having @@ -30,7 +34,13 @@ tables.
    • contain your exported table, and click \b OK button. Your table will be exported. -\image html exporttable.png +You can perform export table to *.txt or *.tab file + +\image html exporttables1.png + +Or you can perform export table to *.csv file + +\image html exporttables2.png diff --git a/doc/salome/gui/VISU/input/index.doc b/doc/salome/gui/VISU/input/index.doc index c82f4977..f6da3fe9 100644 --- a/doc/salome/gui/VISU/input/index.doc +++ b/doc/salome/gui/VISU/input/index.doc @@ -13,6 +13,7 @@ A MED file contains the description of a \subpage med_object_page "MED object", \subpage table_presentations_page "Data Table Objects", two-dimensional data arrays, as input type for visualization. -\n The Python interface of \b Post-Pro module is described in \subpage idl_interface_page "Access to Post-Pro module functionality" page. +\n The Python interface of \b Post-Pro module is described in \subpage +idl_interface_page "Access to Post-Pro module functionality" page. */ diff --git a/doc/salome/gui/VISU/input/point_marker.doc b/doc/salome/gui/VISU/input/point_marker.doc new file mode 100644 index 00000000..efd0bcd9 --- /dev/null +++ b/doc/salome/gui/VISU/input/point_marker.doc @@ -0,0 +1,56 @@ +/*! + +\page point_marker_page Point Marker + +\n You can change the representation of points in +the 3D viewer either by selecting one of the predefined +shapes or by loading a custom texture from an external file. + +- Standard point markers + +The Post-Pro module provides a set of predefined point marker shapes +which can be used to display points in 3D viewer. +Each standard point marker has two attributes: type (defines shape +form) and scale factor (defines shape size). + +\image html point_marker_dlg1.png + +
    + +\image html std_point_marker.png "Presentation with standard point markers" + +- Custom point markers + +It is also possible to load a point marker shape from an external file. +This file should provide a description of the point texture as a set +of lines; each line is represented as sequence of "0" and "1" symbols, +where "1" symbol means an opaque pixel and "0" symbol means a +transparent pixel. The width of the texture correspond to the length +of the longest line in the file, expanded to the nearest byte-aligned +value. The height of the texture is equal to the number of non-empty +lines in the file. Note that missing symbols are replaced by "0". + +Here is a texture file sample: + +
    +00111100
+00111100
+11111111
+11111111
+11111111
+11111111
+00111100
+00111100
+
    + +\image html point_marker_dlg2.png + +
    + +\image html custom_point_marker.png "Presentation with custom point markers" + + +Our TUI Scripts provide you with \subpage tui_point_marker_page script. + +*/ + diff --git a/doc/salome/gui/VISU/input/table_presentations.doc b/doc/salome/gui/VISU/input/table_presentations.doc index 82dc0c96..44a153bf 100644 --- a/doc/salome/gui/VISU/input/table_presentations.doc +++ b/doc/salome/gui/VISU/input/table_presentations.doc @@ -27,6 +27,26 @@ in the context menu. \image html viewtable.png +When the Enable editing option is checked, contents of the table +are editable. +\note At the current moment this mode allows to sort table data only. +Sorting is performed by clicking on header of the column, by which the data +has to be sorted. + +Sort policy option allows to specify how the empty cells will be processed +during the sort procedure. The following options are available: + + +Adjust Cells button allows to adjust size of the table cells according +to their contents. + It is also possible to create \subpage table_3d_page "Table 3D presentation" basing on the table data and display it in the VTK viewer. diff --git a/doc/salome/gui/VISU/input/tui_point_marker.doc b/doc/salome/gui/VISU/input/tui_point_marker.doc new file mode 100644 index 00000000..1199dc9a --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_point_marker.doc @@ -0,0 +1,48 @@ +/*! + +\page tui_point_marker_page Example of using Point Markers + +\code +import os +import time +import VISU +from visu_gui import * + +data_dir = os.getenv("DATA_DIR") +sleep_delay = 2 + +myViewManager = myVisu.GetViewManager(); + +myView = myViewManager.Create3DView() +myView.SetTitle("The viewer for Point Marker Example") +print "myViewManager.Create3DView()" + +medFile = "fra.med" +medFile = data_dir + '/MedFiles/' + medFile +myResult = myVisu.ImportFile(medFile) + +aMeshName ="LE VOLUME" +anEntity = VISU.NODE +aFieldName = "VITESSE"; +aTimeStampId = 1 + +aScalarMap = myVisu.ScalarMapOnField(myResult,aMeshName,anEntity,aFieldName,aTimeStampId) +myView.Display(aScalarMap); +myView.FitAll(); + +print "Set representation type to Point" +myView.SetPresentationType(aScalarMap, VISU.POINT) + +print "Set standard marker" +aScalarMap.SetMarkerStd(VISU.MT_PLUS, VISU.MS_25) +myView.Update() +time.sleep(sleep_delay) + +print "Set custom marker" +custom_texture = myVisu.LoadTexture(os.path.join(data_dir, "Textures", "texture1.dat")) +aScalarMap.SetMarkerTexture(custom_texture) +myView.Update() + +\endcode + +*/ diff --git a/doc/salome/gui/VISU/input/viewing_3d_presentations.doc b/doc/salome/gui/VISU/input/viewing_3d_presentations.doc index fb116a68..0ea0cecc 100644 --- a/doc/salome/gui/VISU/input/viewing_3d_presentations.doc +++ b/doc/salome/gui/VISU/input/viewing_3d_presentations.doc @@ -102,6 +102,8 @@ are visualized: as straight lines or as arcs of circle. shrink_factor.png - Edge Color - allows to set the color of lines representing the edges of the presentation displayed in SurfaceFrame mode. + - \ref point_marker_page "Point Marker" - allows to change the + representation of points. - \ref translate_presentation_page "Translate Presentation" - allows to translate the presentation along coordinate axes. diff --git a/doc/salome/gui/VISU/static/doxygen.css b/doc/salome/gui/VISU/static/doxygen.css index 88e613d2..eb9f3c6a 100755 --- a/doc/salome/gui/VISU/static/doxygen.css +++ b/doc/salome/gui/VISU/static/doxygen.css @@ -1,5 +1,35 @@ -H1 { +body { + font-family: Arial, Helvetica, sans-serif; + background-color: #ffffff; +} + +h1 { text-align: center; + text-decoration: none; + border: none; + line-height: 25px; + text-align: center; +// text-transform:uppercase; + background: #D9f4fd; + font-size: 12pt; + font-weight: bold; + border: 1px solid #CCCCCC; + -moz-border-radius: 8px; + -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15); +/* background-color: rgb(75, 140, 185); + color: #ffffff; + text-align: center; + height: 25px;*/ + +} + +h2 { + font-size: 12pt; + font-weight: bold; +} + +table { + font-size: 10pt; } CAPTION { @@ -11,16 +41,6 @@ A.qindex {} A.qindexRef {} -/* 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) */ @@ -37,7 +57,49 @@ A.codeRef { A:hover { text-decoration: none; - background-color: lightblue + background-color: lightblue; +} + +div.contents { + font-family: Arial, Helvetica, sans-serif; + font-size: 10pt; +} + +div.navpath { + font-size: 11pt; +} + +div.version { + background-color:#ffffde; + border:1px solid #cccccc; + font-family: Arial, Helvetica, sans-serif; + font-size: 9pt; + text-align: center; + width:100px; + -moz-border-radius: 8px; +// -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15); +} + +div.header { + background: url("head.png"); + background-color: #175783; + border: 1px solid; + height: 80px; + background-repeat: no-repeat; + margin-bottom: 10px; +} + +div.tabs { + display: none; +} + +div.footer { + background-color: #D9f4fd; + border: 1px solid #AAAAAA; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding: 10px; + margin-top: 15px; } DL.el { @@ -45,10 +107,8 @@ DL.el { } /* A code fragment (ex: header) */ -DIV.fragment { - width: 100%; +div.fragment { border: none; - background-color: #CCCCCC } /* In the alpha list (coumpound index), style of an alphabetical index letter */ @@ -94,10 +154,6 @@ DIV.groupText { font-size: smaller } -BODY { - background: #FFFFFF; -} - /*div.div-page { background-color: #FFFFFF; margin-left: 1em; @@ -168,3 +224,212 @@ span.comment { color: #800000 } span.preprocessor { color: #806020 } span.stringliteral { color: #002080 } span.charliteral { color: #008080 } + +/* @group Code Colorization */ + +.fragment { + font-family: monospace, fixed; + font-size: 10pt; +} + +pre.fragment { + width: 95%; + border: 1px solid #CCCCCC; + -moz-border-radius: 8px; + -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15); + background-color:#EEF3F5; + padding: 4px 6px; + margin: 4px 1px 4px 1px; +} + +/* Top Navigation style */ + +div.navigation { + margin-bottom:20px; +} + +/* Left navigation panel style */ + +body.ftvtree { + background-color: #D9f4fd; + margin: 10px; +} + +div.directory { + margin: 0; +} + +div.directory.p { + margin: 0; +} + +h3.swap { + font-size: 10pt; + margin-bottom: 0; +} + +/* Link to any cross-referenced Doxygen element */ +a.el { + text-decoration: none; + font-family: Arial, Helvetica, sans-serif; + font-weight: bold; + font-size: 9pt; + color: #551a8b; +} + +a.el:hover { + background-color: transparent; +} + +a.elRef { + font-weight: normal; +} + + +#MSearchBox { + -moz-border-radius:8px 8px 8px 8px; + background-color:white; + border:1px solid #84B0C7; + margin:0; + padding:0; + white-space:nowrap; +} + +div.directory img { + vertical-align:-30%; +} + +div.directory p { + white-space:nowrap; + margin: 0; +} + +div.directory-alt div { + display: none; + margin: 0px; +} + + +div.directory div { + display: none; + margin: 0px; +} + +div.version { + background-color:#ffffde; + border:1px solid #cccccc; + font-family: Arial, Helvetica, sans-serif; + font-size: 9pt; + text-align: center; + width:100px; + -moz-border-radius: 8px; +// -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15); +} + +/* @group Member Descriptions */ + +.mdescLeft, .mdescRight, +.memItemLeft, .memItemRight, +.memTemplItemLeft, .memTemplItemRight, .memTemplParams { + background-color: #FAFAFA; + border: none; + margin: 4px; + padding: 1px 0 0 8px; +} + +.mdescLeft, .mdescRight { + padding: 0px 8px 4px 8px; + color: #555; +} + +.memItemLeft, .memItemRight, .memTemplParams { + border-top: 1px solid #ccc; +} + +.memItemLeft, .memTemplItemLeft { + white-space: nowrap; +} + +.memTemplParams { + color: #606060; + white-space: nowrap; +} + +/* @end */ + +/* Styles for detailed member documentation */ + +.memtemplate { + font-size: 80%; + color: #606060; + font-weight: normal; + margin-left: 3px; +} + +.memnav { + background-color: #e8eef2; + border: 1px solid #84b0c7; + text-align: center; + margin: 2px; + margin-right: 15px; + padding: 2px; +} + +.memitem { + padding: 0; + margin-bottom: 10px; +} + +.memname { + white-space: nowrap; + font-weight: bold; +} + +.memproto, .memdoc { + border: 1px solid #84b0c7; +} + +.memproto { + padding: 0; + background-color: #d5e1e8; + font-weight: bold; + -webkit-border-top-left-radius: 8px; + -webkit-border-top-right-radius: 8px; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + -moz-border-radius-topleft: 8px; + -moz-border-radius-topright: 8px; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; + +} + + + +.memdoc { + padding: 2px 5px; + background-color: #eef3f5; + border-top-width: 0; + -webkit-border-bottom-left-radius: 8px; + -webkit-border-bottom-right-radius: 8px; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + -moz-border-radius-bottomleft: 8px; + -moz-border-radius-bottomright: 8px; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; +} + +.paramkey { + text-align: right; +} + +.paramtype { + white-space: nowrap; +} + +.paramname { + color: #602020; + white-space: nowrap; +} +.paramname em { + font-style: normal; +} + +/* @end */ diff --git a/doc/salome/gui/VISU/static/footer.html b/doc/salome/gui/VISU/static/footer.html index 6eab03cf..fdfb138c 100755 --- a/doc/salome/gui/VISU/static/footer.html +++ b/doc/salome/gui/VISU/static/footer.html @@ -3,10 +3,11 @@ -
    +
    -Copyright © 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
    +Copyright © 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
    Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
    +
    diff --git a/doc/salome/gui/VISU/static/header.html.in b/doc/salome/gui/VISU/static/header.html.in new file mode 100755 index 00000000..6795e96e --- /dev/null +++ b/doc/salome/gui/VISU/static/header.html.in @@ -0,0 +1,10 @@ + + + + + $title + + +
    +
    Version: @VERSION@
    + diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am index 5d522593..1a5a70e1 100644 --- a/doc/salome/tui/Makefile.am +++ b/doc/salome/tui/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,13 +16,18 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # File : Makefile.in # Author : Vasily Rusyaev (Open Cascade NN) # Module : doc # include $(top_srcdir)/adm_local/unix/make_common_starter.am -EXTRA_DIST += images static +EXTRA_DIST += images static/doxygen.css static/footer.html + +tuidocdir = $(docdir)/tui/VISU +tuidoc_DATA = images/head.png images/visuscreen.png + dev_docs: doxyfile echo "Running doxygen in directory: "`pwd`; \ diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in index b07d9949..10265e09 100755 --- a/doc/salome/tui/doxyfile.in +++ b/doc/salome/tui/doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -24,7 +24,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "Post-Pro Module Programming Guide v.@VERSION@" +PROJECT_NAME = "SALOME Post-Pro Developer" PROJECT_NUMBER = OUTPUT_DIRECTORY = VISU CREATE_SUBDIRS = NO @@ -99,8 +99,9 @@ WARN_LOGFILE = INPUT = @top_srcdir@/src \ @top_srcdir@/bin \ @top_srcdir@/idl \ - @top_builddir@/bin -FILE_PATTERNS = *.idl *.hxx *.cxx *.h *.c *.hh *.cc @DOXYGEN_PYTHON_EXTENSION@ + @top_builddir@/bin \ + @srcdir@/input +FILE_PATTERNS = *.idl *.hxx *.cxx *.h *.c *.hh *.cc @DOXYGEN_PYTHON_EXTENSION@ *.doc RECURSIVE = YES EXCLUDE = EXCLUDE_SYMLINKS = NO @@ -137,7 +138,7 @@ IGNORE_PREFIX = GENERATE_HTML = YES HTML_OUTPUT = . HTML_FILE_EXTENSION = .html -HTML_HEADER = @srcdir@/static/myheader.html +HTML_HEADER = @builddir@/static/header.html HTML_FOOTER = @srcdir@/static/footer.html HTML_STYLESHEET = @srcdir@/static/doxygen.css HTML_ALIGN_MEMBERS = YES diff --git a/doc/salome/tui/images/head.png b/doc/salome/tui/images/head.png new file mode 100755 index 00000000..307d9ef9 Binary files /dev/null and b/doc/salome/tui/images/head.png differ diff --git a/doc/salome/tui/images/visuscreen.png b/doc/salome/tui/images/visuscreen.png new file mode 100644 index 00000000..22e82419 Binary files /dev/null and b/doc/salome/tui/images/visuscreen.png differ diff --git a/doc/salome/tui/input/index.doc b/doc/salome/tui/input/index.doc new file mode 100644 index 00000000..18faad44 --- /dev/null +++ b/doc/salome/tui/input/index.doc @@ -0,0 +1,12 @@ +/*! \mainpage + +\image html visuscreen.png + +To browse the \b SALOME Post-Pro module Developer Documentation, follow the links below or use navigation menu at the top of the page: + + +*/ \ No newline at end of file diff --git a/doc/salome/tui/static/doxygen.css b/doc/salome/tui/static/doxygen.css index 88e613d2..d1f50022 100755 --- a/doc/salome/tui/static/doxygen.css +++ b/doc/salome/tui/static/doxygen.css @@ -1,5 +1,32 @@ -H1 { +body { + font-family: Arial, Helvetica, sans-serif; + background-color: #ffffff; +} + +h1 { text-align: center; + text-decoration: none; + border: none; + line-height: 25px; + text-align: center; +// text-transform:uppercase; + background: #D9f4fd; + font-size: 12pt; + font-weight: bold; + border: 1px solid #CCCCCC; + margin-top: 50px; + -moz-border-radius: 8px; + -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15); +} + +h2 { + font-size: 12pt; + font-weight: bold; +} + +table { + font-size: 10pt; + padding-left: 20px; } CAPTION { @@ -11,16 +38,6 @@ A.qindex {} A.qindexRef {} -/* 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) */ @@ -37,7 +54,53 @@ A.codeRef { A:hover { text-decoration: none; - background-color: lightblue + background-color: lightblue; +} + +div.contents { + font-family: Arial, Helvetica, sans-serif; + font-size: 10pt; + padding: 20px; +} + +div.navpath { + font-size: 11pt; +} + +div.header { + background: url("head.png"); + background-color: #175783; + border: 1px solid; + height: 80px; + background-repeat: no-repeat; + margin-bottom:20px; +} + +div.tabs { + text-align: justify; + margin-left : 2px; + margin-right : 2px; + margin-top : 2px; + margin-bottom : 2px + font-weight: bold; + color: #FFFFFF; +} + +div.footer { + background-color: #D9f4fd; + border: 1px solid #AAAAAA; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding: 10px; +} + +div.div-footer { + background-color: #D9f4fd; + border: 1px solid #AAAAAA; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding: 10px; + text-align: center; } DL.el { @@ -45,10 +108,8 @@ DL.el { } /* A code fragment (ex: header) */ -DIV.fragment { - width: 100%; +div.fragment { border: none; - background-color: #CCCCCC } /* In the alpha list (coumpound index), style of an alphabetical index letter */ @@ -94,10 +155,6 @@ DIV.groupText { font-size: smaller } -BODY { - background: #FFFFFF; -} - /*div.div-page { background-color: #FFFFFF; margin-left: 1em; @@ -125,17 +182,9 @@ div.tabs { 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; + background-color: #DDDDEE; font-weight: bold; padding-right : 10px; padding-top : 2px; @@ -149,7 +198,7 @@ TD.indexkey { /* In File List, Coumpound List, etc, 2nd column of the index */ TD.indexvalue { - background-color: #CCCCCC; + background-color: #EEEEFF; font-style: italic; padding-right : 10px; padding-top : 2px; @@ -168,3 +217,226 @@ span.comment { color: #800000 } span.preprocessor { color: #806020 } span.stringliteral { color: #002080 } span.charliteral { color: #008080 } + +/* @group Code Colorization */ + +.fragment { + font-family: monospace, fixed; + font-size: 10pt; +} + +pre.fragment { + width: 95%; + border: 1px solid #CCCCCC; + -moz-border-radius: 8px; + -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15); + background-color:#EEF3F5; + padding: 4px 6px; + margin: 20px; +} + +/* Top Navigation style */ + +div.navigation { + margin-bottom:20px; +} + +/* Left navigation panel style */ + +body.ftvtree { + background-color: #D9f4fd; + margin: 10px; +} + +div.directory { + margin: 0; +} + +div.directory.p { + margin: 0; +} + +h3.swap { + font-size: 10pt; + margin-bottom: 0; +} + +/* Link to any cross-referenced Doxygen element */ +a.el { + text-decoration: none; + font-family: Arial, Helvetica, sans-serif; + font-weight: bold; + font-size: 10pt; + color: #551a8b; +} + +a.el:hover { + background-color: transparent; + color: #551acc; +} + +a { +// text-decoration: none; + font-family: Arial, Helvetica, sans-serif; + font-weight: bold; + font-size: 10pt; + color: #551a8b; +} + +a:hover { + background-color: transparent; + color: #551acc; +} + +a.elRef { + font-weight: normal; +} + + +#MSearchBox { + -moz-border-radius:8px 8px 8px 8px; + background-color:white; + border:1px solid #84B0C7; + margin:0; + padding:0; + white-space:nowrap; +} + +div.directory img { + vertical-align:-30%; +} + +div.directory p { + white-space:nowrap; + margin: 0; +} + +div.directory-alt div { + display: none; + margin: 0px; +} + + +div.directory div { + display: none; + margin: 0px; +} + +div.version { + background-color:#ffffde; + border:1px solid #cccccc; + font-family: Arial, Helvetica, sans-serif; + font-size: 9pt; + text-align: center; + width:100px; + -moz-border-radius: 8px; + // -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15); +} + +/* @group Member Descriptions */ + +.mdescLeft, .mdescRight, +.memItemLeft, .memItemRight, +.memTemplItemLeft, .memTemplItemRight, .memTemplParams { + background-color: #FAFAFA; + border: none; + margin: 4px; + padding: 1px 0 0 8px; +} + +.mdescLeft, .mdescRight { + padding: 0px 8px 4px 8px; + color: #555; +} + +.memItemLeft, .memItemRight, .memTemplParams { + border-top: 1px solid #ccc; +} + +.memItemLeft, .memTemplItemLeft { + white-space: nowrap; +} + +.memTemplParams { + color: #606060; + white-space: nowrap; +} + +/* @end */ + +/* Styles for detailed member documentation */ + +.memtemplate { + font-size: 80%; + color: #606060; + font-weight: normal; + margin-left: 3px; +} + +.memnav { + background-color: #e8eef2; + border: 1px solid #84b0c7; + text-align: center; + margin: 2px; + margin-right: 15px; + padding: 2px; +} + +.memitem { + padding: 0; + margin-bottom: 10px; +} + +.memname { + white-space: nowrap; + font-weight: bold; +} + +.memproto, .memdoc { + border: 1px solid #84b0c7; +} + +.memproto { + padding: 0; + background-color: #d5e1e8; + font-weight: bold; + -webkit-border-top-left-radius: 8px; + -webkit-border-top-right-radius: 8px; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + -moz-border-radius-topleft: 8px; + -moz-border-radius-topright: 8px; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; + +} + + + +.memdoc { + padding: 2px 5px; + background-color: #eef3f5; + border-top-width: 0; + -webkit-border-bottom-left-radius: 8px; + -webkit-border-bottom-right-radius: 8px; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + -moz-border-radius-bottomleft: 8px; + -moz-border-radius-bottomright: 8px; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; +} + +.paramkey { + text-align: right; +} + +.paramtype { + white-space: nowrap; +} + +.paramname { + color: #602020; + white-space: nowrap; +} +.paramname em { + font-style: normal; +} + +/* @end */ diff --git a/doc/salome/tui/static/footer.html b/doc/salome/tui/static/footer.html index cb55f397..53f5a62f 100755 --- a/doc/salome/tui/static/footer.html +++ b/doc/salome/tui/static/footer.html @@ -1,5 +1,14 @@ - -
    -Generated on $datetime for $projectname by doxygen $doxygenversion
    - - + + + + + +
    + +
    +Copyright © 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
    +Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
    +
    +
    + + diff --git a/doc/salome/tui/static/header.html.in b/doc/salome/tui/static/header.html.in new file mode 100755 index 00000000..791a37c5 --- /dev/null +++ b/doc/salome/tui/static/header.html.in @@ -0,0 +1,14 @@ + + + + + + $title + + + + +
    +
    Version: @VERSION@
    + + diff --git a/idl/Makefile.am b/idl/Makefile.am index 28f4db67..cb47e69a 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # This Makefile is responsible of generating the client and server # implementation of IDL interfaces for both C++ and python usage. # The building process of the C++ files is in charge of each source diff --git a/idl/VISU_Gen.idl b/idl/VISU_Gen.idl index 8946a982..58d40368 100644 --- a/idl/VISU_Gen.idl +++ b/idl/VISU_Gen.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -19,6 +19,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : VISU_Gen.idl // Author : Alexey Petrov // @@ -74,10 +75,66 @@ module VISU { NODE, /*!< Node corresponds to a geometrical point. */ EDGE, /*!< Edge corresponds to a geometrical line connecting two points. */ FACE, /*!< Face corresponds to a geometrical plane bounded by several lines. */ - CELL, /*!< Cell is a volumic element of a mesh */ + CELL, /*!< Cell is a volumic element of a mesh */ NONE /*!< Indicates undefined entity value */ }; + /*! + * Marker type (used for point rendering) + */ + enum MarkerType { + MT_NONE, + MT_POINT, + MT_PLUS, + MT_STAR, + MT_O, + MT_X, + MT_O_POINT, + MT_O_PLUS, + MT_O_STAR, + MT_O_X, + MT_USER + }; + + /*! + * Marker scale (used for point rendering) + */ + enum MarkerScale { + MS_NONE, + MS_10, + MS_15, + MS_20, + MS_25, + MS_30, + MS_35, + MS_40, + MS_45, + MS_50, + MS_55, + MS_60, + MS_65, + MS_70 + }; + + /*! + * Tables' sort order + */ + enum SortOrder { + AscendingOrder, /*!< The table items are sorted ascending */ + DescendingOrder /*!< The table items are sorted descending */ + }; + + /*! + * Tables' sort policy (specifies how empty cells are taken into account when sorting) + */ + enum SortPolicy { + EmptyLowest, /*!< Empty cells are considered as lowest values */ + EmptyHighest, /*!< Empty cells are considered as highest values */ + EmptyFirst, /*!< Empty cells are always first */ + EmptyLast, /*!< Empty cells are always last */ + EmptyIgnore /*!< Empty cells are ignored (stay at initial positions) */ + }; + /*! * This enumeration contains a set of elements defining the type of the %VISU object. * This enumeration is used for navigation between a set of %VISU interfaces. @@ -307,6 +364,38 @@ module VISU { */ void GetOffset(out float theDx, out float theDy, out float theDz); + /*! + * Set standard point marker for the object + * \param theType standard marker type + * \param theScale standard marker scale + */ + void SetMarkerStd(in MarkerType theType, in MarkerScale theScale); + + /*! + * Set custom point marker for the object. The texture can be added + * by LoadTexture() function + * \param theTextureId texture ID + */ + void SetMarkerTexture(in long theTextureId); + + /*! + * Get type of the point marker assigned to the object + * \return current marker type (MT_NONE if no marker is set) + */ + MarkerType GetMarkerType(); + + /*! + * Get scale of the point marker assigned to the object + * \return current marker scale (MS_NONE if no marker is set) + */ + MarkerScale GetMarkerScale(); + + /*! + * Get texture idenifier of the point marker assigned to the object + * \return marker texture ID (0 if no marker set) + */ + long GetMarkerTexture(); + /*! * Gets memory size actually used by the presentation (Mb). */ @@ -1260,6 +1349,38 @@ module VISU { * \return Long value corresponding to the number of columns of the table */ long GetNbColumns(); + + /*! + * Sorts the specified row of the table. + * \param theRow Index of the row to sort + * \param theSortOrder Sort order (see SortOrder enumeration) + * \param theSortPolicy Sort policy (see SortPolicy enumeration) + */ + void SortRow(in long theRow, in SortOrder theSortOrder, in SortPolicy theSortPolicy); + + /*! + * Sorts the specified column of the table. + * \param theRow Index of the column to sort + * \param theSortOrder Sort order (see SortOrder enumeration) + * \param theSortPolicy Sort policy (see SortPolicy enumeration) + */ + void SortColumn(in long theColumn, in SortOrder theSortOrder, in SortPolicy theSortPolicy); + + /*! + * Sorts the table by the specified row. + * \param theRow Index of the row, by which the table has to be sort + * \param theSortOrder Sort order (see SortOrder enumeration) + * \param theSortPolicy Sort policy (see SortPolicy enumeration) + */ + void SortByRow(in long theRow, in SortOrder theSortOrder, in SortPolicy theSortPolicy); + + /*! + * Sorts the table by the specified column. + * \param theColumn Index of the column, by which the table has to be sort + * \param theSortOrder Sort order (see SortOrder enumeration) + * \param theSortPolicy Sort policy (see SortPolicy enumeration) + */ + void SortByColumn(in long theColumn, in SortOrder theSortOrder, in SortPolicy theSortPolicy); }; //------------------------------------------------------- @@ -1939,6 +2060,16 @@ module VISU { */ string setDumpFormat(in string theFormat); + /*! Set frequency of timestamps used to generate AVI file. + * \param theFrequency The frequency of timestamps to use. + */ + void setTimeStampFrequency(in long theFrequency); + + /*! Get frequency of timestamps used to generate AVI file. + * \return The frequency of timestamps to use. + */ + long getTimeStampFrequency(); + /*! Returns True, if the playback of the animation is cycling. */ boolean isCycling(); @@ -2167,9 +2298,10 @@ module VISU { ViewManager GetViewManager(); /*! - * Imports tables from a file and create TableAttribute in Sudy + * Imports tables from a file and create TableAttribute in Study */ - SALOMEDS::SObject ImportTables(in string theFileName); + SALOMEDS::SObject ImportTables(in string theFileName, + in boolean theFirstStrAsTitle); /*! * Export table to a file @@ -2408,8 +2540,8 @@ module VISU { /*! * Creates a curve on the basis of points, whose values are taken from the table. * \param theTable Table containing the data for construction of curves. - * \param HRow Index of the row in the table: abscissa of the point. - * \param VRow Index of the row in the table: ordinate of the point. + * \param theHRow Index of the row in the table: abscissa of the point. + * \param theVRow Index of the row in the table: ordinate of the point. */ Curve CreateCurve(in Table theTable, in long theHRow, in long theVRow); @@ -2417,12 +2549,25 @@ module VISU { * Creates a curve on the basis of points, whose values are taken from the table. * Each point has also assigned value, that will be shown as tooltip in Plot2d * \param theTable Table containing the data for construction of curves. - * \param HRow Index of the row in the table: abscissa of the point. - * \param VRow Index of the row in the table: ordinate of the point. - * \param ZRow Index of the row in the table: assigned value (so-called as Z). + * \param theHRow Index of the row in the table: abscissa of the point. + * \param theVRow Index of the row in the table: ordinate of the point. + * \param theZRow Index of the row in the table: assigned value (so-called as Z). */ Curve CreateCurveWithZ( in Table theTable, in long theHRow, in long theVRow, in long theZRow ); + /*! + * Creates a curve on the basis of points, whose values are taken from the table. + * Each point has also assigned value, that will be shown as tooltip in Plot2d. + * The curve can be displayed using right axis of Plot2d view. + * \param theTable Table containing the data for construction of curves. + * \param theHRow Index of the row in the table: abscissa of the point. + * \param theVRow Index of the row in the table: ordinate of the point. + * \param theZRow Index of the row in the table: assigned value (so-called as Z). + * \param theIsV2 Flag allowed to display the curve using right axis of Plot2d view. + */ + Curve CreateCurveWithZExt( in Table theTable, in long theHRow, in long theVRow, in long theZRow, + in boolean theIsV2 ); + /*! * Creates a presentation form containing an array of references to the curves. */ @@ -2491,6 +2636,12 @@ module VISU { in string theMeshName, in double_array theTStamps ); + /*! + * Load texture from file + * \param theTextureFile texture file name + * \return unique texture identifier + */ + long LoadTexture(in string theTextureFile); }; /*! \brief %View interface diff --git a/resources/Makefile.am b/resources/Makefile.am index c9ae4291..5ea587cb 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,8 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# $Header$ -# + include $(top_srcdir)/adm_local/unix/make_common_starter.am # @@ -58,14 +54,10 @@ Visu_import_med.png \ Visu_isosurfaces.png \ Visu_load_texture.png \ Visu_ok.png \ -Visu_PlaneSegmentation.png \ Visu_plot2d.png \ Visu_plot3d.png \ Visu_point_selection.png \ Visu_points.png \ -Visu_recording_pause.png \ -Visu_recording_play.png \ -Visu_recording_start.png \ Visu_recording_stop.png \ Visu_remove.png \ Visu_sameas.png \ @@ -82,7 +74,6 @@ Visu_selectioncell.png \ Visu_selectionedge.png \ Visu_selectionpoint.png \ Visu_selectonly.png \ -Visu_SphereSegmentation.png \ Visu_streamlines.png \ Visu_surface.png \ Visu_tree_container.png \ @@ -117,7 +108,6 @@ Visu_tree_vectors_gr.png \ Visu_tree_vectors.png \ Visu_tree_visu.png \ Visu_vectors.png \ -Visu_vvtk_switch.png \ Visu_wireframe.png \ Visu_slider_more.png \ Visu_slider_avi.png \ diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml index e25cb85c..74dc330c 100644 --- a/resources/SalomeApp.xml +++ b/resources/SalomeApp.xml @@ -1,5 +1,5 @@ + + + + + + + @@ -63,6 +70,10 @@ + + + + @@ -113,6 +124,8 @@ + + diff --git a/resources/VISUCatalog.xml.in b/resources/VISUCatalog.xml.in index 3668d1f0..f1cff94e 100644 --- a/resources/VISUCatalog.xml.in +++ b/resources/VISUCatalog.xml.in @@ -1,6 +1,6 @@