From: vsr Date: Thu, 9 Aug 2012 10:11:50 +0000 (+0000) Subject: Merge from V6_main_20120808 08Aug12 X-Git-Tag: mergefrom_V6_main_20120808_08Aug12 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c188b10fa9d871f25af8bae51f773c0290e8a91e;p=modules%2Fvisu.git Merge from V6_main_20120808 08Aug12 --- diff --git a/Makefile.am b/Makefile.am index 6bc65dd3..aa6c4da9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,24 +1,22 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 +# 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 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. # -# 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 # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Patrick GOLDBRONN (CEA) # Date : 28/06/2001 @@ -33,7 +31,7 @@ ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ SUBDIRS = adm_local idl resources src doc bin -DISTCLEANFILES = a.out aclocal.m4 configure +DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh hack_libtool adm_local/unix/config_files/config.guess adm_local/unix/config_files/config.sub adm_local/unix/config_files/depcomp adm_local/unix/config_files/install-sh adm_local/unix/config_files/libtool.m4 adm_local/unix/config_files/ltmain.sh adm_local/unix/config_files/ltoptions.m4 adm_local/unix/config_files/ltsugar.m4 adm_local/unix/config_files/ltversion.m4 adm_local/unix/config_files/lt~obsolete.m4 adm_local/unix/config_files/missing adm_local/unix/config_files/py-compile salomeinclude_DATA = VISU_version.h diff --git a/VISU_version.h.in b/VISU_version.h.in index 0ea0965a..1ebfe375 100644 --- a/VISU_version.h.in +++ b/VISU_version.h.in @@ -1,24 +1,25 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2012 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) 2003-2007 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 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. +// 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 +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : VISU_version.h // Author : Vadim SANDLER // Module : SALOME @@ -32,5 +33,6 @@ #define VISU_VERSION_STR "@VERSION@" #define VISU_VERSION @XVERSION@ +#define VISU_DEVELOPMENT @VERSION_DEV@ #endif // __VISU_VERSION_H__ diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 9bca392c..6d9ac170 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,24 +1,22 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 +# 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 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. # -# 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 # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am -SUBDIRS = unix \ No newline at end of file +SUBDIRS = unix cmake_files diff --git a/adm_local/cmake_files/FindVISU.cmake b/adm_local/cmake_files/FindVISU.cmake new file mode 100644 index 00000000..4b1a6284 --- /dev/null +++ b/adm_local/cmake_files/FindVISU.cmake @@ -0,0 +1,26 @@ +# Copyright (C) 2007-2012 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 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +SET(VISU_CXXFLAGS -I${VISU_ROOT_DIR}/include/salome) +SET(VISU_LDFLAGS -L${VISU_ROOT_DIR}/lib/salome) + +FIND_LIBRARY(SalomeIDLVISU SalomeIDLVISU ${VISU_ROOT_DIR}/lib/salome) diff --git a/adm_local/cmake_files/Makefile.am b/adm_local/cmake_files/Makefile.am new file mode 100644 index 00000000..31ae07ca --- /dev/null +++ b/adm_local/cmake_files/Makefile.am @@ -0,0 +1,25 @@ +# Copyright (C) 2007-2012 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 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +dist_admlocal_cmake_DATA = \ +FindVISU.cmake diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index 5f6d5f75..0d5ee76b 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,24 +1,22 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 +# 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 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. # -# 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 # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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..2411b62e 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,24 +1,22 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 +# 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 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. # -# 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 # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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..5566101b 100755 --- a/adm_local/unix/config_files/check_VISU.m4 +++ b/adm_local/unix/config_files/check_VISU.m4 @@ -1,24 +1,25 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +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 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 ae95b7df..5475c949 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,24 +1,30 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 +# 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 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. # -# 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 # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + +# ============================================================ +# 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 + # ============================================================ # This file defines the common definitions used in several # Makefile. This file must be included, if needed, by the file @@ -49,6 +55,9 @@ admlocaldir = $(prefix)/adm_local admlocalunixdir = $(admlocaldir)/unix admlocalm4dir = $(admlocaldir)/unix/config_files +# Directory for install cmake files +admlocal_cmakedir = $(admlocaldir)/cmake_files + # Shared modules installation directory sharedpkgpythondir = $(salomepythondir)/shared_modules diff --git a/bin/Makefile.am b/bin/Makefile.am index 15df8dbd..64ec0dd6 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,24 +1,22 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 +# 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 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. # -# 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 # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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/bin/VERSION.in b/bin/VERSION.in index 334c3a64..1ba13587 100755 --- a/bin/VERSION.in +++ b/bin/VERSION.in @@ -1 +1,3 @@ -THIS IS SALOME - VISU VERSION: @VERSION@ +[SALOME VISU] : @VERSION@ +[DEVELOPMENT] : @VERSION_DEV@ +[DESCRIPTION] : SALOME Post-Processing module diff --git a/build_cmake b/build_cmake new file mode 100755 index 00000000..2b051c79 --- /dev/null +++ b/build_cmake @@ -0,0 +1,27 @@ +#!/bin/sh +# Copyright (C) 2007-2012 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 +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +CURRENT_DIR=`pwd` +CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` +cd ${CONF_DIR} +python $KERNEL_ROOT_DIR/salome_adm/cmake_files/am2cmake.py --visu +status=$? +cd ${CURRENT_DIR} +exit $status diff --git a/build_cmake.bat b/build_cmake.bat new file mode 100644 index 00000000..27a44a57 --- /dev/null +++ b/build_cmake.bat @@ -0,0 +1,20 @@ +@REM Copyright (C) 2007-2012 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 0ece669e..b20b5116 100755 --- a/build_configure +++ b/build_configure @@ -1,25 +1,26 @@ #!/bin/bash -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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) 2003-2007 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 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. +# 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 +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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 @@ -51,28 +52,15 @@ fi cd ${CONF_DIR} ABS_CONF_DIR=`pwd` -mkdir -p salome_adm/unix/config_files -#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/* salome_adm/unix/config_files -#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/pythonbe.py salome_adm/unix - -# remove KERNEL deprecated configure files -#for deprecated in ac_cc_warnings.m4 ac_cxx_partial_specialization.m4 \ -# check_mico.m4 config.guess ltmain.sh ac_cxx_bool.m4 ltconfig \ -# ac_cxx_typename.m4 check_pthreads.m4 config.sub libtool.m4 ac_cxx_mutable.m4 -#do -# rm salome_adm/unix/config_files/${deprecated} -#done - -cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix - # ____________________________________________________________________ # aclocal creates the aclocal.m4 file from the standard macro and the -# custom macro embedded in the directory salome_adm/unix/config_files -# and KERNEL config_files directory. +# custom macro embedded in the directory adm_local/unix/config_files +# KERNEL salome_adm/unix/config_files, GUI and MED adm_local/unix/config_files +# directories. # output: # aclocal.m4 # autom4te.cache (directory) -echo "====================================================== aclocal" +echo "======================================================= aclocal" aclocal -I adm_local/unix/config_files \ -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ @@ -85,17 +73,13 @@ aclocal -I adm_local/unix/config_files \ # version. The files are created in the directory specified with the # AC_CONFIG_AUX_DIR() tag (see configure.ac). # output: -# salome_adm/unix/config_files/config.guess -# salome_adm/unix/config_files/config.sub -# salome_adm/unix/config_files/ltmain.sh -#echo "====================================================== libtoolize" +# adm_local/unix/config_files/config.guess +# adm_local/unix/config_files/config.sub +# adm_local/unix/config_files/ltmain.sh +echo "==================================================== libtoolize" libtoolize --force --copy --automake || exit 1 -# ____________________________________________________________________ -# make link to KERNEL configuration files to -#ln -sf ${KERNEL_ROOT_DIR}/salome_adm . - # ____________________________________________________________________ # autoconf creates the configure script from the file configure.ac (or # configure.in if configure.ac doesn't exist) @@ -112,11 +96,11 @@ autoconf # AC_CONFIG_AUX_DIR() tag (see configure.ac). This step also # creates the Makefile.in files from the Makefile.am files. # output: -# salome_adm/unix/config_files/compile -# salome_adm/unix/config_files/depcomp -# salome_adm/unix/config_files/install-sh -# salome_adm/unix/config_files/missing -# salome_adm/unix/config_files/py-compile +# adm_local/unix/config_files/compile +# adm_local/unix/config_files/depcomp +# adm_local/unix/config_files/install-sh +# adm_local/unix/config_files/missing +# adm_local/unix/config_files/py-compile # Makefile.in (from Makefile.am) echo "====================================================== automake" diff --git a/clean_configure b/clean_configure index f57f7b3b..1f4c3ce9 100755 --- a/clean_configure +++ b/clean_configure @@ -1,35 +1,28 @@ #!/bin/sh -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 +# 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 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. # -# 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 # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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 {} \; #exit # ==================== ON SORT AVANT -find bin -name Makefile.in | xargs rm -f -find doc -name Makefile.in | xargs rm -f -find idl -name Makefile.in | xargs rm -f -find resources -name Makefile.in | xargs rm -f -find salome_adm -name Makefile.in | xargs rm -f -find src -name Makefile.in | xargs rm -f -rm -f Makefile.in +find . -name Makefile.in | xargs rm -f +( cd adm_local/unix/config_files && rm -f config.* depcomp install-sh ltmain.sh missing py-compile ) diff --git a/configure.ac b/configure.ac index 02711d93..0ffd4122 100644 --- a/configure.ac +++ b/configure.ac @@ -1,38 +1,38 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 +# 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 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. # -# 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 # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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.0], [webmaster.salome@opencascade.com], [SalomeVISU]) -AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) +AC_INIT([Salome2 Project VISU module], [6.5.0], [webmaster.salome@opencascade.com], [SalomeVISU]) +AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([-Wno-portability]) XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` AC_SUBST(XVERSION) +VERSION_DEV=1 +AC_SUBST(VERSION_DEV) # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) MODULE_NAME=visu @@ -74,6 +74,7 @@ echo AC_PROG_MAKE_SET AC_PROG_INSTALL +AC_LOCAL_INSTALL dnl dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques ! @@ -95,7 +96,7 @@ dnl Fix up the INSTALL macro if it s a relative path. We want the dnl full-path to the binary instead. case "$INSTALL" in *install-sh*) - INSTALL='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/install-sh + INSTALL='\${KERNEL_ROOT_DIR}'/adm_local/unix/config_files/install-sh ;; esac @@ -135,7 +136,15 @@ dnl testing MPICH dnl --------------------------------------------- dnl -CHECK_MPICH +dnl CHECK_MPICH + +echo +echo --------------------------------------------- +echo testing MPI +echo --------------------------------------------- +echo + +CHECK_MPI echo echo --------------------------------------------- @@ -357,38 +366,51 @@ AC_OUTPUT_COMMANDS([ \ chmod +x ./bin/*; \ ]) +AC_HACK_LIBTOOL +AC_CONFIG_COMMANDS([hack_libtool],[ +sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\ + $(pwd)/hack_libtool \1 \"\$[@]\" \n\ +}\n\ +CC=\"hack_libtool\"%g" libtool +sed -i "s%\(\s*\)for searchdir in \$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path; do%\1searchdirs=\"\$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path\"\n\1for searchdir in \$searchdirs; do%g" libtool +sed -i "s%\(\s*\)searchdirs=\"\$newlib_search_path \$lib_search_path \(.*\)\"%\1searchdirs=\"\$newlib_search_path \$lib_search_path\"\n\1sss_beg=\"\"\n\1sss_end=\"\2\"%g" libtool +sed -i "s%\(\s*\)\(for searchdir in \$searchdirs; do\)%\1for sss in \$searchdirs; do\n\1 if ! test -d \$sss; then continue; fi\n\1 ssss=\$(cd \$sss; pwd)\n\1 if test \"\$ssss\" != \"\" \&\& test -d \$ssss; then\n\1 case \$ssss in\n\1 /usr/lib | /usr/lib64 ) ;;\n\1 * ) sss_beg=\"\$sss_beg \$ssss\" ;;\n\1 esac\n\1 fi\n\1done\n\1searchdirs=\"\$sss_beg \$sss_end\"\n\1\2%g" libtool +],[]) + # This list is initiated using autoscan and must be updated manually # when adding a new file .in to manage. When you execute # autoscan, the Makefile list is generated in the output file configure.scan. # This could be helpfull to update de configuration. AC_OUTPUT([ \ - ./salome_adm/unix/SALOMEconfig.h \ Makefile \ - ./VISU_version.h \ - ./adm_local/Makefile \ - ./adm_local/unix/Makefile \ - ./adm_local/unix/config_files/Makefile \ - ./bin/Makefile \ - ./bin/VERSION \ - ./doc/Makefile \ - ./doc/salome/Makefile \ - ./doc/salome/gui/Makefile \ - ./doc/salome/gui/VISU/Makefile \ - ./doc/salome/gui/VISU/doxyfile \ - ./doc/salome/gui/VISU/doxyfile_idl \ - ./doc/salome/tui/Makefile \ - ./doc/salome/tui/doxyfile \ - ./idl/Makefile \ - ./resources/VISUCatalog.xml \ - ./resources/Makefile \ - ./src/Makefile \ - ./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 \ - ./src/ENGINE/Makefile + VISU_version.h \ + adm_local/Makefile \ + adm_local/cmake_files/Makefile \ + adm_local/unix/Makefile \ + adm_local/unix/config_files/Makefile \ + bin/Makefile \ + bin/VERSION \ + doc/Makefile \ + doc/salome/Makefile \ + doc/salome/gui/Makefile \ + 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/gui/VISU/static/header_py.html \ + doc/salome/tui/Makefile \ + doc/salome/tui/doxyfile \ + doc/salome/tui/static/header.html \ + idl/Makefile \ + resources/VISUCatalog.xml \ + resources/SalomeApp.xml \ + resources/Makefile \ + src/Makefile \ + src/CONVERTOR/Makefile \ + src/PIPELINE/Makefile \ + src/OBJECT/Makefile \ + src/VISU_I/Makefile \ + src/VISUGUI/Makefile \ + src/VISU_SWIG/Makefile \ + src/ENGINE/Makefile ]) diff --git a/doc/Makefile.am b/doc/Makefile.am index 34a233c1..33f75b3b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,24 +1,22 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 +# 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 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. # -# 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 # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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..2c8ec67d 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -1,24 +1,22 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 +# 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 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. # -# 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 # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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..05321bf8 100644 --- a/doc/salome/gui/Makefile.am +++ b/doc/salome/gui/Makefile.am @@ -1,24 +1,22 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 +# 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 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. # -# 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 # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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..43656b0b 100644 --- a/doc/salome/gui/VISU/Makefile.am +++ b/doc/salome/gui/VISU/Makefile.am @@ -1,31 +1,32 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 +# 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 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. # -# 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 # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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 "===========================================" ; \ @@ -40,24 +41,26 @@ usr_docs: doxyfile_idl doxyfile docs: usr_docs clean-local: - @for filen in `find . -maxdepth 1` ; do \ + @for filen in `find . -maxdepth 1` ; do \ case $${filen} in \ - ./Makefile | ./doxyfile | ./doxyfile_idl ) ;; \ - . | .. ) ;; \ + ./Makefile* | ./doxyfile* | ./images | ./input | ./static ) ;; \ + . | .. | ./CVS ) ;; \ *) echo "Removing $${filen}" ; rm -rf $${filen} ;; \ esac ; \ done ; install-data-local: usr_docs - $(INSTALL) -d $(DESTDIR)$(docdir)/gui/VISU - @for filen in `find . -maxdepth 1` ; do \ + @if [ -e index.html ]; then \ + $(INSTALL) -d $(DESTDIR)$(docdir)/gui/VISU; \ + for filen in `find . -maxdepth 1` ; do \ case $${filen} in \ - ./Makefile | ./doxyfile | ./doxyfile_idl ) ;; \ - ./doxyfile.bak | ./doxyfile_idl.bak ) ;; \ - . | .. ) ;; \ + ./Makefile* | ./doxyfile* ) ;; \ + . | .. | ./static ) ;; \ *) echo "Installing $${filen}" ; cp -rp $${filen} $(DESTDIR)$(docdir)/gui/VISU ;; \ esac ; \ - done ; + done ; \ + cp -rp $(srcdir)/images/head.png $(DESTDIR)$(docdir)/gui/VISU/visugen_doc ; \ + fi uninstall-local: rm -rf $(DESTDIR)$(docdir)/gui/VISU diff --git a/doc/salome/gui/VISU/doxyfile.in b/doc/salome/gui/VISU/doxyfile.in index 010fa709..cf9480ca 100755 --- a/doc/salome/gui/VISU/doxyfile.in +++ b/doc/salome/gui/VISU/doxyfile.in @@ -1,28 +1,29 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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) 2003-2007 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 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. +# 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 +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + #--------------------------------------------------------------------------- # 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,14 +49,19 @@ 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 TREEVIEW_WIDTH = 300 +#--------------------------------------------------------------------------- +#SORT related options +#--------------------------------------------------------------------------- +SORT_GROUP_NAMES = NO + #--------------------------------------------------------------------------- #LaTeX related option #--------------------------------------------------------------------------- @@ -69,4 +75,6 @@ GENERATE_RTF = NO #--------------------------------------------------------------------------- #External reference options #--------------------------------------------------------------------------- -TAGFILES = visugen_doc.tag=visugen_doc +TAGFILES = visugen_doc.tag=../VISU/visugen_doc #rnv: 07.04.2011 Workaround for the doxygen 1.7.3: + #because it wrongly defines location of the html files for search. +SEARCHENGINE = YES \ No newline at end of file diff --git a/doc/salome/gui/VISU/doxyfile_idl.in b/doc/salome/gui/VISU/doxyfile_idl.in index c9e84611..b5df57ad 100755 --- a/doc/salome/gui/VISU/doxyfile_idl.in +++ b/doc/salome/gui/VISU/doxyfile_idl.in @@ -1,28 +1,29 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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) 2003-2007 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 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. +# 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 +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + #--------------------------------------------------------------------------- # 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 +109,9 @@ RECURSIVE = NO #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = visugen_doc -HTML_HEADER = @srcdir@/static/header.html +HTML_HEADER = @builddir@/static/header_py.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 @@ -142,6 +143,7 @@ CALL_GRAPH = NO GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES DOT_IMAGE_FORMAT = jpg +DOT_FONTNAME = Arial DOT_PATH = DOTFILE_DIRS = MAX_DOT_GRAPH_WIDTH = 1024 @@ -156,3 +158,4 @@ DOT_CLEANUP = YES #External reference options #--------------------------------------------------------------------------- GENERATE_TAGFILE = visugen_doc.tag +SEARCHENGINE = YES 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..bf178bf5 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/cutsegment.png b/doc/salome/gui/VISU/images/cutsegment.png new file mode 100644 index 00000000..c75bf7e7 Binary files /dev/null and b/doc/salome/gui/VISU/images/cutsegment.png differ diff --git a/doc/salome/gui/VISU/images/cutsegmenticon.jpg b/doc/salome/gui/VISU/images/cutsegmenticon.jpg new file mode 100755 index 00000000..fb551c90 Binary files /dev/null and b/doc/salome/gui/VISU/images/cutsegmenticon.jpg differ diff --git a/doc/salome/gui/VISU/images/cutsegmentprsnt.png b/doc/salome/gui/VISU/images/cutsegmentprsnt.png new file mode 100755 index 00000000..51cde704 Binary files /dev/null and b/doc/salome/gui/VISU/images/cutsegmentprsnt.png differ diff --git a/doc/salome/gui/VISU/images/evolution_context_menu.png b/doc/salome/gui/VISU/images/evolution_context_menu.png new file mode 100755 index 00000000..56af0bcb Binary files /dev/null and b/doc/salome/gui/VISU/images/evolution_context_menu.png differ diff --git a/doc/salome/gui/VISU/images/evolution_dialog.png b/doc/salome/gui/VISU/images/evolution_dialog.png new file mode 100755 index 00000000..90bf9b93 Binary files /dev/null and b/doc/salome/gui/VISU/images/evolution_dialog.png differ diff --git a/doc/salome/gui/VISU/images/evolution_restore.png b/doc/salome/gui/VISU/images/evolution_restore.png new file mode 100755 index 00000000..97029a97 Binary files /dev/null and b/doc/salome/gui/VISU/images/evolution_restore.png differ diff --git a/doc/salome/gui/VISU/images/evolution_result.png b/doc/salome/gui/VISU/images/evolution_result.png new file mode 100755 index 00000000..e3df7516 Binary files /dev/null and b/doc/salome/gui/VISU/images/evolution_result.png differ diff --git a/doc/salome/gui/VISU/images/exporttable.png b/doc/salome/gui/VISU/images/exporttable.png index edf5b574..59330631 100644 Binary files a/doc/salome/gui/VISU/images/exporttable.png and b/doc/salome/gui/VISU/images/exporttable.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/featureedgesprops.png b/doc/salome/gui/VISU/images/featureedgesprops.png new file mode 100755 index 00000000..13aa470f Binary files /dev/null and b/doc/salome/gui/VISU/images/featureedgesprops.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/importtablefromfile.png b/doc/salome/gui/VISU/images/importtablefromfile.png index 7f98fb1c..3b241366 100644 Binary files a/doc/salome/gui/VISU/images/importtablefromfile.png and b/doc/salome/gui/VISU/images/importtablefromfile.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/isosurfaces.png b/doc/salome/gui/VISU/images/isosurfaces.png index 358dc906..7b13173a 100644 Binary files a/doc/salome/gui/VISU/images/isosurfaces.png and b/doc/salome/gui/VISU/images/isosurfaces.png differ diff --git a/doc/salome/gui/VISU/images/line_width.png b/doc/salome/gui/VISU/images/line_width.png new file mode 100644 index 00000000..15e40a7d Binary files /dev/null and b/doc/salome/gui/VISU/images/line_width.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/point_marker_dlg3.png b/doc/salome/gui/VISU/images/point_marker_dlg3.png new file mode 100755 index 00000000..bec4a9a3 Binary files /dev/null and b/doc/salome/gui/VISU/images/point_marker_dlg3.png differ diff --git a/doc/salome/gui/VISU/images/point_sprite_marker.png b/doc/salome/gui/VISU/images/point_sprite_marker.png new file mode 100755 index 00000000..ea646309 Binary files /dev/null and b/doc/salome/gui/VISU/images/point_sprite_marker.png differ diff --git a/doc/salome/gui/VISU/images/ppref0.png b/doc/salome/gui/VISU/images/ppref0.png new file mode 100755 index 00000000..d984287a Binary files /dev/null and b/doc/salome/gui/VISU/images/ppref0.png differ diff --git a/doc/salome/gui/VISU/images/ppref1.png b/doc/salome/gui/VISU/images/ppref1.png new file mode 100755 index 00000000..45262f50 Binary files /dev/null and b/doc/salome/gui/VISU/images/ppref1.png differ diff --git a/doc/salome/gui/VISU/images/ppref2.png b/doc/salome/gui/VISU/images/ppref2.png new file mode 100755 index 00000000..caae528b Binary files /dev/null and b/doc/salome/gui/VISU/images/ppref2.png differ diff --git a/doc/salome/gui/VISU/images/ppref3.png b/doc/salome/gui/VISU/images/ppref3.png new file mode 100755 index 00000000..32e05f93 Binary files /dev/null and b/doc/salome/gui/VISU/images/ppref3.png differ diff --git a/doc/salome/gui/VISU/images/pref31.png b/doc/salome/gui/VISU/images/pref31.png new file mode 100755 index 00000000..86555668 Binary files /dev/null and b/doc/salome/gui/VISU/images/pref31.png differ diff --git a/doc/salome/gui/VISU/images/pref32.png b/doc/salome/gui/VISU/images/pref32.png new file mode 100755 index 00000000..efadf97f Binary files /dev/null and b/doc/salome/gui/VISU/images/pref32.png differ diff --git a/doc/salome/gui/VISU/images/pref33.png b/doc/salome/gui/VISU/images/pref33.png new file mode 100755 index 00000000..4a516496 Binary files /dev/null and b/doc/salome/gui/VISU/images/pref33.png differ diff --git a/doc/salome/gui/VISU/images/pref34.png b/doc/salome/gui/VISU/images/pref34.png new file mode 100755 index 00000000..515b09c4 Binary files /dev/null and b/doc/salome/gui/VISU/images/pref34.png differ diff --git a/doc/salome/gui/VISU/images/pref35.png b/doc/salome/gui/VISU/images/pref35.png new file mode 100755 index 00000000..77d73a09 Binary files /dev/null and b/doc/salome/gui/VISU/images/pref35.png differ diff --git a/doc/salome/gui/VISU/images/pref37.png b/doc/salome/gui/VISU/images/pref37.png new file mode 100755 index 00000000..ec0607c9 Binary files /dev/null and b/doc/salome/gui/VISU/images/pref37.png differ diff --git a/doc/salome/gui/VISU/images/quadratic.png b/doc/salome/gui/VISU/images/quadratic.png new file mode 100644 index 00000000..a3e6723b Binary files /dev/null and b/doc/salome/gui/VISU/images/quadratic.png differ diff --git a/doc/salome/gui/VISU/images/scalarbarproperties.png b/doc/salome/gui/VISU/images/scalarbarproperties.png index 318497db..9da29706 100644 Binary files a/doc/salome/gui/VISU/images/scalarbarproperties.png and b/doc/salome/gui/VISU/images/scalarbarproperties.png differ diff --git a/doc/salome/gui/VISU/images/shrink_factor.png b/doc/salome/gui/VISU/images/shrink_factor.png new file mode 100644 index 00000000..cbc4f953 Binary files /dev/null and b/doc/salome/gui/VISU/images/shrink_factor.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/values_labeling.png b/doc/salome/gui/VISU/images/values_labeling.png index 056b1f12..27c6a861 100644 Binary files a/doc/salome/gui/VISU/images/values_labeling.png and b/doc/salome/gui/VISU/images/values_labeling.png differ diff --git a/doc/salome/gui/VISU/images/viewing1.png b/doc/salome/gui/VISU/images/viewing1.png index 4a5450b8..bf55cb79 100755 Binary files a/doc/salome/gui/VISU/images/viewing1.png and b/doc/salome/gui/VISU/images/viewing1.png differ diff --git a/doc/salome/gui/VISU/images/viewing13.png b/doc/salome/gui/VISU/images/viewing13.png index 76bd8d54..934a7a0e 100755 Binary files a/doc/salome/gui/VISU/images/viewing13.png and b/doc/salome/gui/VISU/images/viewing13.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 6705d8f2..49e1776a 100755 --- a/doc/salome/gui/VISU/input/3d_management.doc +++ b/doc/salome/gui/VISU/input/3d_management.doc @@ -18,7 +18,7 @@ accessed from the Main menu View -> Windows
  • Object Browser - hides and displays the Object browser used for management of objects created or imported into Salome application
  • Python Console - hides and displays the Python console, -which is a window for Pytho0n interpreter.
    • +which is a window for Python interpreter.
  • \subpage slider_page - used for animation of presentations created on all timestamps of a field.
  • \subpage sweeping_page "Sweep" - used for pseudo-animation of presentations created on @@ -36,6 +36,10 @@ module are:
    • \subpage animating_page - another way of animation of 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 @@ -48,6 +52,5 @@ viewing the presentation.
    - */ diff --git a/doc/salome/gui/VISU/input/3d_presentations.doc b/doc/salome/gui/VISU/input/3d_presentations.doc index e5b70335..694582d7 100755 --- a/doc/salome/gui/VISU/input/3d_presentations.doc +++ b/doc/salome/gui/VISU/input/3d_presentations.doc @@ -4,7 +4,7 @@ \image html introduction.png "Example of a 3D presentation" -\b Post Pro module provides several types of 3D presentations, +\b Post-Pro module provides several types of 3D presentations, visualizing the structure of MED objects. All presentations can be seen only in Salome VTK Viewer (ALT+K). \n All presentation types could be divided in two main groups: @@ -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 3d_management_page "Managment of presentations" section. +different modes. The whole range of such operations is described in \ref a3d_management_page "Managing 3D Presentations" section. -*/ \ No newline at end of file +*/ diff --git a/doc/salome/gui/VISU/input/animating.doc b/doc/salome/gui/VISU/input/animating.doc index 09afa84c..896f01da 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, which allows to generate less voluminous films. +

    Clean memory at each frame - this option allows to optimize the performance of the operation. @@ -134,4 +139,7 @@ to study again you get another animation in the Object Browser. Publish to Study - saves your animation in the study and presents it in the Object Browser. +
    See Also a sample script of using +\ref tui_animation_page "Animation" via TUI. + */ diff --git a/doc/salome/gui/VISU/input/creating_curves.doc b/doc/salome/gui/VISU/input/creating_curves.doc index 040eb240..33919483 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:
    • \b H (horisontal) - the values of this column will correspond to X-coordinates of the curve.
      • -
    • \b V (vertical) - the values of this column will correspond to -Y-coordinates of the curve.
      • +
    • \b V (vertical left) - the values of this column will correspond to +Y-coordinates of the curve to be attached to the left vertical axis of +the Plot2d viewer.
      • +
    • \b V2 (vertical right) - the values of this column will correspond to +Y-coordinates of the curve to be attached to the right vertical axis of +the Plot2d viewer.
      • +\note If there are several curves attached both to the left and the right +vertical axes, they will be indicated by the following icons in the +legend: +\image html axis_bottom_left.png +
      +\image html axis_bottom_right.png
    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. @@ -62,7 +72,7 @@ be created automatically.
    • - - +
    See Also a sample TUI Script of +\ref tui_table_curves_page "Curves creation and displaying". */ diff --git a/doc/salome/gui/VISU/input/creating_plot2d.doc b/doc/salome/gui/VISU/input/creating_plot2d.doc index 1b2d275b..b829ac43 100755 --- a/doc/salome/gui/VISU/input/creating_plot2d.doc +++ b/doc/salome/gui/VISU/input/creating_plot2d.doc @@ -57,4 +57,8 @@ selected curve lines, will be displayed in the viewer: +See Also a sample script of +\ref tui_table_curves_page "Curves creation and displaying" via TUI. + + */ diff --git a/doc/salome/gui/VISU/input/cut_lines.doc b/doc/salome/gui/VISU/input/cut_lines.doc index a119a75f..49739925 100644 --- a/doc/salome/gui/VISU/input/cut_lines.doc +++ b/doc/salome/gui/VISU/input/cut_lines.doc @@ -77,10 +77,13 @@ the viewer: Tip: From Cut Lines presentation you can create a data table. This table will consist of the field scalar values located on each cut line of the constructed presentation (see also: -\ref creating_tables_from_cut_lines_page "Creating tables from Cut -Lines presentations"). After that your data table can be used for +\ref creating_tables_from_cut_lines "Creating tables from CutLines presentations"). +After that your data table can be used for construction of a 2d plot of curves based on the scalar values from the table (see also: \ref creating_curves_page "Creating curves" and \ref creating_plot2d_page "Creating Plot 2D presentation"). -*/ \ No newline at end of file +
    See Also a sample TUI Script of +\ref tui_cut_lines_page "Cut Lines" presentation operation. + +*/ diff --git a/doc/salome/gui/VISU/input/cut_planes.doc b/doc/salome/gui/VISU/input/cut_planes.doc index 8d5f9ccf..258683db 100644 --- a/doc/salome/gui/VISU/input/cut_planes.doc +++ b/doc/salome/gui/VISU/input/cut_planes.doc @@ -52,4 +52,7 @@ After you have finished with setting these parameters, click \b OK. Your presentation with scalar bar will be immediately displayed in the viewer. +
    See Also a sample TUI Script of +\ref tui_cut_planes_page "Cut Planes" presentation creation. + */ diff --git a/doc/salome/gui/VISU/input/cut_segment.doc b/doc/salome/gui/VISU/input/cut_segment.doc new file mode 100644 index 00000000..096e8961 --- /dev/null +++ b/doc/salome/gui/VISU/input/cut_segment.doc @@ -0,0 +1,69 @@ +/*! + +\page cut_segment_page Cut Segment presentation +\image html cutsegmentprsnt.png "Example of Cut Segment presentation" + +\n Cut Segment is a simplified variant of +\ref cut_lines_page "Cut Lines" presentation, displaying a single line +instead of a set of lines. The axis of this line is +defined by two points in a 3D space. + +To create a Cut Segment presentation: +\par +– Right-click on one of the time stamps of the field in the +Object browser and from the pop-up menu choose Cut Segment, or +\n – Click on one of the time stamps of the field in the Object +browser and select from the main menu Visualization > Cut +Segment, or click "Cut Segment" icon in the Visualization +Toolbar. + +\image html cutsegmenticon.jpg +
    "Cut Segment" icon
    + +\image html cutsegment.png + +\par +Cut Segment: this tab of the dialog box contains the +parameters of the cut segment. +
      +
    • Point 1 and Point 2 spin boxes allow to set the coordinates +of two points, defining an axis of the segment.
      • +
    • Show preview check box allows to edit the parameters of the +presentation and simultaneously observe the preview of this +presentation in the viewer.
      • +
    • Invert curve check box allows to invert the resulting +curve.
      • +
    • Use absolute length check box allows to see the real length +of the line, instead of [0,1] interval.
      • +
    • Generate Data Table: If this check box is marked, Post-Pro +will automatically generate a data table on the basis of your Cut +Segment presentation. This table will be created in the structure of the +study.
      • +
    • Generate Curve: If this check box is marked, Post Pro +will automatically generate curve line on the basis of values taken +from the generated data table. This curve will be created in the +structure of the study and can be visualized in a XY plot.
      • +
    +See more about table presentations and curve lines +\ref table_presentations_page "here". + +\par +Scalar Bar tab allows to define the parameters of the scalar bar +displayed with this presentation (\ref scalar_map_page "see also"). + +After you have finished with setting these parameters, click \b +OK. Your presentation with scalar bar will be immediately displayed in +the viewer: + +Tip: From Cut Segment presentation you can create a +data table. This table will consist of the field scalar values +located on the cut line of the constructed presentation. After that +your data table can be used for construction of a 2d plot +based on the scalar values from the table (see also: +\ref creating_curves_page "Creating curves" and +\ref creating_plot2d_page "Creating Plot 2D presentation"). + +
    See Also a sample TUI Script of +\ref tui_cut_segment_page "Cut Segment" presentation creation. + +*/ diff --git a/doc/salome/gui/VISU/input/deformed_shape.doc b/doc/salome/gui/VISU/input/deformed_shape.doc index 028397c1..88ceebcb 100644 --- a/doc/salome/gui/VISU/input/deformed_shape.doc +++ b/doc/salome/gui/VISU/input/deformed_shape.doc @@ -43,4 +43,7 @@ After you have finished with setting these parameters, click \b OK. Your presentation with scalar bar will be immediately displayed in the viewer. -*/ \ No newline at end of file +
    See Also a sample TUI Script of +\ref tui_def_shape_page "Deformed Shape" presentation creation. + +*/ diff --git a/doc/salome/gui/VISU/input/evolution.doc b/doc/salome/gui/VISU/input/evolution.doc new file mode 100644 index 00000000..bacaacd9 --- /dev/null +++ b/doc/salome/gui/VISU/input/evolution.doc @@ -0,0 +1,47 @@ +/*! + +\page evolution_page Evolution on Point + +Evolution on Point operation allows tracing the temporal evolution of a variable at a given point. +It can be activated via the context menu on a field: + +\image html evolution_context_menu.png + +The availability of this operation in the context menu depends on the following conditions: + +
      +
    • The selected field should be defined on the Node entity.
      • +
    • The selected field should have multiple time stamps.
      • +
    + +The following dialog will be displayed (if the VTK view is active, the preview actor is also displayed): + +\image html evolution_dialog.png + +
      +
    • Field - the name of the field given for information, it cannot be changed in the dialog.
      • +
    • Point - the point ID. It can be input manually or by +selection of the point in the viewer (note that the point selection +mode is turned on automatically by the Evolution on Point dialog).
      • +
    • Component - the name of the component (scalar mode). This control is +enabled if there are multiple components in the field data.
      • +
    + +Clicking OK button leads to the creation of Plot2d a view +with an Evolution graph: + +\image html evolution_result.png + +The X axis of the graph corresponds to the values of the time stamps, +the Y axis - to the value of the selected field component at the specified point. + +\note Evolution is automatically published to the study after clicking OK +button. It can be restored by selecting the Show action in the context +menu on the published object: + +\image html evolution_restore.png + +See Also a sample script of using +\ref tui_evolution_page "Evolution on Point" operation via TUI. + +*/ diff --git a/doc/salome/gui/VISU/input/field_presentations.doc b/doc/salome/gui/VISU/input/field_presentations.doc index 2755401b..45724ebf 100644 --- a/doc/salome/gui/VISU/input/field_presentations.doc +++ b/doc/salome/gui/VISU/input/field_presentations.doc @@ -8,6 +8,7 @@ presentations:
  • \subpage scalar_map_page
  • \subpage iso_surfaces_page
  • \subpage cut_lines_page
    • +
  • \subpage cut_segment_page
  • \subpage cut_planes_page
  • \subpage deformed_shape_page
  • \subpage vectors_page
    • diff --git a/doc/salome/gui/VISU/input/gauss_points_presentations.doc b/doc/salome/gui/VISU/input/gauss_points_presentations.doc index fe28655f..0f989d67 100644 --- a/doc/salome/gui/VISU/input/gauss_points_presentations.doc +++ b/doc/salome/gui/VISU/input/gauss_points_presentations.doc @@ -29,6 +29,7 @@ Now it is possible to choose the \subpage types_of_gauss_points_presentations_pa To exit the dialog and apply choices press \b OK button, or press \b CANCEL button to quit. +
    See Also a sample TUI Script of +\ref tui_gauss_points_page "Gauss Points presentations" creation. - -*/ \ No newline at end of file +*/ 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 94f9927a..42341571 100644 --- a/doc/salome/gui/VISU/input/importing_exporting_tables_page.doc +++ b/doc/salome/gui/VISU/input/importing_exporting_tables_page.doc @@ -10,15 +10,20 @@ 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. + +If the checkbox "Use first string as title" is on, the +information from the first string of the file is used as titles of +table columns. -choose the necessary *.xls, *.txt or *.tab file containing tables and -click \b Open button.
  • In the Object Browser \b Post-Pro will create a new folder having the name of the imported file. All tables from this file will be -located in this folder. One *.xls file can contain several +located in this folder. One input file can contain several tables.
    • @@ -30,9 +35,18 @@ tables. contain your exported table, and click \b OK button. Your table will be exported. -\image html exporttable.png +You can export table to *.txt or *.tab file + +\image html exporttables1.png + +Or you can export table to *.csv file + +\image html exporttables2.png -*/ \ No newline at end of file +See Also a sample script of +\ref tui_table_import_page "Import/Export" of tables via TUI. + +*/ diff --git a/doc/salome/gui/VISU/input/importing_med_objects.doc b/doc/salome/gui/VISU/input/importing_med_objects.doc index e6a53c31..e7a004b1 100644 --- a/doc/salome/gui/VISU/input/importing_med_objects.doc +++ b/doc/salome/gui/VISU/input/importing_med_objects.doc @@ -2,8 +2,9 @@ \page importing_med_objects_page Import/Export MED objects -\n There exist two sources of \ref structure_of_med_objects_page "MED objects": MED and other Salome -components publishing them and MED files. +There are two sources of \ref med_object_page "MED objects": +- MED and other SALOME components publishing them MED objects +- MED files To load MED objects from other components: \par @@ -87,4 +88,7 @@ path and change the name of the exported MED file: To complete file export click Save. -*/ \ No newline at end of file +
    See Also a sample script of +\ref tui_import_export_page "Import/Export" of MED objects via TUI. + +*/ diff --git a/doc/salome/gui/VISU/input/index.doc b/doc/salome/gui/VISU/input/index.doc index c82f4977..2eeed373 100644 --- a/doc/salome/gui/VISU/input/index.doc +++ b/doc/salome/gui/VISU/input/index.doc @@ -13,6 +13,10 @@ 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. +Post-Pro module preferences are described in the \subpage postpro_preferences_page section of SALOME Post-Pro Help. + +\n The Python interface of \b Post-Pro module is described in \subpage +idl_interface_page "Access to Post-Pro module functionality" page. +\n Sample Python scripts can be found in \subpage python_examples_page chapter. */ diff --git a/doc/salome/gui/VISU/input/iso_surfaces.doc b/doc/salome/gui/VISU/input/iso_surfaces.doc index a06f907e..fd391402 100644 --- a/doc/salome/gui/VISU/input/iso_surfaces.doc +++ b/doc/salome/gui/VISU/input/iso_surfaces.doc @@ -27,13 +27,15 @@ Surfaces, or click "Iso surfaces" icon in the
  • Iso Surface tab allows to set additional parameters of the Iso Surfaces presentation:
      • -
    • Number of surfaces, which will be generated in the framework of this presentation.
    • Minimum / Maximum value fields allow to enter the range of scalar or vector values applied to the cells, on the basis of which -this presentation will be created.
      • +this presentation will be created (note that these fields are editable +only if Use custom range button is checked, otherwise range of +the scalar bar values is used).
    • Update scalar bar range with these values button allows you to update the range of the values, displayed with by the scalar bar, with the previously defined range of values.
      • +
    • Number of surfaces, which will be generated in the framework of this presentation.
  • Scalar Bar tab allows to define the parameters of the scalar bar displayed with this presentation (\ref scalar_map_page "see also").
    • @@ -43,4 +45,7 @@ After you have finished with setting these parameters, click \b OK. Your presentation with scalar bar will be immediately displayed in the viewer. -*/ \ No newline at end of file +
    See Also a sample TUI Script of +\ref tui_iso_surf_page "Iso Surfaces presentation" creation. + +*/ diff --git a/doc/salome/gui/VISU/input/med_object.doc b/doc/salome/gui/VISU/input/med_object.doc index a6791f42..268bb51e 100755 --- a/doc/salome/gui/VISU/input/med_object.doc +++ b/doc/salome/gui/VISU/input/med_object.doc @@ -5,20 +5,20 @@ \b MED \b Object is a specific twofold data structure with consists of \b Mesh \b Data and \b Physical \b Data. -\b Mesh \b Data includes geometrical information: list of nodes, edges, faces and cells +- \b Mesh \b Data includes geometrical information: list of nodes, edges, faces and cells of the mesh, and information on the interpolation in accordance with resulting -elements, i.e. the mesh should be compatible with the chosen interpolation; -\b Physical \b Data contains initial and boundary conditions: scalar +elements, i.e. the mesh should be compatible with the chosen interpolation. +- \b Physical \b Data contains initial and boundary conditions: scalar or vector values applied to the mesh cells. -\n It is not possible to create and edit \b MED \b Objects in the \b +It is not possible to create and edit \b MED \b Objects in the \b Post-Pro module. You can only \subpage importing_med_objects_page "import a MED object" from Salome MED module or from a MED file. -\n \b MED Objects can be visualized and explored with various types of +\b MED Objects can be visualized and explored with various types of \subpage a3d_presentations_page "3D presentations". -\n \b Post-Pro visualization engine bases on VTK and OpenGL +\b Post-Pro visualization engine bases on VTK and OpenGL technologies, which provide useful tools for \subpage a3d_management_page "Management of presentations". @@ -33,7 +33,7 @@ containing three main folders: \ref families_anchor "Families",

    Families

    A \b Family is a user-defined submesh composed of cells of a -definite type - Nodes, Edges, Faces or Cells. The +definite type - Nodes, Edges, Faces or Cells. The presentation created on the basis of a particular \b family will be composed of geometrical elements, corresponding to the type of cells of this \b family. diff --git a/doc/salome/gui/VISU/input/plot_3d.doc b/doc/salome/gui/VISU/input/plot_3d.doc index 13809924..fe5ecbb9 100644 --- a/doc/salome/gui/VISU/input/plot_3d.doc +++ b/doc/salome/gui/VISU/input/plot_3d.doc @@ -59,4 +59,7 @@ bar displayed with this presentation (\ref scalar_map_page "see also"). After you have finished with setting these parameters, click \b OK. Your presentation will be immediately displayed in the viewer. -*/ \ No newline at end of file +
    See Also a sample TUI Script of +\ref tui_plot_3d_page "Plot 3D presentation" creation. + +*/ 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..081cfb0c --- /dev/null +++ b/doc/salome/gui/VISU/input/point_marker.doc @@ -0,0 +1,73 @@ +/*! + +\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 the 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" + +
    + +There is also an additional type of point marker - Point Sprite marker, +which allows to display points as OpenGL point sprites with predefined +shape and alpha mask. This marker is added to the end of the list of +standard markers. + +\note The Point Sprite marker is insensitive to scale factor parameter, +but it is possible to change its magnification by pressing "m" and "M" +(Shift + "m") buttons in the view, just like for Gauss Points presentation. + +\image html point_marker_dlg3.png + +
    + +\image html point_sprite_marker.png "Presentation with Point Sprite marker" + +- 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 a 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 corresponds 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" + +See Also a sample script of using +\ref tui_point_marker_page "Point Marker" functionality via TUI. + +*/ + diff --git a/doc/salome/gui/VISU/input/postpro_preferences.doc b/doc/salome/gui/VISU/input/postpro_preferences.doc new file mode 100644 index 00000000..3930ed8d --- /dev/null +++ b/doc/salome/gui/VISU/input/postpro_preferences.doc @@ -0,0 +1,396 @@ +/*! + +\page postpro_preferences_page Post-Pro Preferences + +In the Post-Pro module you can set preferences, default settings, +which can be used in later sessions with this module. + +

    General Preferences

    + +\image html ppref0.png + +
      +
    • Input fields precision
      • +
        +
      • Visual data precision - allows to adjust precision of scalar data displayed as text, data values round-up, various visualization options.
        • +
      • Length precision - allows to adjust input precision of coordinates and dimensions.
        • +
      • Angular precision - allows to adjust input precision of angles.
        • +
      • Length tolerance precision - allows to adjust input precision of tolerance of coordinates and dimensions.
        • +
      • Parametric precision - allows to adjust input precision of parametric values.
        • +
      • Memory size precision - allows to adjust input precision of memory size.
        • +
      +
    + +

    MED import Preferences

    + +\image html ppref1.png + +
      +
    • MED files import
      • +
        +
      • Use Build Progress - when this option is checked you can choose +all other import MED options at the moment of loading of each file +using Build Progress menu, otherwise the loading will be done +according to the Preferences without addressing to the +user.
        • +
      • Full MED Loading - when this option is checked, the MED file is +fully loaded in the study, and no additional access to the MED file is +needed during the session. Reversibly, when unchecked, the MED file is +loaded on demand. This is the default behaviour in SALOME and +recommended for big files to optimize memory usage.
        • +
      • Build at once - when this option is checked, you can't +perform any operations until the MED file is fully loaded and +processed.
        • +
      • Build fields - when this option is checked, the fields are +built automatically at loading.
        • +
      • Build min/max - when this option is checked, minimum and +maximum values of the time stamps are found at loading.
        • +
      • Build groups - when this option is checked, the groups and +families are built automatically at loading.
        • +
      • Close dialog at finish - when this option is checked, the +dialog box is closed after loading of the selected MED file. When +unchecked, it allows loading other MED files.
        • +
      +
    + +

    Scalar Bar Preferences

    + +\image html pref31.png + +
      +
    • Scalar Range
      • +
        +
      • Scalar Mode - this feature allows refining the value to be +inspected:
        • +
          +
        • Modulus: value of a scalar or modulus of a vector.
          • +
        • Component N: Nth component of a vector, a tensor or a matrix.
          • +
        +
      • Logarithmic Scaling - this checkbox toggles logarithmic +scaling.
        • +
      • Ranges to Use - you can use either Field Range or Imposed +Range.
        • +
      • Gauss Metric - gives the choice among Average, Minimum and Maximum. +
      +
    • Min and Max for Imposed Range - in this menu you can set +the limits for your Imposed Range, if you have chosen to use it.
      • +
    • Font - in this menu you can set type, face and color for +the font of Title and Labels.
      • +
    • Colors & Labels - in this menu you can set the number of +colors and the number of labels in the Scalar bar.
      • +
    • Orientation - here you can choose between vertical and horizontal +orientation of the Scalar Bar.
      • +
    • Scalar bars default position
      • +
        +
      • Arrange Scalar Bars - this option prevents superposition of +scalar bars during visualisation of several fields in the same +window. If checked, a separate scalar bar is displayed for each +presentation.
        • +
      +
    • Origin & Size Vertical & Horizontal - allows to define +placement and lookout of Scalar Bars and their labels.
      • +
        +
      • X: abscissa of the point of origin (from the left +side)
        • +
      • Y: ordinate of the origin of the bar (from the bottom)
        • +
      + +
    + +

    Cut Lines Preferences

    + +\image html ppref2.png + +
      +
    • CutLine Preferences
      • +
        +
      • Show preview check box allows to edit the parameters of the +presentation and simultaneously observe the preview of this +presentation in the viewer.
        • +
      • Invert all curves check box allows to invert the resulting +curves.
        • +
      • Use absolute length check box allows to use absolute length +for curves.
        • +
      • Generate Data Table: If this check box is marked, Post +Pro will automatically generate a data table on the basis of your +Cut Lines presentation. This table will be created in the structure of +the study.
        • +
      • Generate Curves: If this check box is marked, Post Pro will +automatically generate curve lines on the basis of values taken from +the generated data table. These curves will be created in the +structure of the study and can be visualized in a XY plot.
        • +
      +
    + +

    Stream Lines Preferences

    + +\image html pref32.png + +
      +
    • Stream Lines Preferences
      • +
        +
      • Used points - allows to define a default percentage +of points used for building the Stream Lines presentation.
        • +
      +
    + +

    Sweep and Animation Preferences

    + +\image html ppref3.png + + +
      +
    • 3D Cache - allow to define the mode of usage +and the size of the 3D Cache, which enables to save in RAM and quickly +restore the states of field animation (\b Sliding functionality).
      • +
        +
      • Memory Mode - allows to define the mode of usage +of the 3D Cache: Minimal actually disables the Cache, +Limited Cache size depends on the current system +configuration.
        • +
      • Memory Limit - allows to define the maximum size of the 3D +Cache
        • +
      + +
    • Animation preferences
      • +
        +
      • Speed - allows to define the speed of the animation.
        • +
      • Cycled animation - allows to start a cycled animation of the presentation.
        • +
      • Use proportional timing - allows to render the animation with proportional periods of time between every frame (not depending on the time stamps).
        • +
      • Clean memory at each frame - this option allows to optimize the performance of the operation.
        • +
      • Dump mode - this option allows to choose a mode of dumping +the animation process. Three modes are available: +
          +
        • No dump - disables dumping.
          • +
        • Save pictures to directory - dumps the animation +to set of pictures corresponding to each timestamp.
          • +
        • Save animation to AVI file - generates a movie that +reproduces the animation process.
          • +
        • +
      • Time stamp frequency - this option is available if +Save animation to AVI file mode is turned on. It provides a +possibility to capture only timestamps with indices divisable by the +specified frequency, that allows to generate less voluminous films.
        • +
      + +
    • Sweeping preferences
      • +
        +
      • Mode of the Sweeping - allows to choose between Linear, +Cosinusoidal and sinusoidal sweeping.
        • +
      • Time step - in this menu you can set the time of +representation of one step.
        • +
      • Number of cycles - in this menu you can define the number +of times this animation will be repeated.
        • +
      • Number of steps - in this menu you can define the number of +steps, which will compose the whole animation.
        • +
      • Parameter varies - allows to choose the range for the +parameter: from 0 to Pi or from Pi to -Pi.
        • +
      +
    + +

    Representation Preferences

    + +\image html pref33.png + +
      +
    • Representation properties - these checkboxes allow to +choose the default representation type for each field presentation.
      • +
        +
      • Floating Point Precision - allows defining the number +of digits displayed after the decimal point.
        • +
      • Representation of the 2D quadratic elements - allows +selecting lines or arcs for representation of quadratic elements.
        • +
      • Maximum Angle - maximum deviation angle used by the +application to build arcs.
        • +
      • Edge Color - allows selecting the color for representation +of edges.
        • +
      • Type of marker - allows to choose a shape of point markers.
        • +
      • Scale of marker - allows to choose a scale of point markers.
        • +
      • Use Shading - when this option is checked, the objects will +be displayed with shading.
        • +
      • Display only on creation - when this option is checked, all +previously created presentations will be automatically removed from +the viewer when a new presentation is created and displayed. You can +restore the previously created presentations using the Object +Browser.
        • +
      • Automatic Fit All - when this option is checked, the center +of the view is automatically chosen to represent all displayed objects +in the visible area.
        • +
      +
    + +

    Tables

    + +\image html pref35.png + +
      +
    • Enable editing
      • - allows to edit contents of the tables +(in particular, to sort table data by clicking on the column header). +
    • Sort policy
      • - specify how the empty cells will be processed +during the sort procedure. The following options are available: + +
        +
      • Empty cells are considered as lowest values
        • +
      • Empty cells are considered as highest values
        • +
      • Empty cells are always first
        • +
      • Empty cells are always last
        • +
      • Empty cells are ignored (means that positions of the empty cells +will not change after sorting)
        • +
      +
    + +

    Feature Edges

    + +\image html featureedgesprops.png + +These properties define which contours should be highlighted with +Feature Edges functionality. +
      +
    • Feature edges angle - allows to define at which minimum +angle between two faces a wire is considered an edge
      • +
    • Show feature edges - allows to display feature edges.
      • +
    • Show boundary edges - allows to display boundary edges.
      • +
    • Show manifold edges - allows to display manifold edges.
      • +
    • Show non-manifold edges - allows to display non-manifold edges.
      • +
    + + +

    Gauss Points Preferences

    + +\image html pref34.png + +
      +
    • Primitive - this menu allows user to choose the graphic +primitive to use to present the results at Gauss points in the +viewer.
      • +
        +
      • Primitive type - provides choice between Point +sprites, Open GL points and Geometrical Spheres.
        • +
      • Maximum Size (Clamp) - defines the maximum size of sprite +points ranging from 1 to 512. By default the value is set to 256 +pixels.
        • +
      • Main Texture - path to the Main Texture (16x16 +pixels) which defines the shape of the point sprite used for +rendering.
        • +
      • Alpha Channel Texture (16*16) - path to the Alpha +Channel Texture which defines the texture of the point +sprite.
        • +
      • Alpha Channel Threshold - defines the level of transparency +ranging from 0 to 1.
        • +
      • Geometrical Sphere Resolution - defines the number of faces +of Geometry Spheres.
        • +
      • Notify when number of faces exceeds - limitation of the +number of faces; the user will be warned if it exceeds the given +value.
        • +
      +
    + +
      +
    • Size - in this menu you can define:
      • +
        +
      • Range value for min and max size - these two parameters +will be respectively multiplied by a reference length (average size of +cells of the mesh) to define the range for minimum and maximum size of +a point during rendering (at magnification = 100%). Default values +are:
        • +
          +
        • Rainbow scale: min = 10%, max = +33%
          • +
            +
          • Min size is associated to the smallest real value (including +negative values).
            • +
          • Max size is associated to the largest real value.
            • +
          +
        • Bicolor scale: min = 0 (not editable), +max = 33%
          • +
            +
          • Null size is associated to the 0 scalar value.
            • +
          • Max size is associated to the largest absolute value.
            • +
          +
        +Both values are dynamically updated by the system according to the +selected scalar bar. In the case of a Bicolor scale, the minimum value +is set to 0 in the dialog and the control is disabled. +
      • Magnification (%) corresponds to the change of size of +results at Gauss point primitives in 2D space. Acceptable values range +from 0 to N; 100% means no magnification, 50% means half of its size, +200% mean twice its size and so forth. By default this value is set to +100%.
        • +
      • +/- Ratio corresponds to the number by which the +magnification will be respectively multiplied or divided at edition, +ranging from 0.01 to 10. By default this value is set to 2.
        • +
      +
    + +
      +
    • Geometry
      • +
        +
      • Size of points (%) defines a value that will be multiplied +by a reference length (representative of the average size of cells of +the mesh) to define the size of points during rendering (at +magnification = 100%). Default values 10%.
        • +
      • Color - allows to select the color of points used for +presentations. Click on the colored line to access to the Select Color dialog box.
        • +
      +
    + +
      +
    • Gauss Points Scalar Bar
      • +
        +
      • Active Bar - this option allows to choose Local or + Global Bar as active.
        • +
      • Display Global Bar - this option allows to visualize or to + hide the Global Bar.
        • +
      • Scalar Bar Mode - this option allows to choose between + Bicolor and Rainbow Scalar Bar Mode.
        • +
      • Spacing - allows to define Spacing from 0.01 to 1.
        • +
      +
    + +
      +
    • Spacemouse
      • +
        +
      • Decrease Gauss Points Magnification - divides the current +magnification by magnification ratio.
        • +
      • Increase Gauss Points Magnification - multiplies the +current magnification by magnification ratio.
        • +
      +
    + +

    Inside and Outside Cursor Preferences allow to set +Primitives, Size and Magnification for the +respective zones. + +

    Picking Preferences

    + +\image html pref37.png + +
      +
    • Cursor - allows to adjust the Size of the cursor used for +Picking (ranging from 0.1 to 1), the Height of the pyramids (ranging +from 0 to 10) and the Selection cursor color.
      • +
    • Tolerance - defines at which distance of the cursor from +the point it becomes selected (ranges from 0.001 to 10).
      • +
    • Information window - allows to define the +Transparency (from 0% = opaque to 100% = transparent) and +Position of the window, which can be:
      • +
      • +
      • Centred below the point, or
        • +
      • located at Top-left corner of the 3D view
        • +
      • +
    • Movement of the Camera can also be define by the user.
      • +
      • +
      • Zoom at first selected point - This value is used to define + the focal distance at the first selected point (at the end of the + movement of the camera). This value is a ratio that will be multiplied + by the current zoom value.
        • +
      • Number of steps between two positions - defines the + smoothness of camera movement at selection by the number of + iterations. If set to 1 the camera is zoomed and centered at the point + momentarily. Greater numbers mean very slow camera movement.
        • +
      • +
    • Display parent mesh element - allows to visualize or hide +the patent mesh element of the selected gauss point.
      • +
    + +*/ diff --git a/doc/salome/gui/VISU/input/presentation_of_submesh.doc b/doc/salome/gui/VISU/input/presentation_of_submesh.doc index e515cab2..c2660a1d 100644 --- a/doc/salome/gui/VISU/input/presentation_of_submesh.doc +++ b/doc/salome/gui/VISU/input/presentation_of_submesh.doc @@ -14,4 +14,7 @@ object and from the pop-up menu choose Create Presentation.

    This presentation will be displayed in the viewer. -*/ \ No newline at end of file +
    See Also a sample TUI Script of +\ref tui_submesh_page "Submesh presentation" creation. + +*/ diff --git a/doc/salome/gui/VISU/input/python_examples.doc b/doc/salome/gui/VISU/input/python_examples.doc new file mode 100644 index 00000000..e5837996 --- /dev/null +++ b/doc/salome/gui/VISU/input/python_examples.doc @@ -0,0 +1,42 @@ +python_examples_page + +/*! + +\page python_examples_page Examples of Python scripts + +By the links below you can find sample scripts for operations +provided by Post-Pro module. + +
      +
    • \subpage tui_import_export_page
      • +
    • \subpage tui_creating_3d_prs_page
      • +
        +
      • \ref tui_submesh_page
        • +
      • \ref tui_scalar_map_page
        • +
      • \ref tui_iso_surf_page
        • +
      • \ref tui_cut_planes_page
        • +
      • \ref tui_cut_lines_page
        • +
      • \ref tui_cut_segment_page
        • +
      • \ref tui_def_shape_page
        • +
      • \ref tui_def_shape_and_scalar_map_page
        • +
      • \ref tui_vectors_page
        • +
      • \ref tui_stream_lines_page
        • +
      • \ref tui_plot_3d_page
        • +
      • \ref tui_gauss_points_page
        • +
      +
    • \subpage tui_datatable_page
      • +
        +
      • \ref tui_table_import_page
        • +
      • \ref tui_table_3d_page
        • +
      • \ref tui_table_curves_page
        • +
      +
    • \subpage tui_manage_3d_prs_page
      • +
        +
      • \ref tui_view_3d_page
        • +
      • \ref tui_animation_page
        • +
      • \ref tui_evolution_page
        • +
      • \ref tui_point_marker_page
        • +
      +
    + +*/ \ No newline at end of file diff --git a/doc/salome/gui/VISU/input/scalar_map.doc b/doc/salome/gui/VISU/input/scalar_map.doc index 749ff40c..50ec7688 100644 --- a/doc/salome/gui/VISU/input/scalar_map.doc +++ b/doc/salome/gui/VISU/input/scalar_map.doc @@ -64,6 +64,11 @@ fields containing vector values, in other cases it will be inactive).
  • Logarithmic scaling check box: You can apply logarithmic scaling to the color scale of the presentation.
    • +
  • Gauss Metric field: This field allows to choose what kind +of value will be extracted from gauss points data. (Note: This field +is shown only for two presentation types - Scalar Map +and Deformed Shape and Scalar Map, and it is active only when +the result is based on multiple gauss points).
  • Use field range: if this check box is selected, all cells of the field presentation will be colored according the values applied to these cells.
    • @@ -172,4 +177,7 @@ OK. The presentation will be immediately displayed in the viewer: \image html scalar_map_on_cells.png "Scalar map on Cell Mesh" +See Also a sample TUI Script of +\ref tui_scalar_map_page "Scalar Map presentation" creation. + */ diff --git a/doc/salome/gui/VISU/input/scalar_map_on_deformed_shape.doc b/doc/salome/gui/VISU/input/scalar_map_on_deformed_shape.doc index f5fac0df..6a5064fc 100755 --- a/doc/salome/gui/VISU/input/scalar_map_on_deformed_shape.doc +++ b/doc/salome/gui/VISU/input/scalar_map_on_deformed_shape.doc @@ -45,4 +45,7 @@ You can compire result presentation with \ref scalar_map_page "Scalar Map" prese \image html scalar_map_on_cells.png "Example of Scalar Map presentation" -*/ \ No newline at end of file +See Also a sample TUI Script of +\ref tui_def_shape_and_scalar_map_page "Deformed Shape and Scalar Map presentation" creation. + +*/ diff --git a/doc/salome/gui/VISU/input/slider.doc b/doc/salome/gui/VISU/input/slider.doc index bf2f4cc3..811cb289 100755 --- a/doc/salome/gui/VISU/input/slider.doc +++ b/doc/salome/gui/VISU/input/slider.doc @@ -43,15 +43,13 @@ of the timestamps. \image html slider2.png \b Properties tab allows setting memory management properties. -
      -
    • \b Minimal radio button commands the application to use a minimum -amount of memory
      • -
    • \b Limited radio button allows to set the upper limit for the -amount of used memory.
      • -
    • \b Used and \b Free fields allow to set target values for used -and free memory.
      • -
    • \b Speed scroll allows to set the speed of the presentation.
      • -
        +- \b Minimal radio button commands the application to use a minimum + amount of memory +- \b Limited radio button allows to set the upper limit for the amount + of used memory +- \b Used and \b Free fields allow to set target values for used and + free memory. +- \b Speed scroll allows to set the speed of the presentation. -*/ \ No newline at end of file +*/ diff --git a/doc/salome/gui/VISU/input/stream_lines.doc b/doc/salome/gui/VISU/input/stream_lines.doc index b040a287..12a1a31b 100644 --- a/doc/salome/gui/VISU/input/stream_lines.doc +++ b/doc/salome/gui/VISU/input/stream_lines.doc @@ -79,6 +79,9 @@ displayed with this presentation (\ref scalar_map_page "see also"). After you have finished with setting these parameters, click \b OK. Your presentation with scalar bar will be immediately displayed in -the viewer: +the viewer. -*/ \ No newline at end of file +
        See Also a sample TUI Script of +\ref tui_stream_lines_page "Stream Lines presentation" creation. + +*/ diff --git a/doc/salome/gui/VISU/input/sweeping.doc b/doc/salome/gui/VISU/input/sweeping.doc index cd243d22..298c5a08 100644 --- a/doc/salome/gui/VISU/input/sweeping.doc +++ b/doc/salome/gui/VISU/input/sweeping.doc @@ -20,7 +20,7 @@ displaying the \em basic field presentation will end it. To sweep a field presentation: -\ref creating_field_presentations_page "Create a field presentation". +\ref field_presentations_page "Create a field presentation". In the Main menu select View -> Windows -> Sweep. The following dialog will appear. @@ -54,4 +54,4 @@ viewer and selecting \b Sweep in the context menu. Default parameters for \b Sweep can be set in the Main menu in File -> Preferences -> Post-Pro -> Sweep, Animation tab -*/ \ No newline at end of file +*/ diff --git a/doc/salome/gui/VISU/input/table_3d.doc b/doc/salome/gui/VISU/input/table_3d.doc index d389feed..38cf54b6 100644 --- a/doc/salome/gui/VISU/input/table_3d.doc +++ b/doc/salome/gui/VISU/input/table_3d.doc @@ -11,7 +11,7 @@ To successfully produce a Table 3D presentation, the table should not contain em To create a Table 3D presentation: \par -– Right-click on an XLS table in the +– Right-click on an table object in the Object browser and from the context menu choose Show, or Show only \image html table.png @@ -43,8 +43,9 @@ bar displayed with this presentation (\ref scalar_map_page "see also").
      It is also possible to choose \b Wireframe or \b Shading \b Representation type, change -such properties as \b Opacity and Line Width and Translate the presentation using the context menu. +such properties as \b Transparency and Line Width and Translate the presentation using the context menu. +
      See Also a sample TUI Script of +\ref tui_table_3d_page "Table 3D presentation creation". - -*/ \ No newline at end of file +*/ diff --git a/doc/salome/gui/VISU/input/table_presentations.doc b/doc/salome/gui/VISU/input/table_presentations.doc index ee162476..2e5f9b5c 100644 --- a/doc/salome/gui/VISU/input/table_presentations.doc +++ b/doc/salome/gui/VISU/input/table_presentations.doc @@ -4,7 +4,7 @@ DataTable object is a way to represent a two-dimensional data array (data arranged in rows and columns) in Salome. Each column groups values expressed in certain measurement \b units. -All \b columns and rows have titles. Tables can be \b +All \b columns and rows have titles. Tables can be \b rarefied, which means that some cells may be empty, without any values. @@ -13,10 +13,13 @@ special programming API (this problem lies out of the scope of Salome GUI Help), or \subpage importing_exporting_tables_page "imported" from properly defined ACSII files. +\anchor creating_tables_from_cut_lines + \note Alternatively, it is possible to create a table from the scalar values applied to the cells forming a \ref cut_lines_page "Cut Lines" -presentation. Simply right-click on the presentation in the Object -Browser or in the viewer and select Create Table from the pop-up menu. +or a \ref cut_segment_page "Cut Segment" presentation. Simply right-click on the +presentation in the Object Browser or in the viewer and select Create Table +from the pop-up menu. Tables are not displayed automatically. To view the imported table, right-click on it in the Object Brower and select Show Table @@ -24,6 +27,25 @@ in the context menu. \image html viewtable.png +When the Enable editing option is checked, the table contents are editable. +\note At the current moment this mode only allows to sort table data. +The sorting is performed by clicking on the header of the column, by which the data +is sorted. + +Sort policy option allows to specify how the empty cells will be processed +during the sort procedure. The following options are available: +
        +
      • Empty cells are considered as lowest values
        • +
      • Empty cells are considered as highest values
        • +
      • Empty cells are always first
        • +
      • Empty cells are always last
        • +
      • Empty cells are ignored (this means that the positions of empty cells +will not change after the sorting)
        • +
      + +Adjust Cells button allows to adjust the size of 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. @@ -35,4 +57,4 @@ Plot 2D viewer is described in the documentation on GUI module. -*/ \ No newline at end of file +*/ diff --git a/doc/salome/gui/VISU/input/tui_animation.doc b/doc/salome/gui/VISU/input/tui_animation.doc new file mode 100644 index 00000000..eed928c6 --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_animation.doc @@ -0,0 +1,173 @@ +/*! + +\page tui_animation_page Animation + +Example of Successive Animation: + +\code +import os +from time import sleep + +import salome + +import VISU +from visu_gui import * + +# The directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Import a MED file +medFile = os.path.join(datadir,"MedFiles","TimeStamps.med") +myResult = myVisu.ImportFile(medFile) + +# Create a 3D view +myViewManager = myVisu.GetViewManager() +myView = myViewManager.Create3DView() +myView.SetTitle("Animation view") + +# Create an animation instance +fieldName = "vitesse" + +myAnimation = myVisu.CreateAnimation(myView); + +# Set the successive animation mode +myAnimation.setAnimationMode(VISU.Animation.SUCCESSIVE) + +# Set the animation properties: + +# Add a field with timestamps, on which the animation will be performed +fieldName = "vitesse, m/s" +fieldSO = salome.myStudy.FindObject(fieldName) +myAnimation.addField(fieldSO) + +# Set the presentation type for the first field +myAnimation.setPresentationType(0, VISU.TDEFORMEDSHAPEANDSCALARMAP) + +# Generate presentations +myAnimation.generatePresentations(0) + +# Create the pattern of a Deformed Shape and Scalar Map presentation +meshName = "dom" +fieldName = "vitesse" +fieldEntity = VISU.NODE +timestampId = 1 +myDefShapeScalarMap = myVisu.DeformedShapeAndScalarMapOnField(myResult, meshName, fieldEntity, fieldName, timestampId) +myDefShapeScalarMap.SetScale(0.75) + +# Apply the pattern properties to all generated presentations +myAnimation.ApplyProperties(0, myDefShapeScalarMap) + +# Generate frames +myAnimation.generateFrames() + +# Publish the animation object in the study +myAnimation.publishInStudy() + +# Set the speed +myAnimation.setSpeed(80) + +# Save the animation after changing the speed +myAnimation.saveAnimation() + +# Fit All +myView.FitAll() + +# Start the animation +myAnimation.startAnimation() + +# Rewind to the first frame +sleep(10) +myAnimation.firstFrame() + +# Update the object browser +salome.sg.updateObjBrowser(1) +\endcode + +
      Example of Parallel Animation: + +\code +import os +from time import sleep + +import salome + +import VISU +from visu_gui import * + +# The directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Import a MED file +medFile = os.path.join(datadir,"MedFiles","TimeStamps.med") +myResult = myVisu.ImportFile(medFile) + +# Create a 3D view +myViewManager = myVisu.GetViewManager() +myView = myViewManager.Create3DView() +myView.SetTitle("Animation view") + +# Create an animation instance +fieldName = "vitesse" + +myAnimation = myVisu.CreateAnimation(myView); + +# Set the successive animation mode +myAnimation.setAnimationMode(VISU.Animation.PARALLEL) + +# Set animation properties: + +# Add two fields with timestamps, on which the animation will be performed +fieldName1 = "vitesse, m/s" +fieldSO1 = salome.myStudy.FindObject(fieldName1) +fieldName2 = "temperature, K" +fieldSO2 = salome.myStudy.FindObject(fieldName2) + +myAnimation.addField(fieldSO1) +myAnimation.addField(fieldSO2) + +# Set the presentation type for the first field +myAnimation.setPresentationType(0, VISU.TVECTORS) + +# Set the presentation type for the second field +myAnimation.setPresentationType(1, VISU.TSCALARMAP) + +# Generate presentations for all fields +nbFileds = myAnimation.getNbFields() +for i in range(0, nbFileds): + myAnimation.generatePresentations(i) + +# Create the pattern of Vectors presentation +meshName = "dom" +fieldName = "vitesse" +fieldEntity = VISU.NODE +timestampId = 1 +myVectors = myVisu.VectorsOnField(myResult, meshName, fieldEntity, fieldName, timestampId) +myVectors.SetScale(1) +myVectors.ShowColored(True) + +# Apply the vectors pattern properties to all presentations generated for 'vitesse' field +myAnimation.ApplyProperties(0, myVectors) + +# Generate frames +myAnimation.generateFrames() + +# Publish the animation object in the study +myAnimation.publishInStudy() + +# Set the speed +myAnimation.setSpeed(95) + +# Fit All +myView.FitAll() + +# Start the animation +myAnimation.startAnimation() + +# Update the object browser +salome.sg.updateObjBrowser(1) +\endcode + +
      Please, see \ref VISU.Animation "Animation interface reference documentation" +for more details. + +*/ diff --git a/doc/salome/gui/VISU/input/tui_creating_3d_prs.doc b/doc/salome/gui/VISU/input/tui_creating_3d_prs.doc new file mode 100644 index 00000000..c5fb94a4 --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_creating_3d_prs.doc @@ -0,0 +1,20 @@ +/*! + +\page tui_creating_3d_prs_page Creating 3D presentations + +
        +
      • \subpage tui_submesh_page
        • +
      • \subpage tui_scalar_map_page
        • +
      • \subpage tui_iso_surf_page
        • +
      • \subpage tui_cut_planes_page
        • +
      • \subpage tui_cut_lines_page
        • +
      • \subpage tui_cut_segment_page
        • +
      • \subpage tui_def_shape_page
        • +
      • \subpage tui_def_shape_and_scalar_map_page
        • +
      • \subpage tui_vectors_page
        • +
      • \subpage tui_stream_lines_page
        • +
      • \subpage tui_plot_3d_page
        • +
      • \subpage tui_gauss_points_page
        • +
      + +*/ \ No newline at end of file diff --git a/doc/salome/gui/VISU/input/tui_cut_lines.doc b/doc/salome/gui/VISU/input/tui_cut_lines.doc new file mode 100644 index 00000000..a52d48ff --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_cut_lines.doc @@ -0,0 +1,61 @@ +/*! + +\page tui_cut_lines_page Cut Lines + +Create Cut Lines presentation on a field of the imported MED file: + +\code +import os + +import salome + +import VISU +import visu_gui + +# The directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# Import a MED file +medFile = os.path.join(datadir,"MedFiles","fra.med") +myResult = myVisu.ImportFile(medFile) + +# Create cut lines for the first timestamp of 'VITESSE' field +meshName = 'LE VOLUME' +fieldEntity = VISU.NODE +fieldName = 'VITESSE' +myCutLines = myVisu.CutLinesOnField(myResult, meshName, fieldEntity, fieldName, 1) + +# Set the orientation of the base plane (parallel to ZX) +myCutLines.SetOrientation(VISU.CutPlanes.ZX, 0, 0) + +# Set the orientation of the cutting planes (parallel to ZX) +myCutLines.SetOrientation2(VISU.CutPlanes.XY, 0, 0) + +# Set the number of lines +myCutLines.SetNbLines(12) + +# Set the displacement of the base plane +myCutLines.SetDisplacement(0) + +# Set a custom position for the first line +newPos = (myCutLines.GetLinePosition(1) - myCutLines.GetLinePosition(0))/2 +myCutLines.SetLinePosition(0, newPos) + +# Update the object browser +salome.sg.updateObjBrowser(1) + +# Display the newly created cut lines +myViewManager = myVisu.GetViewManager() +myView = myViewManager.Create3DView() + +myView.DisplayOnly(myCutLines) +myView.FitAll() +\endcode + +
      Please, see \ref VISU.CutLines "CutLines interface reference documentation" +for more details. + +*/ diff --git a/doc/salome/gui/VISU/input/tui_cut_planes.doc b/doc/salome/gui/VISU/input/tui_cut_planes.doc new file mode 100644 index 00000000..22eeebdd --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_cut_planes.doc @@ -0,0 +1,59 @@ +/*! + +\page tui_cut_planes_page Cut Planes + +Create Cut Planes presentation on a field of the imported MED file: + +\code +import os + +import salome + +import VISU +import visu_gui + +# The directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# Import a MED file +medFile = os.path.join(datadir,"MedFiles","fra.med") +myResult = myVisu.ImportFile(medFile) + +# Create cut planes for the first timestamp of 'VITESSE' field +meshName = 'LE VOLUME' +fieldEntity = VISU.NODE +fieldName = 'VITESSE' +myCutPlanes = myVisu.CutPlanesOnField(myResult, meshName, fieldEntity, fieldName, 1) + +# Set the number of planes +myCutPlanes.SetNbPlanes(15) + +# Set the planes orientation (parallel to XY), set rotation around Y to 0.5 radian +myCutPlanes.SetOrientation(VISU.CutPlanes.XY, 0, 0.5) + +# Set the scale +myCutPlanes.UseDeformation(True) +myCutPlanes.SetVectorialField(fieldEntity, fieldName) +myCutPlanes.SetScale(0.05) + +# Set the displacement +myCutPlanes.SetDisplacement(0.1) + +# Update the object browser +salome.sg.updateObjBrowser(1) + +# Display the newly created cut planes +myViewManager = myVisu.GetViewManager() +myView = myViewManager.Create3DView() + +myView.DisplayOnly(myCutPlanes) +myView.FitAll() +\endcode + +
      Please, see \ref VISU.CutPlanes "CutPlanes interface reference documentation" +for more details. + +*/ diff --git a/doc/salome/gui/VISU/input/tui_cut_segment.doc b/doc/salome/gui/VISU/input/tui_cut_segment.doc new file mode 100644 index 00000000..4eaecfca --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_cut_segment.doc @@ -0,0 +1,54 @@ +/*! + +\page tui_cut_segment_page Cut Segment + +Create Cut Segment presentation on a field of the imported MED file: + +\code +import os + +import salome + +import VISU +import visu_gui + +# The directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# Import a MED file +medFile = os.path.join(datadir,"MedFiles","fra.med") +myResult = myVisu.ImportFile(medFile) + +# Create a cut segment for the first timestamp of 'VITESSE' field +meshName = 'LE VOLUME' +fieldEntity = VISU.NODE +fieldName = 'VITESSE' +myCutSegment = myVisu.CutSegmentOnField(myResult, meshName, fieldEntity, fieldName, 1) + +# Set the first point of the segment +myCutSegment.SetPoint1(0, 0, 0) + +# Set the second point of the segment +myCutSegment.SetPoint2(0.41, 0.0685, 1.082) + +# Invert the resulting curve +myCutSegment.SetAllCurvesInverted(True) + +# Update the object browser +salome.sg.updateObjBrowser(1) + +# Display the newly created cut segment +myViewManager = myVisu.GetViewManager() +myView = myViewManager.Create3DView() + +myView.DisplayOnly(myCutSegment) +myView.FitAll() +\endcode + +
      Please, see \ref VISU.CutSegment "CutSegment interface reference documentation" +for more details. + +*/ diff --git a/doc/salome/gui/VISU/input/tui_datatable.doc b/doc/salome/gui/VISU/input/tui_datatable.doc new file mode 100644 index 00000000..4d48f444 --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_datatable.doc @@ -0,0 +1,11 @@ +/*! + +\page tui_datatable_page DataTable + +
        +
      • \subpage tui_table_import_page
        • +
      • \subpage tui_table_3d_page
        • +
      • \subpage tui_table_curves_page
        • +
      + +*/ \ No newline at end of file diff --git a/doc/salome/gui/VISU/input/tui_def_shape.doc b/doc/salome/gui/VISU/input/tui_def_shape.doc new file mode 100644 index 00000000..d8eb682b --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_def_shape.doc @@ -0,0 +1,51 @@ +/*! + +\page tui_def_shape_page Deformed Shape + +Create Deformed Shape presentation on a field of the imported MED file: + +\code +import os + +import salome + +import VISU +import visu_gui + +# The directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# Import a MED file +medFile = os.path.join(datadir,"MedFiles","fra.med") +myResult = myVisu.ImportFile(medFile) + +# Create a deformed shape for the first timestamp of 'VITESSE' field +meshName = 'LE VOLUME' +fieldEntity = VISU.NODE +fieldName = 'VITESSE' +myDefShape = myVisu.DeformedShapeOnField(myResult, meshName, fieldEntity, fieldName, 1) + +# Set the scale factor +myDefShape.SetScale(0.25) + +# Set magnitude coloring +myDefShape.ShowColored(True) + +# Update the object browser +salome.sg.updateObjBrowser(1) + +# Display the newly created deformed shape +myViewManager = myVisu.GetViewManager() +myView = myViewManager.Create3DView() + +myView.DisplayOnly(myDefShape) +myView.FitAll() +\endcode + +
      Please, see \ref VISU.DeformedShape "DeformedShape interface reference documentation" +for more details. + +*/ diff --git a/doc/salome/gui/VISU/input/tui_def_shape_and_scalar_map.doc b/doc/salome/gui/VISU/input/tui_def_shape_and_scalar_map.doc new file mode 100644 index 00000000..58562894 --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_def_shape_and_scalar_map.doc @@ -0,0 +1,53 @@ +/*! + +\page tui_def_shape_and_scalar_map_page Deformed Shape and Scalar Map + +Create Deformed Shape and Scalar Map presentation on the field of the imported MED file: + +\code +import os + +import salome + +import VISU +import visu_gui + +# The directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# Import a MED file +medFile = os.path.join(datadir,"MedFiles","fra.med") +myResult = myVisu.ImportFile(medFile) + +# Create a deformed shape and a scalar map for the first timestamp of 'VITESSE' field +meshName = 'LE VOLUME' +fieldEntity = VISU.NODE +fieldName = 'VITESSE' +myDefShapeScalarMap = myVisu.DeformedShapeAndScalarMapOnField(myResult, meshName, fieldEntity, fieldName, 1) + +# Set the scale +myDefShapeScalarMap.SetScale(0.25) + +# Set 'TAUX_DE_VIDE' as a scalar field, use the first timestamp +fieldName = 'TAUX_DE_VIDE' +myDefShapeScalarMap.SetScalarField(VISU.NODE, fieldName, 1) + +# Update the object browser +salome.sg.updateObjBrowser(1) + +# Display the newly created presentation +myViewManager = myVisu.GetViewManager() +myView = myViewManager.Create3DView() + +myView.DisplayOnly(myDefShapeScalarMap) +myView.FitAll() +\endcode + +
      Please, see \ref VISU.DeformedShapeAndScalarMap +"DeformedShapeAndScalarMap interface reference documentation" +for more details. + +*/ diff --git a/doc/salome/gui/VISU/input/tui_evolution.doc b/doc/salome/gui/VISU/input/tui_evolution.doc new file mode 100644 index 00000000..ef617611 --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_evolution.doc @@ -0,0 +1,54 @@ +/*! + +\page tui_evolution_page Evolution on Point + +Example of Evolution on Point presentation: + +\code +import os + +import salome + +import VISU +from visu_gui import * + +# The directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Import a MED file +medFile = os.path.join(datadir,"MedFiles","TimeStamps.med") +myResult = myVisu.ImportFile(medFile) + +# Create a 2D viewer for the evolution graph: +myViewManager = myVisu.GetViewManager(); +myView = myViewManager.CreateXYPlot(); +myView.SetTitle("The viewer for Evolution") + +# Create an evolution instance, using the newly created view +myEvolution = myVisu.CreateEvolution(myView); + +# Get 'vitesse' field object +aSObj = myStudy.FindObjectIOR(myResult.GetID()) +aSObj = aSObj.FindSubObject(1)[1] # 'dom' mesh +aSObj = aSObj.FindSubObject(3)[1] # Fields +vitesseSO = aSObj.FindSubObject(2)[1] # 'vitesse' field +myEvolution.setField(vitesseSO) + +# Set "x" as a component +myEvolution.setComponentId(1) + +# Set a point via identifier +myEvolution.setPointId(500) + +# Show the Evolution +myEvolution.showEvolution() +myView.FitAll() + +# Update the object browser +salome.sg.updateObjBrowser(1) +\endcode + +
      Please, see \ref VISU.Evolution "Evolution interface reference documentation" +for more details. + +*/ diff --git a/doc/salome/gui/VISU/input/tui_gauss_points.doc b/doc/salome/gui/VISU/input/tui_gauss_points.doc new file mode 100644 index 00000000..73c9eb6f --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_gauss_points.doc @@ -0,0 +1,91 @@ +/*! + +\page tui_gauss_points_page Gauss Points + +Create Gauss Points presentations on a field of the imported MED file: + +\code +import os +from time import sleep + +import salome +import SALOMEDS + +import VISU +import visu_gui + +# The directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# Import the file +medFile = os.path.join(datadir,"MedFiles","pointe.med") +myResult = myVisu.ImportFile(medFile) + +# Create gauss points for the first timestamp of 'fieldcelldoublevector' field +meshName = 'maa1' +fieldEntity = VISU.CELL +fieldName = 'fieldcelldoublevector' + +# Create a Gauss Points presentation of the first type: Results at Gauss Points +myGaussPoints1 = myVisu.GaussPointsOnField(myResult, meshName, fieldEntity, fieldName, 1) + +# Set range values (5-50%): +myGaussPoints1.SetMinSize(0.05) +myGaussPoints1.SetMaxSize(0.5) + +# Set OpenGL Points as a primitive type +myGaussPoints1.SetPrimitiveType(VISU.GaussPoints.POINT) + +# Set the maximum size of points +myGaussPoints1.SetClamp(32) + +# Create a Gauss Points presentation of the second type: Gauss Points on Geometry +myGaussPoints2 = myVisu.GaussPointsOnField(myResult, meshName, fieldEntity, fieldName, 1) +myGaussPoints2.SetIsColored(False) + +# Set magnification to 200% +myGaussPoints2.SetMagnification(2) + +# Set magnification ratio +myGaussPoints2.SetMagnificationIncrement(4) + +# Set the size of points +myGaussPoints2.SetGeomSize(0.25) + +# Set the color of points +myGaussPoints2.SetColor(SALOMEDS.Color(255, 90, 255)) + +# Create a Gauss Points presentation of the third type: Gauss Points on Deformed Shape +myGaussPoints3 = myVisu.GaussPointsOnField(myResult, meshName, fieldEntity, fieldName, 1) + +# Apply the deformation +myGaussPoints3.SetIsDeformed(True) +myGaussPoints3.SetScaleFactor(0.4) + +# Set a geometrical sphere as the primitive type +myGaussPoints3.SetPrimitiveType(VISU.GaussPoints.SPHERE) + +# Set sphere resolution +myGaussPoints3.SetResolution(5) + +# Update object browser +salome.sg.updateObjBrowser(1) + +# Display the newly created presentations one by one +myViewManager = myVisu.GetViewManager() +myView = myViewManager.Create3DView() + +prsList = [myGaussPoints1, myGaussPoints2, myGaussPoints3] +for prs in prsList: + myView.DisplayOnly(prs) + myView.FitAll() + sleep(5) +\endcode + +
      Please, see \ref VISU.GaussPoints "GaussPoints interface reference documentation" +for more details. + +*/ diff --git a/doc/salome/gui/VISU/input/tui_import_export.doc b/doc/salome/gui/VISU/input/tui_import_export.doc new file mode 100644 index 00000000..6048f927 --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_import_export.doc @@ -0,0 +1,59 @@ +/*! + +\page tui_import_export_page Import/Export MED + +Import data from a MED file: + +\code +import os + +import salome + +import visu_gui + +# The directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# The path to the file +medFile = os.path.join(datadir,"MedFiles","fra.med") + +# Import the file +myResult = myVisu.ImportFile(medFile) + +# Update the object browser +salome.sg.updateObjBrowser(1) +\endcode + +
      Export data to a MED file: + +\code +import os + +import salome + +import visu_gui + +# The directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# The path to the file +medFile = os.path.join(datadir,"MedFiles","fra.med") + +# Import the file +myResult = myVisu.ImportFile(medFile) + +# Export the file +newFileName = os.path.join(datadir,"MedFiles","fra_copy.med") +myResult.ExportMED(newFileName) + +# Update the object browser +salome.sg.updateObjBrowser(1) +\endcode + +*/ diff --git a/doc/salome/gui/VISU/input/tui_iso_surf.doc b/doc/salome/gui/VISU/input/tui_iso_surf.doc new file mode 100644 index 00000000..320fe87b --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_iso_surf.doc @@ -0,0 +1,51 @@ +/*! + +\page tui_iso_surf_page Iso Surfaces + +Create Iso Surfaces presentation on a field of the imported MED file: + +\code +import os + +import salome + +import VISU +import visu_gui + +# The directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# Import a MED file +medFile = os.path.join(datadir,"MedFiles","fra.med") +myResult = myVisu.ImportFile(medFile) + +# Create iso surfaces for the first timestamp of 'VITESSE' field +meshName = 'LE VOLUME' +fieldEntity = VISU.NODE +fieldName = 'VITESSE' +myIsoSurfaces = myVisu.IsoSurfacesOnField(myResult, meshName, fieldEntity, fieldName, 1) + +# Set the number of surfaces +myIsoSurfaces.SetNbSurfaces(12) + +# Show two value labels per surface +myIsoSurfaces.ShowLabels(True, 2) + +# Update the object browser +salome.sg.updateObjBrowser(1) + +# Display the newly created iso surfaces +myViewManager = myVisu.GetViewManager() +myView = myViewManager.Create3DView() + +myView.DisplayOnly(myIsoSurfaces) +myView.FitAll() +\endcode + +
      Please, see \ref VISU.IsoSurfaces "IsoSurfaces interface reference documentation" +for more details. + +*/ diff --git a/doc/salome/gui/VISU/input/tui_manage_3d_prs.doc b/doc/salome/gui/VISU/input/tui_manage_3d_prs.doc new file mode 100644 index 00000000..6b7a298e --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_manage_3d_prs.doc @@ -0,0 +1,12 @@ +/*! + +\page tui_manage_3d_prs_page Managing 3D Presentations + +
        +
      • \subpage tui_view_3d_page
        • +
      • \subpage tui_animation_page
        • +
      • \subpage tui_evolution_page
        • +
      • \subpage tui_point_marker_page
        • +
      + +*/ \ No newline at end of file diff --git a/doc/salome/gui/VISU/input/tui_plot_3d.doc b/doc/salome/gui/VISU/input/tui_plot_3d.doc new file mode 100644 index 00000000..32427443 --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_plot_3d.doc @@ -0,0 +1,60 @@ +/*! + +\page tui_plot_3d_page Plot 3D + +Create Plot 3D presentation on a field of the imported MED file: + +\code +import os + +import salome + +import VISU +import visu_gui + +# The directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# Import a MED file +medFile = os.path.join(datadir,"MedFiles","fra.med") +myResult = myVisu.ImportFile(medFile) + +# Create a 3d plot for the first timestamp of 'VITESSE' field +meshName = 'LE VOLUME' +fieldEntity = VISU.NODE +fieldName = 'VITESSE' +myPlot3D = myVisu.Plot3DOnField(myResult, meshName, fieldEntity, fieldName, 1) + +# Set the cut plane orientation +myPlot3D.SetOrientation(VISU.Plot3D.ZX, 0, 0) + +# Set the relative position of the plane +myPlot3D.SetPlanePosition(0.8, True) + +# Set the scale factor +myPlot3D.SetScaleFactor(0.25) + +# Set the contour presentation type +myPlot3D.SetContourPrs(True) + +# Set the number of contours +myPlot3D.SetNbOfContours(100) + +# Update the object browser +salome.sg.updateObjBrowser(1) + +# Display the newly created plot 3d presentation +myViewManager = myVisu.GetViewManager() +myView = myViewManager.Create3DView() + +myView.DisplayOnly(myPlot3D) +myView.FitAll() +\endcode + +
      Please, see \ref VISU.Plot3D "Plot3D interface reference documentation" +for more details. + +*/ 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..a265b386 --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_point_marker.doc @@ -0,0 +1,52 @@ +/*! + +\page tui_point_marker_page Point Marker + +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 = os.path.join(datadir,"MedFiles","fra.med") +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 the representation type to Point" +myView.SetPresentationType(aScalarMap, VISU.POINT) + +print "Set a standard marker" +aScalarMap.SetMarkerStd(VISU.MT_PLUS, VISU.MS_25) +myView.Update() +time.sleep(sleep_delay) + +print "Set a custom marker" +custom_texture = myVisu.LoadTexture(os.path.join(data_dir, "Textures", "texture1.dat")) +aScalarMap.SetMarkerTexture(custom_texture) +myView.Update() + +\endcode + +
      Please, see \ref VISU.Prs3d "Prs3d interface reference documentation" +for more details. +*/ diff --git a/doc/salome/gui/VISU/input/tui_scalar_map.doc b/doc/salome/gui/VISU/input/tui_scalar_map.doc new file mode 100644 index 00000000..85a5c3e3 --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_scalar_map.doc @@ -0,0 +1,51 @@ +/*! + +\page tui_scalar_map_page Scalar Map + +Create Scalar Map presentation on a field of the imported MED file: + +\code +import os + +import salome + +import VISU +import visu_gui + +# The directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# Import a MED file +medFile = os.path.join(datadir,"MedFiles","pointe.med") +myResult = myVisu.ImportFile(medFile) + +# Create a scalar map for the first timestamp of 'fieldcelldoublevector' field +meshName = 'maa1' +fieldEntity = VISU.CELL +fieldName = 'fieldcelldoublevector' +myScalarMap = myVisu.ScalarMapOnField(myResult, meshName, fieldEntity, fieldName, 1) + +# Set the logarithmic scaling +myScalarMap.SetScaling(VISU.LOGARITHMIC) + +# Set scalar range to [2, 5] +myScalarMap.SetRange(2, 5) + +# Update the object browser +salome.sg.updateObjBrowser(1) + +# Display the newly created scalar map +myViewManager = myVisu.GetViewManager() +myView = myViewManager.Create3DView() + +myView.DisplayOnly(myScalarMap) +myView.FitAll() +\endcode + +
      Please, see \ref VISU.ScalarMap "ScalarMap interface reference documentation" +for more details. + +*/ diff --git a/doc/salome/gui/VISU/input/tui_stream_lines.doc b/doc/salome/gui/VISU/input/tui_stream_lines.doc new file mode 100644 index 00000000..b7c0acdb --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_stream_lines.doc @@ -0,0 +1,59 @@ +/*! + +\page tui_stream_lines_page Stream Lines + +Create Stream Lines presentation on a field of the imported MED file: + +\code +import os + +import salome + +import VISU +import visu_gui + +# The directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# Import a MED file +medFile = os.path.join(datadir,"MedFiles","fra.med") +myResult = myVisu.ImportFile(medFile) + +# Create stream lines for the first timestamp of 'VITESSE' field +meshName = 'LE VOLUME' +fieldEntity = VISU.NODE +fieldName = 'VITESSE' +myStreamLines = myVisu.StreamLinesOnField(myResult, meshName, fieldEntity, fieldName, 1) + +# Set stream lines parameters +integrationStep = 0.003 +propagationTime = 1.5 +stepLength = 0.015 +# Mesh on nodes +prs3D = myVisu.MeshOnEntity(myResult, meshName, VISU.NODE) +pointsPercents = 0.05 +direction = VISU.StreamLines.FORWARD + +myStreamLines.SetParams(integrationStep, propagationTime, stepLength, prs3D, pointsPercents, direction) + +# Set magnitude coloring +myStreamLines.ShowColored(True) + +# Update the object browser +salome.sg.updateObjBrowser(1) + +# Display the newly created stream lines +myViewManager = myVisu.GetViewManager() +myView = myViewManager.Create3DView() + +myView.DisplayOnly(myStreamLines) +myView.FitAll() +\endcode + +
      Please, see \ref VISU.StreamLines "StreamLines interface reference documentation" +for more details. + +*/ diff --git a/doc/salome/gui/VISU/input/tui_submesh.doc b/doc/salome/gui/VISU/input/tui_submesh.doc new file mode 100644 index 00000000..b5550cd8 --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_submesh.doc @@ -0,0 +1,64 @@ +/*! + +\page tui_submesh_page Submesh presentation + +Display various submeshes of the imported MED file: + +\code +import os +from time import sleep + +import salome +import SALOMEDS + +import VISU +import visu_gui + +# The directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# Import a MED file +medFile = os.path.join(datadir,"MedFiles","pointe.med") +myResult = myVisu.ImportFile(medFile) + +# Create submesh presentations +meshName = 'maa1' +cellEntity = VISU.CELL +nodeEntity = VISU.NODE + +mySubMeshes = [] + +# Create submesh on nodes +myOnNodes = myVisu.MeshOnEntity(myResult, meshName, nodeEntity) +mySubMeshes.append(myOnNodes) + +# Create submesh on a family (one cell) +familyName = 'FAMILLE_ELEMENT_1' +myOnFamily = myVisu.FamilyMeshOnEntity(myResult, meshName, cellEntity, familyName) +mySubMeshes.append(myOnFamily) + +# Create submesh on a group (several cells) +groupName = 'groupe1' +myOnGroup = myVisu.GroupMesh(myResult, meshName, groupName) +mySubMeshes.append(myOnGroup) + +# Update the object browser +salome.sg.updateObjBrowser(1) + +# Display newly created presentations one by one +myViewManager = myVisu.GetViewManager() +myView = myViewManager.Create3DView() + +for submesh in mySubMeshes: + myView.DisplayOnly(submesh) + myView.FitAll() + sleep(5) +\endcode + +
      Please, see \ref VISU.Mesh "Mesh interface reference documentation" +for more details. + +*/ diff --git a/doc/salome/gui/VISU/input/tui_table_3d.doc b/doc/salome/gui/VISU/input/tui_table_3d.doc new file mode 100644 index 00000000..794fe9a1 --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_table_3d.doc @@ -0,0 +1,53 @@ +/*! + +\page tui_table_3d_page Table 3D presentation + +Create and display a Table 3D presentation: + +\code +import os + +import salome + +import visu_gui + +# The directory containing data table files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# Import tables from file +tableFile = os.path.join(datadir,"Tables","table_test.xls") +myTablesSO = myVisu.ImportTables(tableFile, False) + +# Create a table presentation +table = None +anIsFound, aTableSO = myTablesSO.FindSubObject(1) +if anIsFound: + anID = aTableSO.GetID() + table = myVisu.CreateTable(anID) + # Set 'Contour' presentation type + table.SetContourPrs(1) + # Set number od contours + table.SetNbOfContours(1024) + # Set scale factor + table.SetScaleFactor(0.2) + +# Show the table presentation +if (table is not None): + # Display just created tabel presentation + myViewManager = myVisu.GetViewManager() + myView = myViewManager.Create3DView() + + myView.DisplayOnly(table) + myView.FitAll() + +# Update the object browser +salome.sg.updateObjBrowser(1) +\endcode + +
      Please, see \ref VISU.Table "Table interface reference documentation" +for more details. + +*/ diff --git a/doc/salome/gui/VISU/input/tui_table_curves.doc b/doc/salome/gui/VISU/input/tui_table_curves.doc new file mode 100644 index 00000000..6141a0b1 --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_table_curves.doc @@ -0,0 +1,75 @@ +/*! + +\page tui_table_curves_page Curves + +Create and display curves using the imported table: + +\code +import os +from time import sleep + +import salome + +import VISU +import visu_gui + +# The directory containing data table files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# Import tables from file +tableFile = os.path.join(datadir,"Tables","table_test.xls") +myTablesSO = myVisu.ImportTables(tableFile, False) + +# Get the table +anIsFound, myTableSO = myTablesSO.FindSubObject(1) +anID = myTableSO.GetID() +myTable = myVisu.CreateTable(anID) + +# Create a table view +myViewManager = myVisu.GetViewManager() +myTableView = myViewManager.CreateTableView(myTable) +myTableView.SetTitle('My Curves') + +# Create a container for a set of curves +myContainer = myVisu.CreateContainer() + +# Create curves +aNbCurves = myTable.GetNbRows() +aCurve = None +for i in range(1, aNbCurves): + aCurve = myVisu.CreateCurve( myTable, 1, i ) + myContainer.AddCurve(aCurve) + +# Update the object browser +salome.sg.updateObjBrowser(1) + +# Create a Plot 2D view +myView = myViewManager.CreateXYPlot(); +myView.SetTitle("The viewer for My Curves") + +# Display all curves (i.e. container) +myView.Display(myContainer) +sleep(5) + +# Set the curves displaying mode +myView.SetCurveType(VISU.XYPlot.SPLINE) +# Set the marker size +myView.SetMarkerSize(15) + +# Change the display parameters of the last created curve +# Set the marker type +aCurve.SetMarker(VISU.Curve.CIRCLE) +# Set the line type and width +aCurve.SetLine(VISU.Curve.SOLIDLINE, 4) + +# Display only the last created curve +myView.DisplayOnly(aCurve) +\endcode + +
      Please, see \ref VISU.Curve "Curve interface reference documentation" and +\ref VISU.XYPlot "XYPlot interface reference documentation" for more details. + +*/ diff --git a/doc/salome/gui/VISU/input/tui_table_import.doc b/doc/salome/gui/VISU/input/tui_table_import.doc new file mode 100644 index 00000000..ad9944f8 --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_table_import.doc @@ -0,0 +1,67 @@ +/*! + +\page tui_table_import_page Import/Export table + +Import tables from file: + +\code +import os + +import salome + +import visu_gui + +# The directory containing data table files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# Import tables from file +tableFile = os.path.join(datadir,"Tables","tables_test.xls") +myTablesSO = myVisu.ImportTables(tableFile, False) + +# Print table names +print "\nNames of the imported tables:" +iter = salome.myStudy.NewChildIterator(myTablesSO) +while iter.More(): + aTableSO = iter.Value() + if aTableSO: + aTable = aTableSO.GetObject() + print "\n", aTable.GetTitle() + iter.Next() + +# Update the object browser +salome.sg.updateObjBrowser(1) +\endcode + +
      Export table to the file: + +\code +import os + +import salome + +import visu_gui + +# The directory containing data table files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# Import tables from file +tableFile = os.path.join(datadir,"Tables","tables_test.xls") +myTablesSO = myVisu.ImportTables(tableFile, False) + +# Export the first imported table to a new file +expTableFile = os.path.join(datadir,"Tables","sinus_table.txt") + +sinusTableSO = salome.myStudy.FindObject("sinus") +myVisu.ExportTableToFile(sinusTableSO, expTableFile) + +# Update the object browser +salome.sg.updateObjBrowser(1) +\endcode + +*/ diff --git a/doc/salome/gui/VISU/input/tui_vectors.doc b/doc/salome/gui/VISU/input/tui_vectors.doc new file mode 100644 index 00000000..7c1b56fc --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_vectors.doc @@ -0,0 +1,60 @@ +/*! + +\page tui_vectors_page Vectors + +Create Vectors on the field of the imported MED file: + +\code +import os + +import salome + +import VISU +import visu_gui + +# Directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Get VISU engine +myVisu = visu_gui.myVisu + +# Import MED file +medFile = os.path.join(datadir,"MedFiles","fra.med") +myResult = myVisu.ImportFile(medFile) + +# Create vectors for the first timestamp of 'VITESSE' field +meshName = 'LE VOLUME' +fieldEntity = VISU.NODE +fieldName = 'VITESSE' +myVectors = myVisu.VectorsOnField(myResult, meshName, fieldEntity, fieldName, 1) + +# Set scale factor +myVectors.SetScale(0.1) + +# Set magnitude coloring +myVectors.ShowColored(True) + +# Set line width +myVectors.SetLineWidth(2) + +# Set the type of representation of the vector head (arrow) +myVectors.SetGlyphType(VISU.Vectors.ARROW) + +# Set the position of the vector head (center) +myVectors.SetGlyphPos(VISU.Vectors.CENTER) + +# Update object browser +salome.sg.updateObjBrowser(1) + +# Display just created vectors +myViewManager = myVisu.GetViewManager() +myView = myViewManager.Create3DView() + +myView.DisplayOnly(myVectors) +myView.FitAll() +\endcode + +
      Please, see \ref VISU.Vectors "Vectors interface reference documentation" +for more details. + +*/ \ No newline at end of file diff --git a/doc/salome/gui/VISU/input/tui_view_3d.doc b/doc/salome/gui/VISU/input/tui_view_3d.doc new file mode 100644 index 00000000..09dc130b --- /dev/null +++ b/doc/salome/gui/VISU/input/tui_view_3d.doc @@ -0,0 +1,197 @@ +/*! + +\page tui_view_3d_page Viewing 3D presentations + +Examples of using 3D viewer functionaly from Python: + +\code +import os +from time import sleep + +import salome + +import VISU +from visu_gui import * + +# Set the delay +delay = 4 + +# Set the directory containing MED files +datadir = os.getenv("DATA_DIR") + +# Create a temporary 3D view +print "Create a temporary 3D view..." +myViewManager = myVisu.GetViewManager() +myTempView = myViewManager.Create3DView() +myTempView.SetTitle("The window will be soon destroyed!") +sleep(delay) + +# Destroy the view +print "Destroy the view..." +myViewManager.Destroy(myTempView) +sleep(delay) + +# Import a MED file +medFile = os.path.join(datadir,"MedFiles","fra.med") +myResult = myVisu.ImportFile(medFile) + +# Create a scalar map +meshName = 'LE VOLUME' +fieldEntity = VISU.NODE +fieldName = 'VITESSE' +timestampId = 1 +myScalarMap = myVisu.ScalarMapOnField(myResult, meshName, fieldEntity, fieldName, timestampId) + +# Create a new 3D view +print "Create a new 3D view..." +myView = myViewManager.Create3DView() + +# Set the background +print "Set a blue background..." +bgColor = SALOMEDS.Color(0.0, 0.3, 1.0) +myView.SetBackground(bgColor) +myView.Update() +sleep(delay) + +# Display the newly created scalar map +print "Display the scalar map..." +myView.Display(myScalarMap) +sleep(delay) + +# Fit all +print "Fit all..." +myView.FitAll() +sleep(delay) + +# Set the point of sight of the camera +print "Set the point of sight of the camera..." +myView.SetFocalPoint([1,5,10]) +myView.Update() +sleep(delay) + +# Fit all +print "Fit all..." +myView.FitAll() +sleep(delay) + +# Change the scalar map range +print "Change the scalar map range..." +myScalarMap.SetRange(0.2, 0.9) +sleep(delay) + +# Update the view +print "Update the view..." +myView.Update() +sleep(delay) + +# Scale the view +print "Scale the view..." +myView.ScaleView(VISU.View3D.YAxis,10.0) +myView.ScaleView(VISU.View3D.XAxis,3.0) +myView.Update() +sleep(delay) + +# Set the camera position in 3D space +print "Set the the camera position in 3D space..." +myView.SetPointOfView([0.01, 0.05, 0.03]) +myView.Update() +sleep(delay) + +# Fit all +print "Fit all..." +myView.FitAll() +sleep(delay) + +# Store view parameters +stateName = "State1" +myView.SaveViewParams(stateName) + +# Remove scale +print "Remove scale..." +myView.RemoveScale() +sleep(delay) + +# Change the background +print "Set a dark background..." +bgColor = SALOMEDS.Color(0.0, 0.1, 0.2) +myView.SetBackground(bgColor) +sleep(delay) + +# Update the view +print "Update the view..." +myView.Update() +sleep(delay) + +# Set the top view +print "Set the top view..." +myView.SetView(VISU.View3D.TOP) +sleep(delay) + +# Zooming out +print "Zooming out..." +aScale = myView.GetParallelScale() +for i in range(0,50) : + aScale = aScale + 0.05 + myView.SetParallelScale(aScale) + myView.Update() + +sleep(delay) + +# Zooming in +print "Zooming in..." +for i in range(0,75) : + aScale = aScale - 0.05 + myView.SetParallelScale(aScale) + myView.Update() + +sleep(delay) + +# Set the vertical line of the camera in 3D space +print "Set the vertical line of the camera in 3D space..." +aViewUp = myView.GetViewUp() +for i in range(0,40) : + aViewUp[0] = aViewUp[0] + 0.1 + myView.SetViewUp(aViewUp) + myView.Update() + +sleep(delay) + +# Rotating Y +print "Rotating Y..." +aPoint = myView.GetPointOfView() +for i in range(0,150) : + aPoint[1] = aPoint[1] + 1 + myView.SetPointOfView(aPoint) + myView.Update() + +sleep(delay) + +# Restore view parameters +print "Restore view parameters..." +myView.RestoreViewParams(stateName) +sleep(delay) + +# Change presentation parameters: + +# Make the scalar map shrinked +print "Make the scalar map shrinked..." +myView.SetShrinked(myScalarMap, True) +sleep(delay) + +# Set the presentation type +print "Set the presentation type to SURFACEFRAME..." +myView.SetPresentationType(myScalarMap, VISU.SURFACEFRAME) +sleep(delay) + +print "Set the presentation type to FEATURE_EDGES..." +myView.SetPresentationType(myScalarMap, VISU.FEATURE_EDGES) +sleep(delay) + +# Update the object browser +salome.sg.updateObjBrowser(1) +\endcode + +
      Please, see \ref VISU.View3D "View3D interface reference documentation" +for more details. + +*/ diff --git a/doc/salome/gui/VISU/input/values_labeling.doc b/doc/salome/gui/VISU/input/values_labeling.doc deleted file mode 100644 index e6d3f930..00000000 --- a/doc/salome/gui/VISU/input/values_labeling.doc +++ /dev/null @@ -1,34 +0,0 @@ -/*! - -\page values_labeling_page Values labeling - -

      Displaying value labels

      - -In VISU you can display values applied to the cells or nodes of 3D presentation intended for visualization of calculation data. - -To display labels for values: -
        -
      1. Display your presentation in 3d viewer
        2. -
      2. Right-click on the presentation in the 3D viewer and from the associated pop-up menu choose Values labeling.
        3. -
      - -It will looks as follow: - -\image html values_labeling.png - -

      Parameters of values labeling

      - -You have ability to change parameters of values labeling such as font and color. Default parameters can be specified using "Preferences" dialog box. Also you can change parameters for each presentation. - -To change parameters of the presentation: -
        -
      1. Display your presentation in 3d viewer
        2. -
      2. Right-click on the presentation in the 3D viewer and from the associated pop-up menu choose Labeling parameters.
        3. -
      3. Use "Parameters of values labeling" dialog box for the operation
        4. -
      - -It will looks as follows: - -\image html labeling_parameters.png - -*/ diff --git a/doc/salome/gui/VISU/input/vectors.doc b/doc/salome/gui/VISU/input/vectors.doc index 4b250995..3e971e01 100644 --- a/doc/salome/gui/VISU/input/vectors.doc +++ b/doc/salome/gui/VISU/input/vectors.doc @@ -43,6 +43,9 @@ scalar bar displayed with this presentation (\ref scalar_map_page "see also").See Also a sample TUI Script of +\ref tui_vectors_page "Vectors creation" operation. */ diff --git a/doc/salome/gui/VISU/input/viewing_3d_presentations.doc b/doc/salome/gui/VISU/input/viewing_3d_presentations.doc index 052ef24a..771a121e 100644 --- a/doc/salome/gui/VISU/input/viewing_3d_presentations.doc +++ b/doc/salome/gui/VISU/input/viewing_3d_presentations.doc @@ -2,10 +2,11 @@ \page viewing_3d_presentations_page Viewing 3D presentations -\n Each newly created presentation is displayed in the VTK 3D +Each newly created presentation is displayed in the VTK 3D Viewer. VTK 3D Viewer is described in details in the documentation on GUI module. -\n To display an existing presentation, right-click on it in the + +To display an existing presentation, right-click on it in the Object Browser and select \b Show. \image html viewing3.png @@ -19,97 +20,116 @@ options: visualization and NOT all properties can be set for a certain 3D presentation. -
        -
      • Hide all - allows to hide all objects from the -viewer.
        • -
      • Edit - allows to return to the menu, where the presentation -has been created and change its parameters.
        • -
      • Filter by Scalars - allows showing only the cells with -values that fit into the defined Scalar Range. - -\image html viewing2.png - -In this menu, check in Filter by scalar range box and input -the minimum and the maximum values for the Scalar Range
        • - -\image html viewing4.png - -
      • Rename - allows to rename the presentation.
        • -
      • Copy - allows to create a copy of the presentation in the -same subfolder (time stamp) in the Object Browser.
        • - -
      • Hide - allows to hide the selected presentation from the -viewer.
        • -
      • If selected in the Object Browser, Hide is replaced by -Show, which allows to display the selected presentation in the -viewer.
        • - -
      • Show Only - allows to display only the selected -presentation, hiding all other from the viewer.
        • -
      • Representation - allows to switch among the available -representation types. - -\image html viewing10.png - -
      +- Hide all - allows to hide all objects from the +viewer. -\image html viewing5.png "Points" +- Edit - allows to return to the menu, where the presentation +has been created and change its parameters. -\image html viewing6.png "Surface" +- \anchor filter_by_scalars_anchor Filter by Scalars - allows +showing only the cells with values that fit into the defined +Scalar Range. -\image html viewing7.png "Wireframe" +\image html viewing2.png -\image html viewing8.png "Insideframe - displays the wires lying within the object" +In the dialog box, check in Filter by scalar range box and input +the minimum and the maximum values for the Scalar Range. -\image html viewing9.png "Surfaceframe - displays wires and cells lying on the object surface" +\image html viewing4.png -\image html viewing11.png "Feature edges - shows the contour of the object" +- \anchor rename_anchor Rename - allows to rename the presentation. +- Copy - allows to create a copy of the presentation in the +same subfolder (time stamp) in the Object Browser. -\image html viewing12.png "Shrink" +- Values Labeling allows to display values applied to the +cells or nodes of a 3D presentation. -Shading on - colors the object in a realistic -way, revealing its geometry, for example, by applying shadows to the inside regions; used together with \b Surface. +\image html values_labeling.png -Shading off - colors the object basing only on scalar values. +\anchor labeling_parameters_anchor -\anchor width_opacity_anchor -
        -
      • \b Properties
        • +- Labeling Parameters allows to change such labeling parameters as font and color. -\image html viewing13.png -
          -
        • \b Opacity - allows to set the value of opacity of the -presentation between 0 (transparent) and 100 (opaque).
          • -
        • Line Width - allows to set the width of lines representing -edges of the presentation between 1 (thin) and 100 (thick).
          • -
        -
      • \ref translate_presentation_page "Translate Presentation" - allows -to translate the presentation along coordinate axes.
        • -
      • \ref clipping_page "Clipping Planes" - allows to create -cross-section views of presentations.
        • -
      • \ref sweeping_page "Sweep" - allows to display pseudo-animation of -the presentation.
        • +\image html labeling_parameters.png -
      • Dump view - exports an object from the viewer in bmp, png, -jpg or jpeg image format.
        • -
      • Change Background - allows to change the properties of the -background.
        • -
      • View Operations checkbox - shows or hides the VTK viewer +- Hide - allows to hide the selected presentation from the +viewer. +- If selected in the Object Browser, Hide is replaced by +Show, which allows to display the selected presentation in the +viewer. +- Show Only - allows to display only the selected +presentation, hiding all other from the viewer. + +- Hide Scalar Bar/Show Scalar Bar - allows to show/hide the scalar bar +attached to the 3d presentation. + +- Representation - allows to switch among the available +representation types.\n\n\image html viewing10.png + - Points \image html viewing5.png + - Surface \image html viewing6.png + - Wireframe \image html viewing7.png + - Insideframe - displays the wires lying within the object \image html viewing8.png + - Surfaceframe - displays wires and cells lying on the object surface \image html viewing9.png + - Feature edges - shows the contour of the object \image html viewing11.png + - Shrink \image html viewing12.png + - Shading on - colors the object in a realistic way, + revealing its geometry, for example, by applying shadows to the + inside regions; used together with \b Surface. + - Shading off - colors the object basing only on scalar values. + +- 2D Quadratic - allows to choose how the quadratic elements +are visualized: as straight lines or as arcs of circle. + +\image html quadratic.png + +- \b Properties + - \b Transparency - allows to set the value of transparency of the + presentation between 0 (opaque) and 100 (transparent). + \note For a \ref gauss_points_presentations_page "Gauss Points" + presentation, displayed using Point Sprites or OpenGL + Points \ref primitive_types_page "primitives", this property + only allows switching between transparent and opaque modes. The + textures are drawn in the opaque mode if the transparency is equal to + 0% and in the transparent mode if the transparency is > 0% + (note that they become invisible when the transparency is equal to + 100%).\n\n \image html viewing13.png + - Line Width - allows to set the width of lines representing + edges of the presentation between 1 (thin) and 100 (thick).\n\n + \image html line_width.png + - Shrink Factor - allows to set the shrink factor of the + presentation to be used in \b Shrink mode. Possible values range + between 20 and 100, the default value is 80.\n\n \image html + 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. +- \ref clipping_page "Clipping Planes" - allows to create +cross-section views of presentations. +- \ref sweeping_page "Sweep" - allows to display pseudo-animation of +the presentation. + +- Dump view - exports an object from the viewer in bmp, png, +jpg or jpeg image format. +- Change Background - allows to change the properties of the +background. + +- View Operations checkbox - shows or hides the VTK viewer toolbar. The information about the VTK viewer functionalities is -available in the documentation on the GUI module.
        • -
      • Recording operations checkbox - shows or hides buttons used -for \ref recording_page "Recording"
        • +available in the documentation on the GUI module. +- Recording operations checkbox - shows or hides buttons used +for \ref recording_page "Recording". -
      • The following menu items are added when the presentation is -selected in the Object Browser
        • . -
          -
        • \b Delete - removes the presentation from the study.
          • -
        • \b Refresh - updates the presentation in the VTK viewer
          • -
        • \b Find - activates Find Tool described in the documentation -on GUI module.
          • +The following menu items are added when the presentation is +selected in the Object Browser. -
        -
      +- \b Delete - removes the presentation from the study. +- \b Refresh - updates the presentation in the VTK viewer. +- \b Find - activates Find Tool described in the documentation + on GUI module. When you create several presentations of the same object, you may wish to see them simultaneously, which might be impossible, because they @@ -126,17 +146,21 @@ In \b Auto mode you specify along which \b Axis and at which In \b Manual mode you set the coordinates for each presentation separately. -
      Displaying several presentations at the same time may cause superposition of their scalar bars. To avoid this, check Arrange Scalar Bars radio button in the Preferences -> Post-Pro -> Scalar Bar. A separate scalar bar will be displayed for each presentation. -\n Alternatively you may wish to merge the scalar bars to have a + +Alternatively you may wish to merge the scalar bars to have a common scalar bar for all presentations. To do this, select several presentations or fields in the object browser, right-click and from the pop-up menu select Merge Scalar Range. -\n To restore separate bars and scales for each module select Use + +To restore separate bars and scales for each module select Use Field Range from the same menu. +
      See Also sample scripts of +\ref tui_view_3d_page "Viewing 3D presentations" via TUI. + */ diff --git a/doc/salome/gui/VISU/static/doxygen.css b/doc/salome/gui/VISU/static/doxygen.css index 88e613d2..7a2dcbde 100755 --- a/doc/salome/gui/VISU/static/doxygen.css +++ b/doc/salome/gui/VISU/static/doxygen.css @@ -1,170 +1,836 @@ -H1 { - text-align: center; +/* The standard CSS for doxygen */ + +body, table, div, p, dl { + font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif; + font-size: 12px; +} + +/* @group Heading Levels */ + +h1 { + font-size: 150%; +} + +h2 { + font-size: 120%; +} + +h3 { + font-size: 100%; +} + +dt { + font-weight: bold; +} + +div.multicol { + -moz-column-gap: 1em; + -webkit-column-gap: 1em; + -moz-column-count: 3; + -webkit-column-count: 3; +} + +p.startli, p.startdd, p.starttd { + margin-top: 2px; +} + +p.endli { + margin-bottom: 0px; +} + +p.enddd { + margin-bottom: 4px; +} + +p.endtd { + margin-bottom: 2px; +} + +/* @end */ + +caption { + font-weight: bold; +} + +span.legend { + font-size: 70%; + text-align: center; +} + +h3.version { + font-size: 90%; + text-align: center; +} + +div.qindex, div.navtab{ + background-color: #EBEFF6; + border: 1px solid #A3B4D7; + text-align: center; + margin: 2px; + padding: 2px; +} + +div.qindex, div.navpath { + width: 100%; + line-height: 140%; +} + +div.navtab { + margin-right: 15px; +} + +/* @group Link Styling */ + +a { + color: #3D578C; + font-weight: normal; + text-decoration: none; +} + +.contents a:visited { + color: #4665A2; +} + +a:hover { + text-decoration: underline; +} + +a.qindex { + font-weight: bold; +} + +a.qindexHL { + font-weight: bold; + background-color: #9CAFD4; + color: #ffffff; + border: 1px double #869DCA; +} + +.contents a.qindexHL:visited { + color: #ffffff; +} + +a.el { + font-weight: bold; +} + +a.elRef { +} + +a.code { + color: #4665A2; +} + +a.codeRef { + color: #4665A2; +} + +/* @end */ + +dl.el { + margin-left: -1cm; +} + +.fragment { + font-family: monospace, fixed; + font-size: 105%; +} + +pre.fragment { + border: 1px solid #C4CFE5; + background-color: #FBFCFD; + padding: 4px 6px; + margin: 4px 8px 4px 2px; + overflow: auto; + word-wrap: break-word; + font-size: 9pt; + line-height: 125%; +} + +div.ah { + background-color: black; + font-weight: bold; + color: #ffffff; + margin-bottom: 3px; + margin-top: 3px; + padding: 0.2em; + border: solid thin #333; + border-radius: 0.5em; + -webkit-border-radius: .5em; + -moz-border-radius: .5em; + box-shadow: 2px 2px 3px #999; + -webkit-box-shadow: 2px 2px 3px #999; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px; + background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444)); + background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000); +} + +div.groupHeader { + margin-left: 16px; + margin-top: 12px; + font-weight: bold; +} + +div.version { + border:1px solid #0000FF; + color: #CCCCCC; + font-family: Arial, Helvetica, sans-serif; + font-size: 9pt; + text-align: center; + width:100px; + -moz-border-radius: 8px; + margin: 5px; +} + +div.footer1 { + background-color: #DFE5F1; + border: 1px solid #AAAAAA; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding: 10px; + margin-top: 15px; +} + + +div.groupText { + margin-left: 16px; + font-style: italic; +} + +body { + background: white; + color: black; + margin: 0; +} + +div.contents { + margin-top: 10px; + margin-left: 10px; + margin-right: 10px; +} + +td.indexkey { + background-color: #EBEFF6; + font-weight: bold; + border: 1px solid #C4CFE5; + margin: 2px 0px 2px 0; + padding: 2px 10px; +} + +td.indexvalue { + background-color: #EBEFF6; + border: 1px solid #C4CFE5; + padding: 2px 10px; + margin: 2px 0px; +} + +tr.memlist { + background-color: #EEF1F7; +} + +p.formulaDsp { + text-align: center; +} + +img.formulaDsp { + +} + +img.formulaInl { + vertical-align: middle; +} + +div.center { + text-align: center; + margin-top: 0px; + margin-bottom: 0px; + padding: 0px; +} + +div.center img { + border: 0px; +} + +address.footer { + text-align: right; + padding-right: 12px; +} + +img.footer { + border: 0px; + vertical-align: middle; +} + +/* @group Code Colorization */ + +span.keyword { + color: #008000 +} + +span.keywordtype { + color: #604020 +} + +span.keywordflow { + color: #e08000 +} + +span.comment { + color: #800000 +} + +span.preprocessor { + color: #806020 +} + +span.stringliteral { + color: #002080 +} + +span.charliteral { + color: #008080 +} + +span.vhdldigit { + color: #ff00ff +} + +span.vhdlchar { + color: #000000 +} + +span.vhdlkeyword { + color: #700070 +} + +span.vhdllogic { + color: #ff0000 +} + +/* @end */ + +/* +.search { + color: #003399; + font-weight: bold; +} + +form.search { + margin-bottom: 0px; + margin-top: 0px; +} + +input.search { + font-size: 75%; + color: #000080; + font-weight: normal; + background-color: #e8eef2; +} +*/ + +td.tiny { + font-size: 75%; +} + +.dirtab { + padding: 4px; + border-collapse: collapse; + border: 1px solid #A3B4D7; +} + +th.dirtab { + background: #EBEFF6; + font-weight: bold; +} + +hr { + height: 0px; + border: none; + border-top: 1px solid #4A6AAA; +} + +hr.footer { + height: 1px; +} + +/* @group Member Descriptions */ + +table.memberdecls { + border-spacing: 0px; + padding: 0px; +} + +.mdescLeft, .mdescRight, +.memItemLeft, .memItemRight, +.memTemplItemLeft, .memTemplItemRight, .memTemplParams { + background-color: #F9FAFC; + 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 #C4CFE5; +} + +.memItemLeft, .memTemplItemLeft { + white-space: nowrap; +} + +.memTemplParams { + color: #4665A2; + white-space: nowrap; +} + +/* @end */ + +/* @group Member Details */ + +/* Styles for detailed member documentation */ + +.memtemplate { + font-size: 80%; + color: #4665A2; + font-weight: normal; + margin-left: 9px; +} + +.memnav { + background-color: #EBEFF6; + border: 1px solid #A3B4D7; + text-align: center; + margin: 2px; + margin-right: 15px; + padding: 2px; +} + +.memitem { + padding: 0; + margin-bottom: 10px; +} + +.memname { + white-space: nowrap; + font-weight: bold; + margin-left: 6px; +} + +.memproto { + border-top: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; + padding: 6px 0px 6px 0px; + color: #253555; + font-weight: bold; + text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); + /* opera specific markup */ + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + border-top-right-radius: 8px; + border-top-left-radius: 8px; + /* firefox specific markup */ + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; + -moz-border-radius-topright: 8px; + -moz-border-radius-topleft: 8px; + /* webkit specific markup */ + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + -webkit-border-top-right-radius: 8px; + -webkit-border-top-left-radius: 8px; + background-image:url('nav_f.png'); + background-repeat:repeat-x; + background-color: #E2E8F2; + +} + +.memdoc { + border-bottom: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; + padding: 2px 5px; + background-color: #FBFCFD; + border-top-width: 0; + /* opera specific markup */ + border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + /* firefox specific markup */ + -moz-border-radius-bottomleft: 8px; + -moz-border-radius-bottomright: 8px; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; + background-image: -moz-linear-gradient(center top, #FFFFFF 0%, #FFFFFF 60%, #F7F8FB 95%, #EEF1F7); + /* webkit specific markup */ + -webkit-border-bottom-left-radius: 8px; + -webkit-border-bottom-right-radius: 8px; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.6,#FFFFFF), color-stop(0.60,#FFFFFF), color-stop(0.95,#F7F8FB), to(#EEF1F7)); +} + +.paramkey { + text-align: right; +} + +.paramtype { + white-space: nowrap; } -CAPTION { - font-weight: bold +.paramname { + color: #602020; + white-space: nowrap; } +.paramname em { + font-style: normal; +} + +.params, .retval, .exception, .tparams { + border-spacing: 6px 2px; +} + +.params .paramname, .retval .paramname { + font-weight: bold; + vertical-align: top; +} + +.params .paramtype { + font-style: italic; + vertical-align: top; +} + +.params .paramdir { + font-family: "courier new",courier,monospace; + vertical-align: top; +} + + + -/* Link in the top navbar */ -A.qindex {} +/* @end */ -A.qindexRef {} +/* @group Directory (tree) */ -/* Link to any cross-referenced Doxygen element */ -A.el { - text-decoration: none; - font-weight: bold +/* for the tree view */ + +.ftvtree { + font-family: sans-serif; + margin: 0px; +} + +/* these are for tree view when used as main index */ + +.directory { + font-size: 9pt; + font-weight: bold; + margin: 5px; } -A.elRef { - font-weight: bold +.directory h3 { + margin: 0px; + margin-top: 1em; + font-size: 11pt; } -/* Link to any cross-referenced Doxygen element inside a code section - (ex: header) +/* +The following two styles can be used to replace the root node title +with an image of your choice. Simply uncomment the next two styles, +specify the name of your image and be sure to set 'height' to the +proper pixel height of your image. +*/ + +/* +.directory h3.swap { + height: 61px; + background-repeat: no-repeat; + background-image: url("yourimage.gif"); +} +.directory h3.swap span { + display: none; +} */ -A.code { - text-decoration: none; - font-weight: normal; - color: #4444ee + +.directory > h3 { + margin-top: 0; +} + +.directory p { + margin: 0px; + white-space: nowrap; +} + +.directory div { + display: none; + margin: 0px; +} + +.directory img { + vertical-align: -30%; +} + +/* these are for tree view when not used as main index */ + +.directory-alt { + font-size: 100%; + font-weight: bold; +} + +.directory-alt h3 { + margin: 0px; + margin-top: 1em; + font-size: 11pt; +} + +.directory-alt > h3 { + margin-top: 0; +} + +.directory-alt p { + margin: 0px; + white-space: nowrap; +} + +.directory-alt div { + display: none; + margin: 0px; +} + +.directory-alt img { + vertical-align: -30%; +} + +/* @end */ + +div.dynheader { + margin-top: 8px; +} + +address { + font-style: normal; + color: #2A3D61; +} + +table.doxtable { + border-collapse:collapse; +} + +table.doxtable td, table.doxtable th { + border: 1px solid #2D4068; + padding: 3px 7px 2px; +} + +table.doxtable th { + background-color: #374F7F; + color: #FFFFFF; + font-size: 110%; + padding-bottom: 4px; + padding-top: 5px; + text-align:left; +} + +.tabsearch { + top: 0px; + left: 10px; + height: 36px; + background-image: url('tab_b.png'); + z-index: 101; + overflow: hidden; + font-size: 13px; +} + +.navpath ul +{ + font-size: 11px; + background-image:url('tab_b.png'); + background-repeat:repeat-x; + height:30px; + line-height:30px; + color:#8AA0CC; + border:solid 1px #C2CDE4; + overflow:hidden; + margin:0px; + padding:0px; +} + +.navpath li +{ + list-style-type:none; + float:left; + padding-left:10px; + padding-right:15px; + background-image:url('bc_s.png'); + background-repeat:no-repeat; + background-position:right; + color:#364D7C; +} + +.navpath li.navelem a +{ + height:32px; + display:block; + text-decoration: none; + outline: none; +} + +.navpath li.navelem a:hover +{ + color:#6884BD; +} + +.navpath li.footer +{ + list-style-type:none; + float:right; + padding-left:10px; + padding-right:15px; + background-image:none; + background-repeat:no-repeat; + background-position:right; + color:#364D7C; + font-size: 8pt; +} + + +div.summary +{ + float: right; + font-size: 8pt; + padding-right: 5px; + width: 50%; + text-align: right; +} + +div.summary a +{ + white-space: nowrap; +} + +div.ingroups +{ + font-size: 8pt; + padding-left: 5px; + width: 50%; + text-align: left; +} + +div.ingroups a +{ + white-space: nowrap; +} + +div.header +{ + background-image:url('nav_h.png'); + background-repeat:repeat-x; + background-color: #F9FAFC; + margin: 0px; + border-bottom: 1px solid #C4CFE5; +} + +div.headertitle +{ + padding: 5px 5px 5px 10px; +} + +.title { + font-size: 150%; + font-weight: bold; + margin: 10px 2px; +} + +dl +{ + padding: 0 0 0 10px; +} + +dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug +{ + border-left:4px solid; + padding: 0 0 0 6px; +} + +dl.note +{ + border-color: #D0D000; +} + +dl.warning, dl.attention +{ + border-color: #FF0000; +} + +dl.pre, dl.post, dl.invariant +{ + border-color: #00D000; +} + +dl.deprecated +{ + border-color: #505050; } -A.codeRef { - font-weight: normal; - color: #4444ee +dl.todo +{ + border-color: #00C0E0; } -A:hover { - text-decoration: none; - background-color: lightblue +dl.test +{ + border-color: #3030E0; } -DL.el { - margin-left: -1cm +dl.bug +{ + border-color: #C08050; } -/* A code fragment (ex: header) */ -DIV.fragment { - width: 100%; - border: none; - background-color: #CCCCCC +#projectlogo +{ + text-align: center; + vertical-align: bottom; + border-collapse: separate; +} + +#projectlogo img +{ + border: 0px none; +} + +#projectname +{ + background-color: #175783; + border: 1px solid; + height: 80px; + background-repeat: no-repeat; +/* font: 300% arial,sans-serif;*/ + margin: 0px; + padding: 0px; +} + +#projectbrief +{ + font: 120% arial,sans-serif; + margin: 0px; + padding: 0px; } -/* 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 +#projectnumber +{ + font: 50% arial,sans-serif; + margin: 0px; + padding: 0px; } -/* Method name (+ type) */ -TD.md { - background-color: lightblue; - font-weight: bold; +#titlearea +{ + background: url("head.png"); + background-color: #175783; + border: 1px solid; + height: 80px; + background-repeat: no-repeat; + padding: 0px; + margin: 0px; + width: 100%; + border-bottom: 1px solid #5373B4; } -/* 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; - padding-right : 10px; - padding-top : 2px; - padding-left : 10px; - padding-bottom : 2px; - margin-left : 0px; - margin-right : 0px; - 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; - padding-right : 10px; - padding-top : 2px; - padding-left : 10px; - padding-bottom : 2px; - margin-left : 0px; - margin-right : 0px; - margin-top : 2px; - margin-bottom : 2px -} - -span.keyword { color: #008000 } -span.keywordtype { color: #604020 } -span.keywordflow { color: #e08000 } -span.comment { color: #800000 } -span.preprocessor { color: #806020 } -span.stringliteral { color: #002080 } -span.charliteral { color: #008080 } diff --git a/doc/salome/gui/VISU/static/footer.html b/doc/salome/gui/VISU/static/footer.html index 3bc5ba02..4c89a2ba 100755 --- a/doc/salome/gui/VISU/static/footer.html +++ b/doc/salome/gui/VISU/static/footer.html @@ -1,7 +1,12 @@ -
      -
      - Copyright © 2003-2009 CEA, EDF -
      -
      +
    • +
    + +
    +
    + Copyright © 2007-2012 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
    +
    +
    + \ No newline at end of file diff --git a/doc/salome/gui/VISU/static/header.html b/doc/salome/gui/VISU/static/header.html deleted file mode 100755 index a70a95e3..00000000 --- a/doc/salome/gui/VISU/static/header.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - $title - - -
    -
    -SALOME documentation central -
    -
    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..4571b436 --- /dev/null +++ b/doc/salome/gui/VISU/static/header.html.in @@ -0,0 +1,20 @@ + + + + + +$title + +$treeview +$search +$mathjax + + + + +
    +
    Version: @VERSION@
    + +
    diff --git a/doc/salome/gui/VISU/static/header_py.html.in b/doc/salome/gui/VISU/static/header_py.html.in new file mode 100644 index 00000000..61414bb5 --- /dev/null +++ b/doc/salome/gui/VISU/static/header_py.html.in @@ -0,0 +1,21 @@ + + + + + +$title + +$treeview +$search +$mathjax + + + + +
    +
    Version: @VERSION@
    + + +
    diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am index 5d522593..ec6aeed3 100644 --- a/doc/salome/tui/Makefile.am +++ b/doc/salome/tui/Makefile.am @@ -1,31 +1,33 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 +# 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 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. # -# 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 # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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`; \ @@ -41,4 +43,13 @@ install-data-local: fi; uninstall-local: - rm -rf $(DESTDIR)$(docdir)/tui/VISU + @test -d $(DESTDIR)$(tuidocdir) && chmod -R +w $(DESTDIR)$(tuidocdir) ; \ + for filen in `find $(DESTDIR)$(tuidocdir) -mindepth 1 -maxdepth 1` dummy ; do \ + case $${filen} in \ + dummy ) ;; \ + $(DESTDIR)$(tuidocdir)/docutils ) ;; \ + $(DESTDIR)$(tuidocdir)/head.png ) ;; \ + $(DESTDIR)$(tuidocdir)/visuscreen.png ) ;; \ + * ) echo "removing $${filen}" && rm -rf $${filen} ;; \ + esac ; \ + done diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in index b07d9949..d26981a1 100755 --- a/doc/salome/tui/doxyfile.in +++ b/doc/salome/tui/doxyfile.in @@ -1,30 +1,29 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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) 2003-2007 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 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. +# 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 +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Doxyfile 1.4.6 #--------------------------------------------------------------------------- # 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 +98,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 +137,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 @@ -246,7 +246,8 @@ INCLUDED_BY_GRAPH = NO CALL_GRAPH = NO GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = jpg +DOT_IMAGE_FORMAT = png +DOT_FONTNAME = Arial DOT_PATH = DOTFILE_DIRS = MAX_DOT_GRAPH_WIDTH = 1024 diff --git a/doc/salome/tui/images/application.jpg b/doc/salome/tui/images/application.jpg deleted file mode 100755 index a6979ab9..00000000 Binary files a/doc/salome/tui/images/application.jpg and /dev/null differ 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/logocorp.gif b/doc/salome/tui/images/logocorp.gif deleted file mode 100755 index 7697e083..00000000 Binary files a/doc/salome/tui/images/logocorp.gif and /dev/null differ diff --git a/doc/salome/tui/images/occ.gif b/doc/salome/tui/images/occ.gif deleted file mode 100755 index ce017c8a..00000000 Binary files a/doc/salome/tui/images/occ.gif and /dev/null 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: +
      +
    • Packages - list of TUI packages and scripts.
      • +
    • Data Structures - list of all data structures and classes with brief descriptions.
      • +
    • Files - list of all files with brief descriptions.
      • +
    + +*/ \ No newline at end of file diff --git a/doc/salome/tui/static/doxygen.css b/doc/salome/tui/static/doxygen.css index 88e613d2..7a2dcbde 100755 --- a/doc/salome/tui/static/doxygen.css +++ b/doc/salome/tui/static/doxygen.css @@ -1,170 +1,836 @@ -H1 { - text-align: center; +/* The standard CSS for doxygen */ + +body, table, div, p, dl { + font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif; + font-size: 12px; +} + +/* @group Heading Levels */ + +h1 { + font-size: 150%; +} + +h2 { + font-size: 120%; +} + +h3 { + font-size: 100%; +} + +dt { + font-weight: bold; +} + +div.multicol { + -moz-column-gap: 1em; + -webkit-column-gap: 1em; + -moz-column-count: 3; + -webkit-column-count: 3; +} + +p.startli, p.startdd, p.starttd { + margin-top: 2px; +} + +p.endli { + margin-bottom: 0px; +} + +p.enddd { + margin-bottom: 4px; +} + +p.endtd { + margin-bottom: 2px; +} + +/* @end */ + +caption { + font-weight: bold; +} + +span.legend { + font-size: 70%; + text-align: center; +} + +h3.version { + font-size: 90%; + text-align: center; +} + +div.qindex, div.navtab{ + background-color: #EBEFF6; + border: 1px solid #A3B4D7; + text-align: center; + margin: 2px; + padding: 2px; +} + +div.qindex, div.navpath { + width: 100%; + line-height: 140%; +} + +div.navtab { + margin-right: 15px; +} + +/* @group Link Styling */ + +a { + color: #3D578C; + font-weight: normal; + text-decoration: none; +} + +.contents a:visited { + color: #4665A2; +} + +a:hover { + text-decoration: underline; +} + +a.qindex { + font-weight: bold; +} + +a.qindexHL { + font-weight: bold; + background-color: #9CAFD4; + color: #ffffff; + border: 1px double #869DCA; +} + +.contents a.qindexHL:visited { + color: #ffffff; +} + +a.el { + font-weight: bold; +} + +a.elRef { +} + +a.code { + color: #4665A2; +} + +a.codeRef { + color: #4665A2; +} + +/* @end */ + +dl.el { + margin-left: -1cm; +} + +.fragment { + font-family: monospace, fixed; + font-size: 105%; +} + +pre.fragment { + border: 1px solid #C4CFE5; + background-color: #FBFCFD; + padding: 4px 6px; + margin: 4px 8px 4px 2px; + overflow: auto; + word-wrap: break-word; + font-size: 9pt; + line-height: 125%; +} + +div.ah { + background-color: black; + font-weight: bold; + color: #ffffff; + margin-bottom: 3px; + margin-top: 3px; + padding: 0.2em; + border: solid thin #333; + border-radius: 0.5em; + -webkit-border-radius: .5em; + -moz-border-radius: .5em; + box-shadow: 2px 2px 3px #999; + -webkit-box-shadow: 2px 2px 3px #999; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px; + background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444)); + background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000); +} + +div.groupHeader { + margin-left: 16px; + margin-top: 12px; + font-weight: bold; +} + +div.version { + border:1px solid #0000FF; + color: #CCCCCC; + font-family: Arial, Helvetica, sans-serif; + font-size: 9pt; + text-align: center; + width:100px; + -moz-border-radius: 8px; + margin: 5px; +} + +div.footer1 { + background-color: #DFE5F1; + border: 1px solid #AAAAAA; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + padding: 10px; + margin-top: 15px; +} + + +div.groupText { + margin-left: 16px; + font-style: italic; +} + +body { + background: white; + color: black; + margin: 0; +} + +div.contents { + margin-top: 10px; + margin-left: 10px; + margin-right: 10px; +} + +td.indexkey { + background-color: #EBEFF6; + font-weight: bold; + border: 1px solid #C4CFE5; + margin: 2px 0px 2px 0; + padding: 2px 10px; +} + +td.indexvalue { + background-color: #EBEFF6; + border: 1px solid #C4CFE5; + padding: 2px 10px; + margin: 2px 0px; +} + +tr.memlist { + background-color: #EEF1F7; +} + +p.formulaDsp { + text-align: center; +} + +img.formulaDsp { + +} + +img.formulaInl { + vertical-align: middle; +} + +div.center { + text-align: center; + margin-top: 0px; + margin-bottom: 0px; + padding: 0px; +} + +div.center img { + border: 0px; +} + +address.footer { + text-align: right; + padding-right: 12px; +} + +img.footer { + border: 0px; + vertical-align: middle; +} + +/* @group Code Colorization */ + +span.keyword { + color: #008000 +} + +span.keywordtype { + color: #604020 +} + +span.keywordflow { + color: #e08000 +} + +span.comment { + color: #800000 +} + +span.preprocessor { + color: #806020 +} + +span.stringliteral { + color: #002080 +} + +span.charliteral { + color: #008080 +} + +span.vhdldigit { + color: #ff00ff +} + +span.vhdlchar { + color: #000000 +} + +span.vhdlkeyword { + color: #700070 +} + +span.vhdllogic { + color: #ff0000 +} + +/* @end */ + +/* +.search { + color: #003399; + font-weight: bold; +} + +form.search { + margin-bottom: 0px; + margin-top: 0px; +} + +input.search { + font-size: 75%; + color: #000080; + font-weight: normal; + background-color: #e8eef2; +} +*/ + +td.tiny { + font-size: 75%; +} + +.dirtab { + padding: 4px; + border-collapse: collapse; + border: 1px solid #A3B4D7; +} + +th.dirtab { + background: #EBEFF6; + font-weight: bold; +} + +hr { + height: 0px; + border: none; + border-top: 1px solid #4A6AAA; +} + +hr.footer { + height: 1px; +} + +/* @group Member Descriptions */ + +table.memberdecls { + border-spacing: 0px; + padding: 0px; +} + +.mdescLeft, .mdescRight, +.memItemLeft, .memItemRight, +.memTemplItemLeft, .memTemplItemRight, .memTemplParams { + background-color: #F9FAFC; + 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 #C4CFE5; +} + +.memItemLeft, .memTemplItemLeft { + white-space: nowrap; +} + +.memTemplParams { + color: #4665A2; + white-space: nowrap; +} + +/* @end */ + +/* @group Member Details */ + +/* Styles for detailed member documentation */ + +.memtemplate { + font-size: 80%; + color: #4665A2; + font-weight: normal; + margin-left: 9px; +} + +.memnav { + background-color: #EBEFF6; + border: 1px solid #A3B4D7; + text-align: center; + margin: 2px; + margin-right: 15px; + padding: 2px; +} + +.memitem { + padding: 0; + margin-bottom: 10px; +} + +.memname { + white-space: nowrap; + font-weight: bold; + margin-left: 6px; +} + +.memproto { + border-top: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; + padding: 6px 0px 6px 0px; + color: #253555; + font-weight: bold; + text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); + /* opera specific markup */ + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + border-top-right-radius: 8px; + border-top-left-radius: 8px; + /* firefox specific markup */ + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; + -moz-border-radius-topright: 8px; + -moz-border-radius-topleft: 8px; + /* webkit specific markup */ + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + -webkit-border-top-right-radius: 8px; + -webkit-border-top-left-radius: 8px; + background-image:url('nav_f.png'); + background-repeat:repeat-x; + background-color: #E2E8F2; + +} + +.memdoc { + border-bottom: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; + padding: 2px 5px; + background-color: #FBFCFD; + border-top-width: 0; + /* opera specific markup */ + border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + /* firefox specific markup */ + -moz-border-radius-bottomleft: 8px; + -moz-border-radius-bottomright: 8px; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; + background-image: -moz-linear-gradient(center top, #FFFFFF 0%, #FFFFFF 60%, #F7F8FB 95%, #EEF1F7); + /* webkit specific markup */ + -webkit-border-bottom-left-radius: 8px; + -webkit-border-bottom-right-radius: 8px; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.6,#FFFFFF), color-stop(0.60,#FFFFFF), color-stop(0.95,#F7F8FB), to(#EEF1F7)); +} + +.paramkey { + text-align: right; +} + +.paramtype { + white-space: nowrap; } -CAPTION { - font-weight: bold +.paramname { + color: #602020; + white-space: nowrap; } +.paramname em { + font-style: normal; +} + +.params, .retval, .exception, .tparams { + border-spacing: 6px 2px; +} + +.params .paramname, .retval .paramname { + font-weight: bold; + vertical-align: top; +} + +.params .paramtype { + font-style: italic; + vertical-align: top; +} + +.params .paramdir { + font-family: "courier new",courier,monospace; + vertical-align: top; +} + + + -/* Link in the top navbar */ -A.qindex {} +/* @end */ -A.qindexRef {} +/* @group Directory (tree) */ -/* Link to any cross-referenced Doxygen element */ -A.el { - text-decoration: none; - font-weight: bold +/* for the tree view */ + +.ftvtree { + font-family: sans-serif; + margin: 0px; +} + +/* these are for tree view when used as main index */ + +.directory { + font-size: 9pt; + font-weight: bold; + margin: 5px; } -A.elRef { - font-weight: bold +.directory h3 { + margin: 0px; + margin-top: 1em; + font-size: 11pt; } -/* Link to any cross-referenced Doxygen element inside a code section - (ex: header) +/* +The following two styles can be used to replace the root node title +with an image of your choice. Simply uncomment the next two styles, +specify the name of your image and be sure to set 'height' to the +proper pixel height of your image. +*/ + +/* +.directory h3.swap { + height: 61px; + background-repeat: no-repeat; + background-image: url("yourimage.gif"); +} +.directory h3.swap span { + display: none; +} */ -A.code { - text-decoration: none; - font-weight: normal; - color: #4444ee + +.directory > h3 { + margin-top: 0; +} + +.directory p { + margin: 0px; + white-space: nowrap; +} + +.directory div { + display: none; + margin: 0px; +} + +.directory img { + vertical-align: -30%; +} + +/* these are for tree view when not used as main index */ + +.directory-alt { + font-size: 100%; + font-weight: bold; +} + +.directory-alt h3 { + margin: 0px; + margin-top: 1em; + font-size: 11pt; +} + +.directory-alt > h3 { + margin-top: 0; +} + +.directory-alt p { + margin: 0px; + white-space: nowrap; +} + +.directory-alt div { + display: none; + margin: 0px; +} + +.directory-alt img { + vertical-align: -30%; +} + +/* @end */ + +div.dynheader { + margin-top: 8px; +} + +address { + font-style: normal; + color: #2A3D61; +} + +table.doxtable { + border-collapse:collapse; +} + +table.doxtable td, table.doxtable th { + border: 1px solid #2D4068; + padding: 3px 7px 2px; +} + +table.doxtable th { + background-color: #374F7F; + color: #FFFFFF; + font-size: 110%; + padding-bottom: 4px; + padding-top: 5px; + text-align:left; +} + +.tabsearch { + top: 0px; + left: 10px; + height: 36px; + background-image: url('tab_b.png'); + z-index: 101; + overflow: hidden; + font-size: 13px; +} + +.navpath ul +{ + font-size: 11px; + background-image:url('tab_b.png'); + background-repeat:repeat-x; + height:30px; + line-height:30px; + color:#8AA0CC; + border:solid 1px #C2CDE4; + overflow:hidden; + margin:0px; + padding:0px; +} + +.navpath li +{ + list-style-type:none; + float:left; + padding-left:10px; + padding-right:15px; + background-image:url('bc_s.png'); + background-repeat:no-repeat; + background-position:right; + color:#364D7C; +} + +.navpath li.navelem a +{ + height:32px; + display:block; + text-decoration: none; + outline: none; +} + +.navpath li.navelem a:hover +{ + color:#6884BD; +} + +.navpath li.footer +{ + list-style-type:none; + float:right; + padding-left:10px; + padding-right:15px; + background-image:none; + background-repeat:no-repeat; + background-position:right; + color:#364D7C; + font-size: 8pt; +} + + +div.summary +{ + float: right; + font-size: 8pt; + padding-right: 5px; + width: 50%; + text-align: right; +} + +div.summary a +{ + white-space: nowrap; +} + +div.ingroups +{ + font-size: 8pt; + padding-left: 5px; + width: 50%; + text-align: left; +} + +div.ingroups a +{ + white-space: nowrap; +} + +div.header +{ + background-image:url('nav_h.png'); + background-repeat:repeat-x; + background-color: #F9FAFC; + margin: 0px; + border-bottom: 1px solid #C4CFE5; +} + +div.headertitle +{ + padding: 5px 5px 5px 10px; +} + +.title { + font-size: 150%; + font-weight: bold; + margin: 10px 2px; +} + +dl +{ + padding: 0 0 0 10px; +} + +dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug +{ + border-left:4px solid; + padding: 0 0 0 6px; +} + +dl.note +{ + border-color: #D0D000; +} + +dl.warning, dl.attention +{ + border-color: #FF0000; +} + +dl.pre, dl.post, dl.invariant +{ + border-color: #00D000; +} + +dl.deprecated +{ + border-color: #505050; } -A.codeRef { - font-weight: normal; - color: #4444ee +dl.todo +{ + border-color: #00C0E0; } -A:hover { - text-decoration: none; - background-color: lightblue +dl.test +{ + border-color: #3030E0; } -DL.el { - margin-left: -1cm +dl.bug +{ + border-color: #C08050; } -/* A code fragment (ex: header) */ -DIV.fragment { - width: 100%; - border: none; - background-color: #CCCCCC +#projectlogo +{ + text-align: center; + vertical-align: bottom; + border-collapse: separate; +} + +#projectlogo img +{ + border: 0px none; +} + +#projectname +{ + background-color: #175783; + border: 1px solid; + height: 80px; + background-repeat: no-repeat; +/* font: 300% arial,sans-serif;*/ + margin: 0px; + padding: 0px; +} + +#projectbrief +{ + font: 120% arial,sans-serif; + margin: 0px; + padding: 0px; } -/* 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 +#projectnumber +{ + font: 50% arial,sans-serif; + margin: 0px; + padding: 0px; } -/* Method name (+ type) */ -TD.md { - background-color: lightblue; - font-weight: bold; +#titlearea +{ + background: url("head.png"); + background-color: #175783; + border: 1px solid; + height: 80px; + background-repeat: no-repeat; + padding: 0px; + margin: 0px; + width: 100%; + border-bottom: 1px solid #5373B4; } -/* 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; - padding-right : 10px; - padding-top : 2px; - padding-left : 10px; - padding-bottom : 2px; - margin-left : 0px; - margin-right : 0px; - 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; - padding-right : 10px; - padding-top : 2px; - padding-left : 10px; - padding-bottom : 2px; - margin-left : 0px; - margin-right : 0px; - margin-top : 2px; - margin-bottom : 2px -} - -span.keyword { color: #008000 } -span.keywordtype { color: #604020 } -span.keywordflow { color: #e08000 } -span.comment { color: #800000 } -span.preprocessor { color: #806020 } -span.stringliteral { color: #002080 } -span.charliteral { color: #008080 } diff --git a/doc/salome/tui/static/footer.html b/doc/salome/tui/static/footer.html index cb55f397..5b030c02 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-2012 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..4571b436 --- /dev/null +++ b/doc/salome/tui/static/header.html.in @@ -0,0 +1,20 @@ + + + + + +$title + +$treeview +$search +$mathjax + + + + +
    +
    Version: @VERSION@
    + +
    diff --git a/doc/salome/tui/static/myheader.html b/doc/salome/tui/static/myheader.html deleted file mode 100755 index d2efb75f..00000000 --- a/doc/salome/tui/static/myheader.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Main Page - - - - -  - - diff --git a/idl/Makefile.am b/idl/Makefile.am index 6c0d0b89..fe17f2ef 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,24 +1,22 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 +# 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 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. # -# 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 # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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 @@ -28,6 +26,8 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am BASEIDL_FILES = VISU_Gen.idl +BASEIDL_FILES_PY=$(BASEIDL_FILES:%.idl=%_idl.py) + # This variable defines the files to be installed dist_salomeidl_DATA = $(BASEIDL_FILES) @@ -41,7 +41,6 @@ nodist_libSalomeIDLVISU_la_SOURCES = VISU_GenSK.cc nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh) libSalomeIDLVISU_la_CPPFLAGS = \ - -I$(top_builddir)/salome_adm/unix \ -I$(top_builddir)/idl \ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @KERNEL_CXXFLAGS@ @MED_CXXFLAGS@ libSalomeIDLVISU_la_LDFLAGS = -no-undefined -version-info=0:0:0 @@ -51,7 +50,7 @@ libSalomeIDLVISU_la_LIBADD = @CORBA_LIBS@ $(MED_LDFLAGS) -lSalomeIDLMED OMNIORB_IDL = @OMNIORB_IDL@ OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome -IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome -I$(top_builddir)/salome_adm/unix +IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome IDLPYFLAGS = @IDLPYFLAGS@ -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome # potential problem on parallel make on the following - multiple outputs @@ -67,9 +66,15 @@ install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%) $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \ done -# uninstall-local removes too much, but it works in distcheck +# we want to remove only staff generated for IDL files and nothing more uninstall-local: - rm -rf $(DESTDIR)$(salomepythondir)/* + @for modulen in VISU ; do \ + test -d $(DESTDIR)$(salomepythondir)/$${modulen} && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen} ; \ + test -d $(DESTDIR)$(salomepythondir)/$${modulen}__POA && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}__POA" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen}__POA ; \ + done ; \ + for filen in $(BASEIDL_FILES_PY) ; do \ + echo "Removing $(DESTDIR)$(salomepythondir)/$${filen}" && rm -f $(DESTDIR)$(salomepythondir)/$${filen}* ; \ + done mostlyclean-local: clean-idls diff --git a/idl/VISU_Gen.idl b/idl/VISU_Gen.idl index f4027093..60a44498 100644 --- a/idl/VISU_Gen.idl +++ b/idl/VISU_Gen.idl @@ -1,27 +1,27 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2012 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) 2003-2007 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 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. +// 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 +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : VISU_Gen.idl // Author : Alexey Petrov -// + /*! \file VISU_Gen.idl This file conatins a set of interfaces of the %VISU module. * This module provides various forms of data visualization in %SALOME application. * These forms include data tables, XY plots, 3d representations @@ -53,8 +53,18 @@ module VISU { * of the scaling, which can be applied on different presentations. */ enum Scaling{ LINEAR, /*!< Linear type of scaling. */ - LOGARITHMIC /*!< Logarithmic type of scaling. */ - }; + LOGARITHMIC /*!< Logarithmic type of scaling. */ + }; + + /*! + * This enumeration contains a set of elements defining + * what kind of value will be extracted from gauss points data. + */ + enum GaussMetric { + AVERAGE, /*!< Average value (default). */ + MINIMUM, /*!< Minimum value. */ + MAXIMUM /*!< Maximum value. */ + }; /*! * This enumeration contains a set of elements defining the @@ -64,10 +74,67 @@ 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, + MT_POINT_SPRITE /*!< VISU specific */ + }; + + /*! + * 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. @@ -88,6 +155,7 @@ module VISU { TPOINTMAP3D, /*!< 3D presentation for table object */ TCUTPLANES, /*!< Cut planes 3D presentation object */ TCUTLINES, /*!< Cut lines 3D presentation object */ + TCUTSEGMENT, /*!< Cut segment 3D presentation object */ TVECTORS, /*!< Vectors 3D presentation object */ TSTREAMLINES, /*!< Streamlines 3D presentation object */ TVISUGEN, /*!< %VISU generator used for performing operations with different %VISU objects */ @@ -103,6 +171,7 @@ module VISU { TFIELD, /*!< Field represents the results of calculations (it can be scalar or vector values), grouped together under one physical concept. */ TTIMESTAMP, /*!