diff --git a/Makefile.am b/Makefile.am index abe560f09..507a6f312 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,6 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # # This library is free software; you can redistribute it and/or @@ -15,29 +17,39 @@ # 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 # Modified by : Alexander BORODIN (OCN) - autotools usage -# $Header$ # - include $(top_srcdir)/adm_local/unix/make_common_starter.am +if SMESH_ENABLE_GUI + ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ + -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ + -I ${MED_ROOT_DIR}/adm_local/unix/config_files \ + -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files +else !SMESH_ENABLE_GUI + ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ + -I ${MED_ROOT_DIR}/adm_local/unix/config_files \ + -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files +endif + SUBDIRS = idl adm_local resources src doc bin DIST_SUBDIRS = idl adm_local resources src doc bin DISTCLEANFILES = a.out aclocal.m4 configure -salomeinclude_DATA=SMESH_version.h +salomeinclude_DATA = SMESH_version.h -EXTRA_DIST+= \ - build_configure \ - clean_configure \ +EXTRA_DIST += \ + build_configure \ + clean_configure \ LICENCE dist-hook: @@ -46,7 +58,7 @@ dist-hook: usr_docs: (cd doc && $(MAKE) $(AM_MAKEFLAGS) usr_docs) -docs:usr_docs +docs: usr_docs dev_docs: (cd doc && $(MAKE) $(AM_MAKEFLAGS) dev_docs) diff --git a/SMESH_version.h.in b/SMESH_version.h.in index 85259c4e3..d9b835afa 100644 --- a/SMESH_version.h.in +++ b/SMESH_version.h.in @@ -1,26 +1,28 @@ -// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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 +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// See http://www.salome-platform.org/ +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : SMESH_version.h // Author : Vadim SANDLER // Module : SALOME - +// #if !defined(__SMESH_VERSION_H__) #define __SMESH_VERSION_H__ diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 7ae83a6fc..f35273fac 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,19 +1,24 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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 -# +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# 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 + SUBDIRS = unix diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index facd4e6f4..5f6d5f753 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,22 +1,24 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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 -# - +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# 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 SUBDIRS = config_files diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index 3198e9da1..0ed70f5f8 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,23 +1,27 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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 -# +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# 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_admlocalm4_DATA = \ - check_SMESH.m4 \ - check_f77.m4 +dist_admlocalm4_DATA = \ + check_SMESH.m4 \ + check_f77.m4 \ + check_Platform.m4 diff --git a/adm_local/unix/config_files/check_Platform.m4 b/adm_local/unix/config_files/check_Platform.m4 index b4cd3d875..ff6606562 100755 --- a/adm_local/unix/config_files/check_Platform.m4 +++ b/adm_local/unix/config_files/check_Platform.m4 @@ -1,25 +1,24 @@ -dnl Copyright (C) 2003 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 -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 -dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +dnl Copyright (C) 2007-2008 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 +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 +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 - AC_DEFUN([CHECK_PLATFORM],[ AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_CPP])dnl diff --git a/adm_local/unix/config_files/check_SMESH.m4 b/adm_local/unix/config_files/check_SMESH.m4 index 5518cfa24..4c0cdb6e4 100644 --- a/adm_local/unix/config_files/check_SMESH.m4 +++ b/adm_local/unix/config_files/check_SMESH.m4 @@ -1,3 +1,24 @@ +dnl Copyright (C) 2007-2008 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 +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 +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 # Check availability of SMesh binary distribution # # Author : Nicolas REJNERI (OPEN CASCADE, 2003) diff --git a/adm_local/unix/config_files/check_f77.m4 b/adm_local/unix/config_files/check_f77.m4 index 1b74a8532..e03c6c165 100644 --- a/adm_local/unix/config_files/check_f77.m4 +++ b/adm_local/unix/config_files/check_f77.m4 @@ -1,23 +1,23 @@ -dnl Copyright (C) 2003 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 -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 -dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +dnl Copyright (C) 2007-2008 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 +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 +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 AC_DEFUN([CHECK_F77],[ diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 533941331..36ad8c3a7 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,49 +1,83 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# 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 # # ============================================================ # This file defines the common definitions used in several # Makefile. This file must be included, if needed, by the file # Makefile.am. # ============================================================ -# - # Standard directory for installation -salomeincludedir = $(includedir)/@PACKAGE@ -libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@ -bindir = $(prefix)/bin/@PACKAGE@ +# +salomeincludedir = $(includedir)/salome +libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome +bindir = $(prefix)/bin/salome salomescriptdir = $(bindir) +salomepythondir = $(pythondir)/salome +salomepyexecdir = $(pyexecdir)/salome # Directory for installing idl files -salomeidldir = $(prefix)/idl/@PACKAGE@ +salomeidldir = $(prefix)/idl/salome # Directory for installing resource files -salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@ +salomeresdir = $(prefix)/share/salome/resources/@MODULE_NAME@ # Directories for installing admin files -admlocaldir = $(prefix)/adm_local -admlocalunixdir = $(admlocaldir)/unix -admlocalm4dir = $(admlocaldir)/unix/config_files +admlocaldir = $(prefix)/adm_local +admlocalunixdir = $(admlocaldir)/unix +admlocalm4dir = $(admlocaldir)/unix/config_files # Shared modules installation directory -sharedpkgpythondir =$(pkgpythondir)/shared_modules +sharedpkgpythondir = $(salomepythondir)/shared_modules # Documentation directory -docdir = $(datadir)/doc/@PACKAGE@ +docdir = $(datadir)/doc/salome # common rules -# moc-files generation +# meta object implementation files generation (moc) %_moc.cxx: %.h $(MOC) $< -o $@ -# qm-files generation -%.qm: %.po - $(MSG2QM) $< $@ +# translation (*.qm) files generation (lrelease) +%.qm: %.ts + $(LRELEASE) $< -qm $@ -EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=%.po) +# resource files generation (qrcc) +qrc_%.cxx: %.qrc + $(QRCC) $< -o $@ -name $(*F) +# qt forms files generation (uic) +ui_%.h: %.ui + $(UIC) -o $@ $< + +# extra distributed files +EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \ + $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts) + +# customize clean operation mostlyclean-local: rm -f @builddir@/*_moc.cxx rm -f @builddir@/*.qm + rm -f @builddir@/ui_*.h + rm -f @builddir@/qrc_*.cxx # tests tests: unittest diff --git a/bin/Makefile.am b/bin/Makefile.am index 4fdbc5386..dc7848fe5 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,36 +1,32 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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 +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# 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 +# # -* Makefile *- -# # Author : Guillaume Boulant (CSSI) -# Module : KERNEL -# $Header$ +# Module : SMESH # - include $(top_srcdir)/adm_local/unix/make_common_starter.am -# -# =============================================================== -# Files to be installed -# =============================================================== -# +# non-distributed files +nodist_salomescript_DATA = VERSION -# These files are data, module or lib files -nodist_salomescript_DATA= VERSION - -EXTRA_DIST+= VERSION.in +# distributed files +dist_salomescript_SCRIPTS = diff --git a/build_configure b/build_configure index 66f991e57..d135d9e8d 100755 --- a/build_configure +++ b/build_configure @@ -1,15 +1,32 @@ #!/bin/bash - +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# 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 # # Tool for updating list of .in file for the SALOME project # and regenerating configure script -# # Author : Marc Tajchman - CEA # Date : 10/10/2002 # Modified by : Alexander BORODIN (OCN) - autotools usage # $Header$ # - ORIG_DIR=`pwd` CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` SMESH_WITH_GUI="yes" @@ -32,10 +49,10 @@ fi for option do case $option in - -with-ihm | --with-ihm) + -with-gui | --with-gui) SMESH_WITH_GUI="yes" break;; - -without-ihm | --without-ihm | -with-ihm=no | --with-ihm=no) + -without-gui | --without-gui | -with-gui=no | --with-gui=no) SMESH_WITH_GUI="no" break;; esac diff --git a/clean_configure b/clean_configure new file mode 100755 index 000000000..f57f7b3bf --- /dev/null +++ b/clean_configure @@ -0,0 +1,35 @@ +#!/bin/sh +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# 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 +# +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 diff --git a/configure.ac b/configure.ac index 63eca7ec2..4aeb847b6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,15 +1,32 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# 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 # # Author : Marc Tajchman (CEA) # Date : 28/06/2001 # Modified by : Patrick GOLDBRONN (CEA) # Modified by : Marc Tajchman (CEA) # Modified by : Alexander BORODIN (OCN) - autotools usage -# # Created from configure.in.base # - - -AC_INIT([Salome2 Project SMESH module], [4.1.1], [webmaster.salome@opencascade.com], [salome]) +AC_INIT([Salome2 Project SMESH module], [5.1.0], [webmaster.salome@opencascade.com], [SalomeSMESH]) AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -123,6 +140,7 @@ AC_PROG_FC AC_FC_LIBRARY_LDFLAGS if test "X$FC" != "X" ; then fortran_ok=yes + F77=$FC fi dnl AM_CONDITIONAL( USE_GFORTRAN, [test "$F77" = "gfortran"]) @@ -198,18 +216,6 @@ SMESH_WITH_GUI=yes AM_CONDITIONAL(SMESH_ENABLE_GUI, [test "${SMESH_WITH_GUI}" = "yes"]) -if test "${SMESH_WITH_GUI}" = "yes"; then - -echo -echo --------------------------------------------- -echo testing msg2qm -echo --------------------------------------------- -echo - -CHECK_MSG2QM - -fi - if test "x${GUI_DISABLE_CORBA}" != "xyes" ; then echo echo --------------------------------------------- @@ -374,7 +380,7 @@ echo echo Configure if test "${SMESH_WITH_GUI}" = "yes"; then -variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok qwt_ok Kernel_ok Geom_ok Med_ok" +variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok qwt_ok Kernel_ok Geom_ok Med_ok SalomeGUI_ok" fi if test "${SMESH_WITH_GUI}" = "no"; then @@ -408,42 +414,16 @@ dnl AM_CONDITIONAL(ENABLE_OCCVIEWER, [test "$DISABLE_OCCVIEWER" = no]) dnl AM_CONDITIONAL(ENABLE_VTKVIEWER, [test "$DISABLE_VTKVIEWER" = no]) dnl AM_CONDITIONAL(ENABLE_SALOMEOBJECT, [test "$DISABLE_SALOMEOBJECT" = no]) -echo -echo --------------------------------------------- -echo copying resource files, shell scripts, and -echo xml files -echo --------------------------------------------- -echo - - -dnl copy shells and utilities contained in the bin directory -dnl excluding .in files (treated in AC-OUTPUT below) and CVS -dnl directory - -mkdir -p bin/salome -cd bin/salome - -for i in $ROOT_SRCDIR/bin/* -do - local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` - case "$local_bin" in - *.in | *~) ;; - ./bin/CVS | ./bin/salome) ;; - *) $INSTALL $i . ; echo $local_bin ;; - esac -done -cd $ROOT_BUILDDIR - echo echo --------------------------------------------- echo generating Makefiles and configure files echo --------------------------------------------- echo -AC_OUTPUT_COMMANDS([ \ - chmod +x ./bin/*; \ - chmod +x ./bin/salome/*; \ -]) +#AC_OUTPUT_COMMANDS([ \ +# chmod +x ./bin/*; \ +# chmod +x ./bin/salome/*; \ +#]) # This list is initiated using autoscan and must be updated manually # when adding a new file .in to manage. When you execute @@ -460,11 +440,11 @@ AC_OUTPUT([ \ ./doc/Makefile \ ./doc/salome/Makefile \ ./doc/salome/gui/Makefile \ + ./doc/salome/gui/SMESH/Makefile \ ./doc/salome/gui/SMESH/doxyfile \ ./doc/salome/gui/SMESH/doxyfile_py \ ./doc/salome/tui/Makefile \ - ./doc/salome/tui/SMESH/doxyfile \ - ./doc/salome/tui/SMESH/sources/static/tree.js \ + ./doc/salome/tui/doxyfile \ ./src/Makefile \ ./src/Controls/Makefile \ ./src/Driver/Makefile \ diff --git a/doc/Makefile.am b/doc/Makefile.am index dcbc00f24..1902d9d21 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,6 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # # This library is free software; you can redistribute it and/or @@ -15,16 +17,21 @@ # 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 : 30/11/2001 -# Modified by : Alexander BORODIN (OCN) - autotools usage +# Modified by : Alexander BORODIN (OCN) - autotools usage # $Header$ -# # source path +# +SUBDIRS = salome -SUBDIRS= salome +usr_docs: + (cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs) + +docs: usr_docs + +dev_docs: + (cd salome && $(MAKE) $(AM_MAKEFLAGS) dev_docs) diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am index 43c97dd62..5a92861e5 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -1,4 +1,7 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -14,20 +17,17 @@ # 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 : 30/11/2001 # Modified by : Alexander BORODIN (OCN) - autotools usage # $Header: # - -SUBDIRS= tui gui -SUBDIRSTUI= tui -SUBDIRSGUI= gui +SUBDIRS = tui gui +SUBDIRSTUI = tui +SUBDIRSGUI = gui usr_docs: @@SETX@; for d in $(SUBDIRSGUI); do \ diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am index 66ce3648e..0e41ee5ff 100644 --- a/doc/salome/gui/Makefile.am +++ b/doc/salome/gui/Makefile.am @@ -1,4 +1,7 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -20,50 +23,12 @@ # Author : Vasily Rusyaev (Open Cascade NN) # Modified by : Alexander BORODIN (OCN) - autotools usage # Module : doc - +# include $(top_srcdir)/adm_local/unix/make_common_starter.am -EXTRA_DIST+=SMESH +SUBDIRS = SMESH -doxygen=@DOXYGEN@ - -# Below command replaces "smeshDC" by "smesh" except cases -# "ssmeshDC", "1smeshDC" and "esmeshDC" (these sequences -# can be found in file names and must not be replaces): -# -# sed 's/\([^s1e]\)smeshDC\|^smeshDC/\1smesh/g' $${filen} > ./tmp; -# usr_docs: - cd ./SMESH; \ - echo "Processing smeshDC.py file: "; \ - $(doxygen) ./doxyfile_py; \ - cd ./smeshpy_doc; \ - filesl=`find .`; \ - for filen in $${filesl}; do \ - sed 's/\([^s1e]\)smeshDC\|^smeshDC/\1smesh/g' $${filen} > ./tmp; \ - mv -f tmp $${filen}; \ - done; \ - cd ..; \ - echo "Running doxygen in directory: "`pwd`; \ - $(doxygen) ./doxyfile; + (cd SMESH && $(MAKE) $(AM_MAKEFLAGS) usr_docs) docs: usr_docs - -clean-local: - rm -fr `ls | grep -v "Makefile"` - rm -fr SMESH - -install-data-local: usr_docs - mkdir -p $(docdir)/gui - cp -rf SMESH $(docdir)/gui - -find $(PWD) -name CVS -prune -exec rm -rf {} \; - -uninstall-local: - rm -rf $(docdir)/gui/SMESH - -docguidir=$(docdir)/gui/SMESH - -nodist_docgui_DATA= SMESH/doxyfile -nodist_docgui_DATA+= SMESH/doxyfile_py -EXTRA_DIST+= SMESH/doxyfile.in -EXTRA_DIST+= SMESH/doxyfile_py.in diff --git a/doc/salome/gui/SMESH/Makefile.am b/doc/salome/gui/SMESH/Makefile.am new file mode 100755 index 000000000..a93b57ccb --- /dev/null +++ b/doc/salome/gui/SMESH/Makefile.am @@ -0,0 +1,73 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : Makefile.in +# Author : Vasily Rusyaev (Open Cascade NN) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : doc +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +EXTRA_DIST += images input static + +usr_docs: doxyfile_py doxyfile + echo "===========================================" ; \ + echo "Generating Python interface documentation"; \ + echo "===========================================" ; \ + $(DOXYGEN) doxyfile_py ; \ + echo "===========================================" ; \ + echo "Replacing smeshDC by smesh" ; \ + echo "===========================================" ; \ + files=`find smeshpy_doc -type f` ; \ + for filen in $${files} ; do \ + sed -e "s/\/smesh/g" -e "s/smesh\.smesh/smesh/g" \ + -e "s/smesh::smesh/smesh/g" $${filen} > $${filen}_ ; \ + mv -f $${filen}_ $${filen} ; \ + done ; \ + echo "===========================================" ; \ + echo "Generating GUI documentation" ; \ + echo "===========================================" ; \ + $(DOXYGEN) doxyfile ; + +docs: usr_docs + +clean-local: + @for filen in `find . -maxdepth 1` ; do \ + case $${filen} in \ + ./Makefile | ./doxyfile | ./doxyfile_py ) ;; \ + . | .. ) ;; \ + *) echo "Removing $${filen}" ; rm -rf $${filen} ;; \ + esac ; \ + done ; + +install-data-local: usr_docs + $(INSTALL) -d $(DESTDIR)$(docdir)/gui/SMESH + @for filen in `find . -maxdepth 1` ; do \ + case $${filen} in \ + ./Makefile | ./doxyfile | ./doxyfile_py ) ;; \ + ./doxyfile.bak | ./doxyfile_py.bak ) ;; \ + . | .. ) ;; \ + *) echo "Installing $${filen}" ; cp -rp $${filen} $(DESTDIR)$(docdir)/gui/SMESH ;; \ + esac ; \ + done ; + +uninstall-local: + rm -rf $(DESTDIR)$(docdir)/gui/SMESH diff --git a/doc/salome/gui/SMESH/doxyfile.in b/doc/salome/gui/SMESH/doxyfile.in index 3aea83cc5..b084396ba 100755 --- a/doc/salome/gui/SMESH/doxyfile.in +++ b/doc/salome/gui/SMESH/doxyfile.in @@ -1,8 +1,29 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# 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 +# #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = "Mesh Module Reference Manual v.@VERSION@" -OUTPUT_DIRECTORY = ./ +OUTPUT_DIRECTORY = . CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English TAB_SIZE = 5 @@ -18,13 +39,15 @@ WARNINGS = YES #--------------------------------------------------------------------------- INPUT = @srcdir@/input FILE_PATTERNS = *.doc +EXCLUDE = IMAGE_PATH = @srcdir@/images EXAMPLE_PATH = @top_srcdir@/src/SMESH_SWIG + #--------------------------------------------------------------------------- #HTML related options #--------------------------------------------------------------------------- GENERATE_HTML = YES -HTML_OUTPUT = ./ +HTML_OUTPUT = . HTML_HEADER = @srcdir@/static/header.html HTML_FOOTER = @srcdir@/static/footer.html #HTML_STYLESHEET = @srcdir@/static/doxygen.css @@ -46,4 +69,4 @@ GENERATE_RTF = NO #--------------------------------------------------------------------------- #External reference options #--------------------------------------------------------------------------- -TAGFILES = smeshpy_doc.tag=./smeshpy_doc +TAGFILES = smeshpy_doc.tag=smeshpy_doc diff --git a/doc/salome/gui/SMESH/doxyfile_py.in b/doc/salome/gui/SMESH/doxyfile_py.in index 617584ed9..c35d4aaa7 100755 --- a/doc/salome/gui/SMESH/doxyfile_py.in +++ b/doc/salome/gui/SMESH/doxyfile_py.in @@ -1,10 +1,31 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# 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 +# #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "Mesh Module Reference Manual v.@VERSION@" -OUTPUT_DIRECTORY = ./ -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English +PROJECT_NAME = "Mesh Module Reference Manual v.@VERSION@" +OUTPUT_DIRECTORY = . +CREATE_SUBDIRS = NO +OUTPUT_LANGUAGE = English USE_WINDOWS_ENCODING = NO BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES @@ -66,8 +87,8 @@ VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = YES +QUIET = NO +WARNINGS = YES WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = NO @@ -87,7 +108,7 @@ EXAMPLE_PATH = @top_srcdir@/src/SMESH_SWIG #HTML related options #--------------------------------------------------------------------------- GENERATE_HTML = YES -HTML_OUTPUT = ./smeshpy_doc +HTML_OUTPUT = smeshpy_doc HTML_HEADER = @srcdir@/static/header.html HTML_FOOTER = @srcdir@/static/footer.html #HTML_STYLESHEET = @srcdir@/static/doxygen.css @@ -108,24 +129,17 @@ GENERATE_RTF = NO #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- -#CLASS_DIAGRAMS = YES CLASS_DIAGRAMS = NO HIDE_UNDOC_RELATIONS = NO -#HAVE_DOT = YES HAVE_DOT = NO -#CLASS_GRAPH = YES CLASS_GRAPH = NO COLLABORATION_GRAPH = NO GROUP_GRAPHS = NO UML_LOOK = NO -#TEMPLATE_RELATIONS = YES -#INCLUDE_GRAPH = YES TEMPLATE_RELATIONS = NO INCLUDE_GRAPH = NO INCLUDED_BY_GRAPH = NO CALL_GRAPH = NO -#GRAPHICAL_HIERARCHY = YES -#DIRECTORY_GRAPH = YES GRAPHICAL_HIERARCHY = NO DIRECTORY_GRAPH = NO DOT_IMAGE_FORMAT = jpg diff --git a/doc/salome/gui/SMESH/images/a-clipping2.png b/doc/salome/gui/SMESH/images/a-clipping2.png index 639792ca3..bfac4cea5 100755 Binary files a/doc/salome/gui/SMESH/images/a-clipping2.png and b/doc/salome/gui/SMESH/images/a-clipping2.png differ diff --git a/doc/salome/gui/SMESH/images/a-creategroup.png b/doc/salome/gui/SMESH/images/a-creategroup.png index 38ef5a856..d23ee825d 100755 Binary files a/doc/salome/gui/SMESH/images/a-creategroup.png and b/doc/salome/gui/SMESH/images/a-creategroup.png differ diff --git a/doc/salome/gui/SMESH/images/a-createpolyhedralvolume.png b/doc/salome/gui/SMESH/images/a-createpolyhedralvolume.png index 532eac08f..26403226c 100755 Binary files a/doc/salome/gui/SMESH/images/a-createpolyhedralvolume.png and b/doc/salome/gui/SMESH/images/a-createpolyhedralvolume.png differ diff --git a/doc/salome/gui/SMESH/images/a-cuttingofquadrangles.png b/doc/salome/gui/SMESH/images/a-cuttingofquadrangles.png index ff9ae68e1..6ae6ee42e 100755 Binary files a/doc/salome/gui/SMESH/images/a-cuttingofquadrangles.png and b/doc/salome/gui/SMESH/images/a-cuttingofquadrangles.png differ diff --git a/doc/salome/gui/SMESH/images/a-filteronedges.png b/doc/salome/gui/SMESH/images/a-filteronedges.png deleted file mode 100755 index 48b3ece01..000000000 Binary files a/doc/salome/gui/SMESH/images/a-filteronedges.png and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/a-filteronfaces.png b/doc/salome/gui/SMESH/images/a-filteronfaces.png new file mode 100644 index 000000000..93014f9c2 Binary files /dev/null and b/doc/salome/gui/SMESH/images/a-filteronfaces.png differ diff --git a/doc/salome/gui/SMESH/images/a-maxelarea.png b/doc/salome/gui/SMESH/images/a-maxelarea.png index b4af4b23f..4306ed55f 100755 Binary files a/doc/salome/gui/SMESH/images/a-maxelarea.png and b/doc/salome/gui/SMESH/images/a-maxelarea.png differ diff --git a/doc/salome/gui/SMESH/images/a-maxelvolume.png b/doc/salome/gui/SMESH/images/a-maxelvolume.png index 2611807fd..033e7004e 100755 Binary files a/doc/salome/gui/SMESH/images/a-maxelvolume.png and b/doc/salome/gui/SMESH/images/a-maxelvolume.png differ diff --git a/doc/salome/gui/SMESH/images/a-maxsize1d.png b/doc/salome/gui/SMESH/images/a-maxsize1d.png new file mode 100644 index 000000000..c2ddd0c37 Binary files /dev/null and b/doc/salome/gui/SMESH/images/a-maxsize1d.png differ diff --git a/doc/salome/gui/SMESH/images/a-nbsegments1.png b/doc/salome/gui/SMESH/images/a-nbsegments1.png index 35c09094d..27668505c 100755 Binary files a/doc/salome/gui/SMESH/images/a-nbsegments1.png and b/doc/salome/gui/SMESH/images/a-nbsegments1.png differ diff --git a/doc/salome/gui/SMESH/images/a-nbsegments2.png b/doc/salome/gui/SMESH/images/a-nbsegments2.png index 7f33c61ff..8d4f277d9 100755 Binary files a/doc/salome/gui/SMESH/images/a-nbsegments2.png and b/doc/salome/gui/SMESH/images/a-nbsegments2.png differ diff --git a/doc/salome/gui/SMESH/images/a-patterntype.png b/doc/salome/gui/SMESH/images/a-patterntype.png index 3383cd75e..82c6efb94 100755 Binary files a/doc/salome/gui/SMESH/images/a-patterntype.png and b/doc/salome/gui/SMESH/images/a-patterntype.png differ diff --git a/doc/salome/gui/SMESH/images/a-patterntype1.png b/doc/salome/gui/SMESH/images/a-patterntype1.png index 38449225a..b84257e0d 100755 Binary files a/doc/salome/gui/SMESH/images/a-patterntype1.png and b/doc/salome/gui/SMESH/images/a-patterntype1.png differ diff --git a/doc/salome/gui/SMESH/images/a-standmeshinfo.png b/doc/salome/gui/SMESH/images/a-standmeshinfo.png index 6b35f0a99..dc037ef9d 100755 Binary files a/doc/salome/gui/SMESH/images/a-standmeshinfo.png and b/doc/salome/gui/SMESH/images/a-standmeshinfo.png differ diff --git a/doc/salome/gui/SMESH/images/a-startendlength.png b/doc/salome/gui/SMESH/images/a-startendlength.png index e48f617d2..947567d7f 100755 Binary files a/doc/salome/gui/SMESH/images/a-startendlength.png and b/doc/salome/gui/SMESH/images/a-startendlength.png differ diff --git a/doc/salome/gui/SMESH/images/a-transparency.png b/doc/salome/gui/SMESH/images/a-transparency.png index 8e7498d58..370ef3026 100755 Binary files a/doc/salome/gui/SMESH/images/a-transparency.png and b/doc/salome/gui/SMESH/images/a-transparency.png differ diff --git a/doc/salome/gui/SMESH/images/a-unionoftriangles.png b/doc/salome/gui/SMESH/images/a-unionoftriangles.png index d9ef53c11..a3aaf127d 100755 Binary files a/doc/salome/gui/SMESH/images/a-unionoftriangles.png and b/doc/salome/gui/SMESH/images/a-unionoftriangles.png differ diff --git a/doc/salome/gui/SMESH/images/a-viewgeneral.png b/doc/salome/gui/SMESH/images/a-viewgeneral.png index 09b7c2391..638870e5f 100755 Binary files a/doc/salome/gui/SMESH/images/a-viewgeneral.png and b/doc/salome/gui/SMESH/images/a-viewgeneral.png differ diff --git a/doc/salome/gui/SMESH/images/add.png b/doc/salome/gui/SMESH/images/add.png new file mode 100755 index 000000000..87995aa84 Binary files /dev/null and b/doc/salome/gui/SMESH/images/add.png differ diff --git a/doc/salome/gui/SMESH/images/addedge.png b/doc/salome/gui/SMESH/images/addedge.png index c9eeaf970..f142dffb2 100755 Binary files a/doc/salome/gui/SMESH/images/addedge.png and b/doc/salome/gui/SMESH/images/addedge.png differ diff --git a/doc/salome/gui/SMESH/images/addhexahedron.png b/doc/salome/gui/SMESH/images/addhexahedron.png index fd2ef245a..78ea3b50f 100755 Binary files a/doc/salome/gui/SMESH/images/addhexahedron.png and b/doc/salome/gui/SMESH/images/addhexahedron.png differ diff --git a/doc/salome/gui/SMESH/images/addnode.png b/doc/salome/gui/SMESH/images/addnode.png index 167a966b8..1f5375b9a 100755 Binary files a/doc/salome/gui/SMESH/images/addnode.png and b/doc/salome/gui/SMESH/images/addnode.png differ diff --git a/doc/salome/gui/SMESH/images/addnode_notebook.png b/doc/salome/gui/SMESH/images/addnode_notebook.png new file mode 100755 index 000000000..4abab3358 Binary files /dev/null and b/doc/salome/gui/SMESH/images/addnode_notebook.png differ diff --git a/doc/salome/gui/SMESH/images/addpolygon.png b/doc/salome/gui/SMESH/images/addpolygon.png index 785a62341..5d02dd70d 100755 Binary files a/doc/salome/gui/SMESH/images/addpolygon.png and b/doc/salome/gui/SMESH/images/addpolygon.png differ diff --git a/doc/salome/gui/SMESH/images/addquadrangle.png b/doc/salome/gui/SMESH/images/addquadrangle.png index 2bbddf158..3e5c87c42 100755 Binary files a/doc/salome/gui/SMESH/images/addquadrangle.png and b/doc/salome/gui/SMESH/images/addquadrangle.png differ diff --git a/doc/salome/gui/SMESH/images/addtetrahedron.png b/doc/salome/gui/SMESH/images/addtetrahedron.png index 0a415707a..37dc29659 100755 Binary files a/doc/salome/gui/SMESH/images/addtetrahedron.png and b/doc/salome/gui/SMESH/images/addtetrahedron.png differ diff --git a/doc/salome/gui/SMESH/images/addtriangle.png b/doc/salome/gui/SMESH/images/addtriangle.png index 405d6f57f..52a644e51 100755 Binary files a/doc/salome/gui/SMESH/images/addtriangle.png and b/doc/salome/gui/SMESH/images/addtriangle.png differ diff --git a/doc/salome/gui/SMESH/images/advanced_mesh_infos.png b/doc/salome/gui/SMESH/images/advanced_mesh_infos.png index f8341e892..2dc9f8f48 100755 Binary files a/doc/salome/gui/SMESH/images/advanced_mesh_infos.png and b/doc/salome/gui/SMESH/images/advanced_mesh_infos.png differ diff --git a/doc/salome/gui/SMESH/images/aqt.png b/doc/salome/gui/SMESH/images/aqt.png index 32e36bd0e..ae8e0d081 100755 Binary files a/doc/salome/gui/SMESH/images/aqt.png and b/doc/salome/gui/SMESH/images/aqt.png differ diff --git a/doc/salome/gui/SMESH/images/automaticlength.png b/doc/salome/gui/SMESH/images/automaticlength.png index d96ffc82d..15fb8b35e 100755 Binary files a/doc/salome/gui/SMESH/images/automaticlength.png and b/doc/salome/gui/SMESH/images/automaticlength.png differ diff --git a/doc/salome/gui/SMESH/images/blsurf_parameters.png b/doc/salome/gui/SMESH/images/blsurf_parameters.png new file mode 100644 index 000000000..22d038ac5 Binary files /dev/null and b/doc/salome/gui/SMESH/images/blsurf_parameters.png differ diff --git a/doc/salome/gui/SMESH/images/blsurf_parameters_advanced.png b/doc/salome/gui/SMESH/images/blsurf_parameters_advanced.png new file mode 100644 index 000000000..0f2c07dc3 Binary files /dev/null and b/doc/salome/gui/SMESH/images/blsurf_parameters_advanced.png differ diff --git a/doc/salome/gui/SMESH/images/buildcompound.png b/doc/salome/gui/SMESH/images/buildcompound.png index 1a5bea166..a6183515e 100755 Binary files a/doc/salome/gui/SMESH/images/buildcompound.png and b/doc/salome/gui/SMESH/images/buildcompound.png differ diff --git a/doc/salome/gui/SMESH/images/convert.png b/doc/salome/gui/SMESH/images/convert.png index 5c0e64a05..4a71cac99 100644 Binary files a/doc/salome/gui/SMESH/images/convert.png and b/doc/salome/gui/SMESH/images/convert.png differ diff --git a/doc/salome/gui/SMESH/images/create_groups_from_geometry.png b/doc/salome/gui/SMESH/images/create_groups_from_geometry.png new file mode 100644 index 000000000..17d54dec3 Binary files /dev/null and b/doc/salome/gui/SMESH/images/create_groups_from_geometry.png differ diff --git a/doc/salome/gui/SMESH/images/creategroup.png b/doc/salome/gui/SMESH/images/creategroup.png index 207e2099e..2fb825cc8 100755 Binary files a/doc/salome/gui/SMESH/images/creategroup.png and b/doc/salome/gui/SMESH/images/creategroup.png differ diff --git a/doc/salome/gui/SMESH/images/createmesh-inv.png b/doc/salome/gui/SMESH/images/createmesh-inv.png index 8273aac45..c7f7c31ed 100755 Binary files a/doc/salome/gui/SMESH/images/createmesh-inv.png and b/doc/salome/gui/SMESH/images/createmesh-inv.png differ diff --git a/doc/salome/gui/SMESH/images/createmesh-inv2.png b/doc/salome/gui/SMESH/images/createmesh-inv2.png index 2bee11b7c..2b6beded2 100755 Binary files a/doc/salome/gui/SMESH/images/createmesh-inv2.png and b/doc/salome/gui/SMESH/images/createmesh-inv2.png differ diff --git a/doc/salome/gui/SMESH/images/createmesh-inv3.png b/doc/salome/gui/SMESH/images/createmesh-inv3.png index 6dfabaaa8..96fed7d5d 100755 Binary files a/doc/salome/gui/SMESH/images/createmesh-inv3.png and b/doc/salome/gui/SMESH/images/createmesh-inv3.png differ diff --git a/doc/salome/gui/SMESH/images/cutgroups.png b/doc/salome/gui/SMESH/images/cutgroups.png index 87e6da88b..213a52a97 100755 Binary files a/doc/salome/gui/SMESH/images/cutgroups.png and b/doc/salome/gui/SMESH/images/cutgroups.png differ diff --git a/doc/salome/gui/SMESH/images/deletegroups.png b/doc/salome/gui/SMESH/images/deletegroups.png index 383a79aa8..52494c854 100755 Binary files a/doc/salome/gui/SMESH/images/deletegroups.png and b/doc/salome/gui/SMESH/images/deletegroups.png differ diff --git a/doc/salome/gui/SMESH/images/diagonalinversion.png b/doc/salome/gui/SMESH/images/diagonalinversion.png index 967e7a12e..1329ebe65 100755 Binary files a/doc/salome/gui/SMESH/images/diagonalinversion.png and b/doc/salome/gui/SMESH/images/diagonalinversion.png differ diff --git a/doc/salome/gui/SMESH/images/dialog.png b/doc/salome/gui/SMESH/images/dialog.png index 12c7fa273..1fa2c4263 100755 Binary files a/doc/salome/gui/SMESH/images/dialog.png and b/doc/salome/gui/SMESH/images/dialog.png differ diff --git a/doc/salome/gui/SMESH/images/dimgroup_0d.png b/doc/salome/gui/SMESH/images/dimgroup_0d.png new file mode 100644 index 000000000..caabdc4f3 Binary files /dev/null and b/doc/salome/gui/SMESH/images/dimgroup_0d.png differ diff --git a/doc/salome/gui/SMESH/images/dimgroup_1d.png b/doc/salome/gui/SMESH/images/dimgroup_1d.png new file mode 100644 index 000000000..23af4a75d Binary files /dev/null and b/doc/salome/gui/SMESH/images/dimgroup_1d.png differ diff --git a/doc/salome/gui/SMESH/images/dimgroup_2d.png b/doc/salome/gui/SMESH/images/dimgroup_2d.png new file mode 100644 index 000000000..6ca49a6a9 Binary files /dev/null and b/doc/salome/gui/SMESH/images/dimgroup_2d.png differ diff --git a/doc/salome/gui/SMESH/images/dimgroup_dlg.png b/doc/salome/gui/SMESH/images/dimgroup_dlg.png new file mode 100644 index 000000000..21cdb058a Binary files /dev/null and b/doc/salome/gui/SMESH/images/dimgroup_dlg.png differ diff --git a/doc/salome/gui/SMESH/images/dimgroup_src.png b/doc/salome/gui/SMESH/images/dimgroup_src.png new file mode 100644 index 000000000..93606a8e2 Binary files /dev/null and b/doc/salome/gui/SMESH/images/dimgroup_src.png differ diff --git a/doc/salome/gui/SMESH/images/dimgroup_tui1.png b/doc/salome/gui/SMESH/images/dimgroup_tui1.png new file mode 100644 index 000000000..a2faf39b5 Binary files /dev/null and b/doc/salome/gui/SMESH/images/dimgroup_tui1.png differ diff --git a/doc/salome/gui/SMESH/images/dimgroup_tui2.png b/doc/salome/gui/SMESH/images/dimgroup_tui2.png new file mode 100644 index 000000000..cb040a974 Binary files /dev/null and b/doc/salome/gui/SMESH/images/dimgroup_tui2.png differ diff --git a/doc/salome/gui/SMESH/images/distribution_of_layers.png b/doc/salome/gui/SMESH/images/distribution_of_layers.png index 3d01d66f4..02975ef8b 100644 Binary files a/doc/salome/gui/SMESH/images/distribution_of_layers.png and b/doc/salome/gui/SMESH/images/distribution_of_layers.png differ diff --git a/doc/salome/gui/SMESH/images/distributionwithanalyticdensity.png b/doc/salome/gui/SMESH/images/distributionwithanalyticdensity.png index 87ebc5ffe..7dea248c6 100755 Binary files a/doc/salome/gui/SMESH/images/distributionwithanalyticdensity.png and b/doc/salome/gui/SMESH/images/distributionwithanalyticdensity.png differ diff --git a/doc/salome/gui/SMESH/images/distributionwithtabledensity.png b/doc/salome/gui/SMESH/images/distributionwithtabledensity.png index 9ea6cab98..3bd40bc45 100755 Binary files a/doc/salome/gui/SMESH/images/distributionwithtabledensity.png and b/doc/salome/gui/SMESH/images/distributionwithtabledensity.png differ diff --git a/doc/salome/gui/SMESH/images/editgroup.png b/doc/salome/gui/SMESH/images/editgroup.png index c0a50f36f..ac9e8a2c1 100755 Binary files a/doc/salome/gui/SMESH/images/editgroup.png and b/doc/salome/gui/SMESH/images/editgroup.png differ diff --git a/doc/salome/gui/SMESH/images/eleminfo1.png b/doc/salome/gui/SMESH/images/eleminfo1.png index 5e2c2a0c0..3aae250c8 100755 Binary files a/doc/salome/gui/SMESH/images/eleminfo1.png and b/doc/salome/gui/SMESH/images/eleminfo1.png differ diff --git a/doc/salome/gui/SMESH/images/eleminfo2.png b/doc/salome/gui/SMESH/images/eleminfo2.png index 3ff8d1d9c..9ead335b8 100755 Binary files a/doc/salome/gui/SMESH/images/eleminfo2.png and b/doc/salome/gui/SMESH/images/eleminfo2.png differ diff --git a/doc/salome/gui/SMESH/images/extrusion1.png b/doc/salome/gui/SMESH/images/extrusion1.png index b48278242..9f34a0feb 100644 Binary files a/doc/salome/gui/SMESH/images/extrusion1.png and b/doc/salome/gui/SMESH/images/extrusion1.png differ diff --git a/doc/salome/gui/SMESH/images/extrusion2.png b/doc/salome/gui/SMESH/images/extrusion2.png index d1d6d0823..527b67a17 100755 Binary files a/doc/salome/gui/SMESH/images/extrusion2.png and b/doc/salome/gui/SMESH/images/extrusion2.png differ diff --git a/doc/salome/gui/SMESH/images/extrusionalongaline1.png b/doc/salome/gui/SMESH/images/extrusionalongaline1.png index 300d24228..76a60bd34 100755 Binary files a/doc/salome/gui/SMESH/images/extrusionalongaline1.png and b/doc/salome/gui/SMESH/images/extrusionalongaline1.png differ diff --git a/doc/salome/gui/SMESH/images/extrusionalongaline2.png b/doc/salome/gui/SMESH/images/extrusionalongaline2.png index 23ca6060f..fb0456250 100755 Binary files a/doc/salome/gui/SMESH/images/extrusionalongaline2.png and b/doc/salome/gui/SMESH/images/extrusionalongaline2.png differ diff --git a/doc/salome/gui/SMESH/images/free_faces.png b/doc/salome/gui/SMESH/images/free_faces.png new file mode 100644 index 000000000..8b5bee40d Binary files /dev/null and b/doc/salome/gui/SMESH/images/free_faces.png differ diff --git a/doc/salome/gui/SMESH/images/free_nodes.png b/doc/salome/gui/SMESH/images/free_nodes.png new file mode 100644 index 000000000..c1d23c1d3 Binary files /dev/null and b/doc/salome/gui/SMESH/images/free_nodes.png differ diff --git a/doc/salome/gui/SMESH/images/ghs3d_parameters_advanced.png b/doc/salome/gui/SMESH/images/ghs3d_parameters_advanced.png new file mode 100644 index 000000000..4f36203ba Binary files /dev/null and b/doc/salome/gui/SMESH/images/ghs3d_parameters_advanced.png differ diff --git a/doc/salome/gui/SMESH/images/ghs3d_parameters_basic.png b/doc/salome/gui/SMESH/images/ghs3d_parameters_basic.png new file mode 100644 index 000000000..0cce50bb8 Binary files /dev/null and b/doc/salome/gui/SMESH/images/ghs3d_parameters_basic.png differ diff --git a/doc/salome/gui/SMESH/images/ghs3dprl_parameters_basic.png b/doc/salome/gui/SMESH/images/ghs3dprl_parameters_basic.png new file mode 100644 index 000000000..0628058ee Binary files /dev/null and b/doc/salome/gui/SMESH/images/ghs3dprl_parameters_basic.png differ diff --git a/doc/salome/gui/SMESH/images/image10.jpg b/doc/salome/gui/SMESH/images/image10.jpg index 5a15643bb..a53ea0bf2 100755 Binary files a/doc/salome/gui/SMESH/images/image10.jpg and b/doc/salome/gui/SMESH/images/image10.jpg differ diff --git a/doc/salome/gui/SMESH/images/image101.gif b/doc/salome/gui/SMESH/images/image101.gif deleted file mode 100755 index b761fec72..000000000 Binary files a/doc/salome/gui/SMESH/images/image101.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image101.png b/doc/salome/gui/SMESH/images/image101.png new file mode 100755 index 000000000..0e2c96682 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image101.png differ diff --git a/doc/salome/gui/SMESH/images/image120.gif b/doc/salome/gui/SMESH/images/image120.gif deleted file mode 100755 index 18ddeca6d..000000000 Binary files a/doc/salome/gui/SMESH/images/image120.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image120.png b/doc/salome/gui/SMESH/images/image120.png new file mode 100755 index 000000000..65318de8e Binary files /dev/null and b/doc/salome/gui/SMESH/images/image120.png differ diff --git a/doc/salome/gui/SMESH/images/image121.gif b/doc/salome/gui/SMESH/images/image121.gif deleted file mode 100755 index 7a2ffd66c..000000000 Binary files a/doc/salome/gui/SMESH/images/image121.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image121.png b/doc/salome/gui/SMESH/images/image121.png new file mode 100755 index 000000000..16ed2a42d Binary files /dev/null and b/doc/salome/gui/SMESH/images/image121.png differ diff --git a/doc/salome/gui/SMESH/images/image122.gif b/doc/salome/gui/SMESH/images/image122.gif deleted file mode 100755 index 207d30b97..000000000 Binary files a/doc/salome/gui/SMESH/images/image122.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image122.png b/doc/salome/gui/SMESH/images/image122.png new file mode 100755 index 000000000..7fa491b75 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image122.png differ diff --git a/doc/salome/gui/SMESH/images/image144.gif b/doc/salome/gui/SMESH/images/image144.gif deleted file mode 100644 index 3dffd53ff..000000000 Binary files a/doc/salome/gui/SMESH/images/image144.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image144.png b/doc/salome/gui/SMESH/images/image144.png new file mode 100755 index 000000000..75219e97f Binary files /dev/null and b/doc/salome/gui/SMESH/images/image144.png differ diff --git a/doc/salome/gui/SMESH/images/image145.gif b/doc/salome/gui/SMESH/images/image145.gif deleted file mode 100755 index 8005557e1..000000000 Binary files a/doc/salome/gui/SMESH/images/image145.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image145.png b/doc/salome/gui/SMESH/images/image145.png new file mode 100755 index 000000000..52b21ca10 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image145.png differ diff --git a/doc/salome/gui/SMESH/images/image146.gif b/doc/salome/gui/SMESH/images/image146.gif deleted file mode 100755 index 18f22241d..000000000 Binary files a/doc/salome/gui/SMESH/images/image146.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image146.png b/doc/salome/gui/SMESH/images/image146.png new file mode 100755 index 000000000..2fb825cc8 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image146.png differ diff --git a/doc/salome/gui/SMESH/images/image152.gif b/doc/salome/gui/SMESH/images/image152.gif deleted file mode 100755 index 2005d3fff..000000000 Binary files a/doc/salome/gui/SMESH/images/image152.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image152.png b/doc/salome/gui/SMESH/images/image152.png new file mode 100755 index 000000000..ef8ef087d Binary files /dev/null and b/doc/salome/gui/SMESH/images/image152.png differ diff --git a/doc/salome/gui/SMESH/images/image154.gif b/doc/salome/gui/SMESH/images/image154.gif deleted file mode 100644 index 2d527fbbb..000000000 Binary files a/doc/salome/gui/SMESH/images/image154.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image154.png b/doc/salome/gui/SMESH/images/image154.png new file mode 100755 index 000000000..72421a439 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image154.png differ diff --git a/doc/salome/gui/SMESH/images/image161.gif b/doc/salome/gui/SMESH/images/image161.gif deleted file mode 100755 index 54364d260..000000000 Binary files a/doc/salome/gui/SMESH/images/image161.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image161.png b/doc/salome/gui/SMESH/images/image161.png new file mode 100755 index 000000000..5b1aed2f6 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image161.png differ diff --git a/doc/salome/gui/SMESH/images/image25.gif b/doc/salome/gui/SMESH/images/image25.gif deleted file mode 100755 index cd7c967bc..000000000 Binary files a/doc/salome/gui/SMESH/images/image25.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image25.jpg b/doc/salome/gui/SMESH/images/image25.jpg index 4b2d4dfe4..79ddf05fa 100755 Binary files a/doc/salome/gui/SMESH/images/image25.jpg and b/doc/salome/gui/SMESH/images/image25.jpg differ diff --git a/doc/salome/gui/SMESH/images/image25.png b/doc/salome/gui/SMESH/images/image25.png new file mode 100755 index 000000000..aeef93017 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image25.png differ diff --git a/doc/salome/gui/SMESH/images/image28.gif b/doc/salome/gui/SMESH/images/image28.gif deleted file mode 100755 index 21f54bf45..000000000 Binary files a/doc/salome/gui/SMESH/images/image28.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image28.png b/doc/salome/gui/SMESH/images/image28.png new file mode 100755 index 000000000..7c16b0cf6 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image28.png differ diff --git a/doc/salome/gui/SMESH/images/image32.gif b/doc/salome/gui/SMESH/images/image32.gif deleted file mode 100755 index a1ee2ee02..000000000 Binary files a/doc/salome/gui/SMESH/images/image32.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image32.png b/doc/salome/gui/SMESH/images/image32.png new file mode 100755 index 000000000..cad35fd4a Binary files /dev/null and b/doc/salome/gui/SMESH/images/image32.png differ diff --git a/doc/salome/gui/SMESH/images/image33.gif b/doc/salome/gui/SMESH/images/image33.gif index ecdd47b0b..6613182bb 100755 Binary files a/doc/salome/gui/SMESH/images/image33.gif and b/doc/salome/gui/SMESH/images/image33.gif differ diff --git a/doc/salome/gui/SMESH/images/image34.gif b/doc/salome/gui/SMESH/images/image34.gif deleted file mode 100755 index 963095fe8..000000000 Binary files a/doc/salome/gui/SMESH/images/image34.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image34.png b/doc/salome/gui/SMESH/images/image34.png new file mode 100755 index 000000000..eb7ca81fb Binary files /dev/null and b/doc/salome/gui/SMESH/images/image34.png differ diff --git a/doc/salome/gui/SMESH/images/image35.gif b/doc/salome/gui/SMESH/images/image35.gif deleted file mode 100755 index 0e3b30fd0..000000000 Binary files a/doc/salome/gui/SMESH/images/image35.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image35.png b/doc/salome/gui/SMESH/images/image35.png new file mode 100755 index 000000000..00031d38d Binary files /dev/null and b/doc/salome/gui/SMESH/images/image35.png differ diff --git a/doc/salome/gui/SMESH/images/image36.gif b/doc/salome/gui/SMESH/images/image36.gif deleted file mode 100755 index 7236ef8b9..000000000 Binary files a/doc/salome/gui/SMESH/images/image36.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image36.png b/doc/salome/gui/SMESH/images/image36.png new file mode 100755 index 000000000..6a250d029 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image36.png differ diff --git a/doc/salome/gui/SMESH/images/image37.gif b/doc/salome/gui/SMESH/images/image37.gif deleted file mode 100644 index edd5263d8..000000000 Binary files a/doc/salome/gui/SMESH/images/image37.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image37.png b/doc/salome/gui/SMESH/images/image37.png new file mode 100755 index 000000000..266cef979 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image37.png differ diff --git a/doc/salome/gui/SMESH/images/image38.gif b/doc/salome/gui/SMESH/images/image38.gif deleted file mode 100755 index 087f6e2be..000000000 Binary files a/doc/salome/gui/SMESH/images/image38.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image38.png b/doc/salome/gui/SMESH/images/image38.png new file mode 100755 index 000000000..fb8a69004 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image38.png differ diff --git a/doc/salome/gui/SMESH/images/image39.gif b/doc/salome/gui/SMESH/images/image39.gif deleted file mode 100755 index b206af116..000000000 Binary files a/doc/salome/gui/SMESH/images/image39.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image39.png b/doc/salome/gui/SMESH/images/image39.png new file mode 100755 index 000000000..54729b886 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image39.png differ diff --git a/doc/salome/gui/SMESH/images/image40.gif b/doc/salome/gui/SMESH/images/image40.gif deleted file mode 100755 index becc12a47..000000000 Binary files a/doc/salome/gui/SMESH/images/image40.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image40.png b/doc/salome/gui/SMESH/images/image40.png new file mode 100755 index 000000000..bbde0d417 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image40.png differ diff --git a/doc/salome/gui/SMESH/images/image49.gif b/doc/salome/gui/SMESH/images/image49.gif deleted file mode 100755 index d10d9c4df..000000000 Binary files a/doc/salome/gui/SMESH/images/image49.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image49.png b/doc/salome/gui/SMESH/images/image49.png new file mode 100755 index 000000000..74926d244 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image49.png differ diff --git a/doc/salome/gui/SMESH/images/image50.gif b/doc/salome/gui/SMESH/images/image50.gif index 72d39545a..22bdf5554 100755 Binary files a/doc/salome/gui/SMESH/images/image50.gif and b/doc/salome/gui/SMESH/images/image50.gif differ diff --git a/doc/salome/gui/SMESH/images/image63.gif b/doc/salome/gui/SMESH/images/image63.gif deleted file mode 100755 index 6a9c2c86d..000000000 Binary files a/doc/salome/gui/SMESH/images/image63.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image63.png b/doc/salome/gui/SMESH/images/image63.png new file mode 100755 index 000000000..b9e65be1a Binary files /dev/null and b/doc/salome/gui/SMESH/images/image63.png differ diff --git a/doc/salome/gui/SMESH/images/image64.gif b/doc/salome/gui/SMESH/images/image64.gif deleted file mode 100755 index 1d92c81f1..000000000 Binary files a/doc/salome/gui/SMESH/images/image64.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image64.png b/doc/salome/gui/SMESH/images/image64.png new file mode 100755 index 000000000..554959be7 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image64.png differ diff --git a/doc/salome/gui/SMESH/images/image67.gif b/doc/salome/gui/SMESH/images/image67.gif deleted file mode 100755 index 68bd3e383..000000000 Binary files a/doc/salome/gui/SMESH/images/image67.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image67.png b/doc/salome/gui/SMESH/images/image67.png new file mode 100755 index 000000000..0d456ba83 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image67.png differ diff --git a/doc/salome/gui/SMESH/images/image70.gif b/doc/salome/gui/SMESH/images/image70.gif deleted file mode 100755 index 120b8e8ef..000000000 Binary files a/doc/salome/gui/SMESH/images/image70.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image70.png b/doc/salome/gui/SMESH/images/image70.png new file mode 100755 index 000000000..30a2d9258 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image70.png differ diff --git a/doc/salome/gui/SMESH/images/image71.gif b/doc/salome/gui/SMESH/images/image71.gif deleted file mode 100755 index 0008354f6..000000000 Binary files a/doc/salome/gui/SMESH/images/image71.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image71.png b/doc/salome/gui/SMESH/images/image71.png new file mode 100755 index 000000000..ef9407aa5 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image71.png differ diff --git a/doc/salome/gui/SMESH/images/image79.gif b/doc/salome/gui/SMESH/images/image79.gif deleted file mode 100755 index 9711ccbc9..000000000 Binary files a/doc/salome/gui/SMESH/images/image79.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image79.png b/doc/salome/gui/SMESH/images/image79.png new file mode 100755 index 000000000..e8d648c9a Binary files /dev/null and b/doc/salome/gui/SMESH/images/image79.png differ diff --git a/doc/salome/gui/SMESH/images/image80.gif b/doc/salome/gui/SMESH/images/image80.gif deleted file mode 100755 index 399af0a9a..000000000 Binary files a/doc/salome/gui/SMESH/images/image80.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image80.png b/doc/salome/gui/SMESH/images/image80.png new file mode 100755 index 000000000..114b38d52 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image80.png differ diff --git a/doc/salome/gui/SMESH/images/image82.gif b/doc/salome/gui/SMESH/images/image82.gif deleted file mode 100755 index 93c6c9b96..000000000 Binary files a/doc/salome/gui/SMESH/images/image82.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image82.png b/doc/salome/gui/SMESH/images/image82.png new file mode 100755 index 000000000..c37c5fb75 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image82.png differ diff --git a/doc/salome/gui/SMESH/images/image84.gif b/doc/salome/gui/SMESH/images/image84.gif deleted file mode 100755 index ea8ec56bc..000000000 Binary files a/doc/salome/gui/SMESH/images/image84.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image84.png b/doc/salome/gui/SMESH/images/image84.png new file mode 100755 index 000000000..2c0b285ba Binary files /dev/null and b/doc/salome/gui/SMESH/images/image84.png differ diff --git a/doc/salome/gui/SMESH/images/image88.gif b/doc/salome/gui/SMESH/images/image88.gif index b2d4b73fc..553656d25 100755 Binary files a/doc/salome/gui/SMESH/images/image88.gif and b/doc/salome/gui/SMESH/images/image88.gif differ diff --git a/doc/salome/gui/SMESH/images/image91.gif b/doc/salome/gui/SMESH/images/image91.gif deleted file mode 100755 index a09ab9e76..000000000 Binary files a/doc/salome/gui/SMESH/images/image91.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image91.png b/doc/salome/gui/SMESH/images/image91.png new file mode 100755 index 000000000..64fcc3109 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image91.png differ diff --git a/doc/salome/gui/SMESH/images/image92.gif b/doc/salome/gui/SMESH/images/image92.gif deleted file mode 100755 index 9e0517f5d..000000000 Binary files a/doc/salome/gui/SMESH/images/image92.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image92.png b/doc/salome/gui/SMESH/images/image92.png new file mode 100755 index 000000000..3068b0f71 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image92.png differ diff --git a/doc/salome/gui/SMESH/images/image98.gif b/doc/salome/gui/SMESH/images/image98.gif deleted file mode 100755 index 5f375b774..000000000 Binary files a/doc/salome/gui/SMESH/images/image98.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image98.png b/doc/salome/gui/SMESH/images/image98.png new file mode 100755 index 000000000..a2c131dd4 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image98.png differ diff --git a/doc/salome/gui/SMESH/images/intersectgroups.png b/doc/salome/gui/SMESH/images/intersectgroups.png index b28b4d4d6..8114b1097 100755 Binary files a/doc/salome/gui/SMESH/images/intersectgroups.png and b/doc/salome/gui/SMESH/images/intersectgroups.png differ diff --git a/doc/salome/gui/SMESH/images/lengthnearvertex.png b/doc/salome/gui/SMESH/images/lengthnearvertex.png index 008dcb16e..4a59c7b8c 100755 Binary files a/doc/salome/gui/SMESH/images/lengthnearvertex.png and b/doc/salome/gui/SMESH/images/lengthnearvertex.png differ diff --git a/doc/salome/gui/SMESH/images/mergeelems.png b/doc/salome/gui/SMESH/images/mergeelems.png index dbd87877e..c5e160884 100755 Binary files a/doc/salome/gui/SMESH/images/mergeelems.png and b/doc/salome/gui/SMESH/images/mergeelems.png differ diff --git a/doc/salome/gui/SMESH/images/mergeelems_ico.png b/doc/salome/gui/SMESH/images/mergeelems_ico.png new file mode 100755 index 000000000..1342fe85d Binary files /dev/null and b/doc/salome/gui/SMESH/images/mergeelems_ico.png differ diff --git a/doc/salome/gui/SMESH/images/mergenodes.png b/doc/salome/gui/SMESH/images/mergenodes.png index d7437e400..d14620101 100755 Binary files a/doc/salome/gui/SMESH/images/mergenodes.png and b/doc/salome/gui/SMESH/images/mergenodes.png differ diff --git a/doc/salome/gui/SMESH/images/mergenodes_ico.png b/doc/salome/gui/SMESH/images/mergenodes_ico.png new file mode 100755 index 000000000..a0c11468c Binary files /dev/null and b/doc/salome/gui/SMESH/images/mergenodes_ico.png differ diff --git a/doc/salome/gui/SMESH/images/mesh_clear.png b/doc/salome/gui/SMESH/images/mesh_clear.png new file mode 100644 index 000000000..956e903af Binary files /dev/null and b/doc/salome/gui/SMESH/images/mesh_clear.png differ diff --git a/doc/salome/gui/SMESH/images/mesh_node_to_point.png b/doc/salome/gui/SMESH/images/mesh_node_to_point.png index 5d534cb9d..e7e28668c 100644 Binary files a/doc/salome/gui/SMESH/images/mesh_node_to_point.png and b/doc/salome/gui/SMESH/images/mesh_node_to_point.png differ diff --git a/doc/salome/gui/SMESH/images/mesh_precompute.png b/doc/salome/gui/SMESH/images/mesh_precompute.png new file mode 100644 index 000000000..dd90498cf Binary files /dev/null and b/doc/salome/gui/SMESH/images/mesh_precompute.png differ diff --git a/doc/salome/gui/SMESH/images/meshcomputationfail.png b/doc/salome/gui/SMESH/images/meshcomputationfail.png index 9c26158e2..781a59a64 100644 Binary files a/doc/salome/gui/SMESH/images/meshcomputationfail.png and b/doc/salome/gui/SMESH/images/meshcomputationfail.png differ diff --git a/doc/salome/gui/SMESH/images/meshcomputationsucceed.png b/doc/salome/gui/SMESH/images/meshcomputationsucceed.png index ab2357910..943387c40 100644 Binary files a/doc/salome/gui/SMESH/images/meshcomputationsucceed.png and b/doc/salome/gui/SMESH/images/meshcomputationsucceed.png differ diff --git a/doc/salome/gui/SMESH/images/meshexportmesh.png b/doc/salome/gui/SMESH/images/meshexportmesh.png index a84b25207..57d0a8021 100755 Binary files a/doc/salome/gui/SMESH/images/meshexportmesh.png and b/doc/salome/gui/SMESH/images/meshexportmesh.png differ diff --git a/doc/salome/gui/SMESH/images/meshimportmesh.png b/doc/salome/gui/SMESH/images/meshimportmesh.png index f87250bf4..91909872e 100755 Binary files a/doc/salome/gui/SMESH/images/meshimportmesh.png and b/doc/salome/gui/SMESH/images/meshimportmesh.png differ diff --git a/doc/salome/gui/SMESH/images/meshtopass.png b/doc/salome/gui/SMESH/images/meshtopass.png index 044c0164b..9a5c62e24 100755 Binary files a/doc/salome/gui/SMESH/images/meshtopass.png and b/doc/salome/gui/SMESH/images/meshtopass.png differ diff --git a/doc/salome/gui/SMESH/images/movenodes.png b/doc/salome/gui/SMESH/images/movenodes.png index 16e9e6262..3027c7641 100755 Binary files a/doc/salome/gui/SMESH/images/movenodes.png and b/doc/salome/gui/SMESH/images/movenodes.png differ diff --git a/doc/salome/gui/SMESH/images/netgen2d.png b/doc/salome/gui/SMESH/images/netgen2d.png index b2a9f25ed..29e09ef13 100644 Binary files a/doc/salome/gui/SMESH/images/netgen2d.png and b/doc/salome/gui/SMESH/images/netgen2d.png differ diff --git a/doc/salome/gui/SMESH/images/netgen3d_simple.png b/doc/salome/gui/SMESH/images/netgen3d_simple.png new file mode 100644 index 000000000..959ec02c8 Binary files /dev/null and b/doc/salome/gui/SMESH/images/netgen3d_simple.png differ diff --git a/doc/salome/gui/SMESH/images/number_of_layers.png b/doc/salome/gui/SMESH/images/number_of_layers.png index 846fa2c3e..8baa82173 100644 Binary files a/doc/salome/gui/SMESH/images/number_of_layers.png and b/doc/salome/gui/SMESH/images/number_of_layers.png differ diff --git a/doc/salome/gui/SMESH/images/orientaation1.png b/doc/salome/gui/SMESH/images/orientaation1.png index c23b0b8a8..b1c2ec005 100755 Binary files a/doc/salome/gui/SMESH/images/orientaation1.png and b/doc/salome/gui/SMESH/images/orientaation1.png differ diff --git a/doc/salome/gui/SMESH/images/patternmapping1.png b/doc/salome/gui/SMESH/images/patternmapping1.png index 14daae187..e0eb86712 100755 Binary files a/doc/salome/gui/SMESH/images/patternmapping1.png and b/doc/salome/gui/SMESH/images/patternmapping1.png differ diff --git a/doc/salome/gui/SMESH/images/patternmapping2.png b/doc/salome/gui/SMESH/images/patternmapping2.png index fbcf35544..5c8c520b5 100755 Binary files a/doc/salome/gui/SMESH/images/patternmapping2.png and b/doc/salome/gui/SMESH/images/patternmapping2.png differ diff --git a/doc/salome/gui/SMESH/images/preview_mesh_1D.png b/doc/salome/gui/SMESH/images/preview_mesh_1D.png new file mode 100644 index 000000000..3922a19f5 Binary files /dev/null and b/doc/salome/gui/SMESH/images/preview_mesh_1D.png differ diff --git a/doc/salome/gui/SMESH/images/preview_mesh_2D.png b/doc/salome/gui/SMESH/images/preview_mesh_2D.png new file mode 100644 index 000000000..55ec7b8fb Binary files /dev/null and b/doc/salome/gui/SMESH/images/preview_mesh_2D.png differ diff --git a/doc/salome/gui/SMESH/images/preview_tmp_data.png b/doc/salome/gui/SMESH/images/preview_tmp_data.png new file mode 100644 index 000000000..be1a12515 Binary files /dev/null and b/doc/salome/gui/SMESH/images/preview_tmp_data.png differ diff --git a/doc/salome/gui/SMESH/images/projection_1d.png b/doc/salome/gui/SMESH/images/projection_1d.png index 1560acaee..5af29afb8 100644 Binary files a/doc/salome/gui/SMESH/images/projection_1d.png and b/doc/salome/gui/SMESH/images/projection_1d.png differ diff --git a/doc/salome/gui/SMESH/images/projection_2d.png b/doc/salome/gui/SMESH/images/projection_2d.png index 91d446b5c..d7380ec1d 100644 Binary files a/doc/salome/gui/SMESH/images/projection_2d.png and b/doc/salome/gui/SMESH/images/projection_2d.png differ diff --git a/doc/salome/gui/SMESH/images/projection_3d.png b/doc/salome/gui/SMESH/images/projection_3d.png index aeffc7a48..5f6b907b8 100644 Binary files a/doc/salome/gui/SMESH/images/projection_3d.png and b/doc/salome/gui/SMESH/images/projection_3d.png differ diff --git a/doc/salome/gui/SMESH/images/remove.png b/doc/salome/gui/SMESH/images/remove.png new file mode 100755 index 000000000..cbf40693a Binary files /dev/null and b/doc/salome/gui/SMESH/images/remove.png differ diff --git a/doc/salome/gui/SMESH/images/remove_elements_icon.png b/doc/salome/gui/SMESH/images/remove_elements_icon.png index a2bb0f12a..2a31c3e64 100644 Binary files a/doc/salome/gui/SMESH/images/remove_elements_icon.png and b/doc/salome/gui/SMESH/images/remove_elements_icon.png differ diff --git a/doc/salome/gui/SMESH/images/removeelements.png b/doc/salome/gui/SMESH/images/removeelements.png index 42a79b5b1..78e495946 100755 Binary files a/doc/salome/gui/SMESH/images/removeelements.png and b/doc/salome/gui/SMESH/images/removeelements.png differ diff --git a/doc/salome/gui/SMESH/images/removenodes.png b/doc/salome/gui/SMESH/images/removenodes.png index cfcb777c6..52a5ac6b0 100755 Binary files a/doc/salome/gui/SMESH/images/removenodes.png and b/doc/salome/gui/SMESH/images/removenodes.png differ diff --git a/doc/salome/gui/SMESH/images/renumberelements.png b/doc/salome/gui/SMESH/images/renumberelements.png index 0812b5066..0f09c6a33 100755 Binary files a/doc/salome/gui/SMESH/images/renumberelements.png and b/doc/salome/gui/SMESH/images/renumberelements.png differ diff --git a/doc/salome/gui/SMESH/images/renumbernodes.png b/doc/salome/gui/SMESH/images/renumbernodes.png index 90a0eda13..46fe28b53 100755 Binary files a/doc/salome/gui/SMESH/images/renumbernodes.png and b/doc/salome/gui/SMESH/images/renumbernodes.png differ diff --git a/doc/salome/gui/SMESH/images/revolution1.png b/doc/salome/gui/SMESH/images/revolution1.png index 0334e3b7e..c4a4c1748 100755 Binary files a/doc/salome/gui/SMESH/images/revolution1.png and b/doc/salome/gui/SMESH/images/revolution1.png differ diff --git a/doc/salome/gui/SMESH/images/revolution2.png b/doc/salome/gui/SMESH/images/revolution2.png index 5612f9106..7d5777c9e 100755 Binary files a/doc/salome/gui/SMESH/images/revolution2.png and b/doc/salome/gui/SMESH/images/revolution2.png differ diff --git a/doc/salome/gui/SMESH/images/revolutionsn1.png b/doc/salome/gui/SMESH/images/revolutionsn1.png new file mode 100644 index 000000000..6564c7fc6 Binary files /dev/null and b/doc/salome/gui/SMESH/images/revolutionsn1.png differ diff --git a/doc/salome/gui/SMESH/images/revolutionsn2.png b/doc/salome/gui/SMESH/images/revolutionsn2.png new file mode 100644 index 000000000..67a673144 Binary files /dev/null and b/doc/salome/gui/SMESH/images/revolutionsn2.png differ diff --git a/doc/salome/gui/SMESH/images/rotation.png b/doc/salome/gui/SMESH/images/rotation.png index aed7744ba..ae6df4b9f 100755 Binary files a/doc/salome/gui/SMESH/images/rotation.png and b/doc/salome/gui/SMESH/images/rotation.png differ diff --git a/doc/salome/gui/SMESH/images/rotation_ico.png b/doc/salome/gui/SMESH/images/rotation_ico.png new file mode 100755 index 000000000..8f3d4bfd0 Binary files /dev/null and b/doc/salome/gui/SMESH/images/rotation_ico.png differ diff --git a/doc/salome/gui/SMESH/images/selectionfilterlibrary.png b/doc/salome/gui/SMESH/images/selectionfilterlibrary.png index f07c09641..38f297bd3 100755 Binary files a/doc/salome/gui/SMESH/images/selectionfilterlibrary.png and b/doc/salome/gui/SMESH/images/selectionfilterlibrary.png differ diff --git a/doc/salome/gui/SMESH/images/sewing.png b/doc/salome/gui/SMESH/images/sewing.png new file mode 100755 index 000000000..fcd2dfda2 Binary files /dev/null and b/doc/salome/gui/SMESH/images/sewing.png differ diff --git a/doc/salome/gui/SMESH/images/sewing1.png b/doc/salome/gui/SMESH/images/sewing1.png index 795d7a06b..daef959ff 100755 Binary files a/doc/salome/gui/SMESH/images/sewing1.png and b/doc/salome/gui/SMESH/images/sewing1.png differ diff --git a/doc/salome/gui/SMESH/images/sewing2.png b/doc/salome/gui/SMESH/images/sewing2.png index 66a409973..b7563f97a 100755 Binary files a/doc/salome/gui/SMESH/images/sewing2.png and b/doc/salome/gui/SMESH/images/sewing2.png differ diff --git a/doc/salome/gui/SMESH/images/sewing3.png b/doc/salome/gui/SMESH/images/sewing3.png index 6c74f1cbf..da2972fc4 100755 Binary files a/doc/salome/gui/SMESH/images/sewing3.png and b/doc/salome/gui/SMESH/images/sewing3.png differ diff --git a/doc/salome/gui/SMESH/images/sewing4.png b/doc/salome/gui/SMESH/images/sewing4.png index cd9869a85..748237c49 100755 Binary files a/doc/salome/gui/SMESH/images/sewing4.png and b/doc/salome/gui/SMESH/images/sewing4.png differ diff --git a/doc/salome/gui/SMESH/images/smoothing.png b/doc/salome/gui/SMESH/images/smoothing.png index 0fda00a22..26a427eb6 100755 Binary files a/doc/salome/gui/SMESH/images/smoothing.png and b/doc/salome/gui/SMESH/images/smoothing.png differ diff --git a/doc/salome/gui/SMESH/images/sort.png b/doc/salome/gui/SMESH/images/sort.png new file mode 100755 index 000000000..1dcf44a1c Binary files /dev/null and b/doc/salome/gui/SMESH/images/sort.png differ diff --git a/doc/salome/gui/SMESH/images/symmetry.png b/doc/salome/gui/SMESH/images/symmetry.png new file mode 100755 index 000000000..64fd26c8c Binary files /dev/null and b/doc/salome/gui/SMESH/images/symmetry.png differ diff --git a/doc/salome/gui/SMESH/images/symmetry1.png b/doc/salome/gui/SMESH/images/symmetry1.png index c8fda3e9d..b37fb0ab1 100755 Binary files a/doc/salome/gui/SMESH/images/symmetry1.png and b/doc/salome/gui/SMESH/images/symmetry1.png differ diff --git a/doc/salome/gui/SMESH/images/symmetry2.png b/doc/salome/gui/SMESH/images/symmetry2.png index b92fdd9f6..9304d6734 100755 Binary files a/doc/salome/gui/SMESH/images/symmetry2.png and b/doc/salome/gui/SMESH/images/symmetry2.png differ diff --git a/doc/salome/gui/SMESH/images/symmetry3.png b/doc/salome/gui/SMESH/images/symmetry3.png index b573636bc..f15c5fcaa 100755 Binary files a/doc/salome/gui/SMESH/images/symmetry3.png and b/doc/salome/gui/SMESH/images/symmetry3.png differ diff --git a/doc/salome/gui/SMESH/images/translation.png b/doc/salome/gui/SMESH/images/translation.png new file mode 100755 index 000000000..2362d7986 Binary files /dev/null and b/doc/salome/gui/SMESH/images/translation.png differ diff --git a/doc/salome/gui/SMESH/images/translation1.png b/doc/salome/gui/SMESH/images/translation1.png index f6909fbdb..b7e811645 100755 Binary files a/doc/salome/gui/SMESH/images/translation1.png and b/doc/salome/gui/SMESH/images/translation1.png differ diff --git a/doc/salome/gui/SMESH/images/translation2.png b/doc/salome/gui/SMESH/images/translation2.png index d1923e67f..c0bbad0a5 100755 Binary files a/doc/salome/gui/SMESH/images/translation2.png and b/doc/salome/gui/SMESH/images/translation2.png differ diff --git a/doc/salome/gui/SMESH/images/uniongroups.png b/doc/salome/gui/SMESH/images/uniongroups.png index 936c3b9f7..831f3cf33 100755 Binary files a/doc/salome/gui/SMESH/images/uniongroups.png and b/doc/salome/gui/SMESH/images/uniongroups.png differ diff --git a/doc/salome/gui/SMESH/images/unionoftwotriangles.png b/doc/salome/gui/SMESH/images/unionoftwotriangles.png index b9d2bdbd7..e897cfa5b 100755 Binary files a/doc/salome/gui/SMESH/images/unionoftwotriangles.png and b/doc/salome/gui/SMESH/images/unionoftwotriangles.png differ diff --git a/doc/salome/gui/SMESH/input/1d_meshing_hypo.doc b/doc/salome/gui/SMESH/input/1d_meshing_hypo.doc index 716ddd90d..705354692 100644 --- a/doc/salome/gui/SMESH/input/1d_meshing_hypo.doc +++ b/doc/salome/gui/SMESH/input/1d_meshing_hypo.doc @@ -6,6 +6,7 @@
@@ -21,7 +22,7 @@ which will compose the mesh of these 2D faces. \image html a-maxelarea.png -\image html max_el_area.png +\image html max_el_area.png "In this example, Max. element area is very small compared to the 1D hypothesis" See Also a sample TUI Script of a \ref tui_max_element_area "Maximum Element Area" hypothesis @@ -48,4 +49,14 @@ otherwise this mesh will contain some triangular elements.
This hypothesis has one restriction on its work: the total quantity of segments on all four sides of the face must be even (divisible by 2). + +
+\anchor triangle_preference_anchor +

Triangle Preference

+ +This algorithm can be used only together with Quadrangle (Mapping) +algorithm. It allows to build triangular mesh faces in the refinement +area if the number of nodes at the opposite edges of a meshed face is not equal, +otherwise refinement area will contain some quadrangular elements. +
*/ diff --git a/doc/salome/gui/SMESH/input/about_hypo.doc b/doc/salome/gui/SMESH/input/about_hypo.doc index 40b8ff590..578823bd6 100644 --- a/doc/salome/gui/SMESH/input/about_hypo.doc +++ b/doc/salome/gui/SMESH/input/about_hypo.doc @@ -13,30 +13,42 @@ generate a rough or a more refined mesh or submesh. In \b MESH there are the following Basic Hypotheses (to introduce them, you operate numerical values): -There also exist some -\ref additional_hypo_page "Additional Hypotheses": +Some hypotheses are strictly combined with plug-in +meshers and thus, work only with definite algorithms. + + +There also exist +\subpage additional_hypo_page "Additional Hypotheses" used together +with other hypotheses: + -*/ \ No newline at end of file +*/ diff --git a/doc/salome/gui/SMESH/input/about_meshes.doc b/doc/salome/gui/SMESH/input/about_meshes.doc index 3864329e4..61865173b 100644 --- a/doc/salome/gui/SMESH/input/about_meshes.doc +++ b/doc/salome/gui/SMESH/input/about_meshes.doc @@ -3,15 +3,25 @@ \page about_meshes_page About meshes \n \b MESH represents a discretization of a geometrical CAD model into -a set of entities with a simple topology. In MESH there are two -options of creation of meshes, you can: +a set of entities with a simple topology. - +Meshes are stored in DAT, MED and UNV formats and can be +\subpage importing_exporting_meshes_page "imported from and exported to" + the file in these formats. -The topology of a mesh is described by the relationships between its +However, it is possible to \subpage constructing_meshes_page "construct meshes" +on the basis of geometrical shapes produced in the GEOM module. +It is also possible to \subpage constructing_submeshes_page "create mesh on a part of the geometrical object", +for example, a face. + +Several created meshes can be \subpage building_compounds_page "combined into mesh compounds". + +All created meshes and submeshes can be \subpage editing_meshes_page "edited". + +Meshes can be also using the MESH functions destined for +\ref modifying_meshes_page "modification" of generated meshes. + +The \b topology of a mesh is described by the relationships between its entities including: -There also is a number of more specific algorithms: +\Note that BLSURF and GHS3D are commercial meshers and require a +license to be used within the Mesh module. + +There is also a number of more specific algorithms: \ref constructing_meshes_page "Constructing meshes" page describes in diff --git a/doc/salome/gui/SMESH/input/blsurf_hypo.doc b/doc/salome/gui/SMESH/input/blsurf_hypo.doc new file mode 100644 index 000000000..b392f3b72 --- /dev/null +++ b/doc/salome/gui/SMESH/input/blsurf_hypo.doc @@ -0,0 +1,222 @@ +/*! + +\page blsurf_hypo_page BLSURF Parameters hypothesis + +\n BLSURF Parameters hypothesis works only with BLSURF 2d +algorithm. This algorithm is a commercial software. + +\image html blsurf_parameters.png + + + +\n +The following options are commonly usable. The notion of diag +used in the descriptions means +the diagonal of the bounding box of the geometrical object to mesh. + + + +\n +The following advanced options are not documented and you can use them +at your own risk. +\n\n Interger variables: + +Real variables: + +String variables: + + + +\n +Currently BLSURF plugin has the following limitations. + + +*/ diff --git a/doc/salome/gui/SMESH/input/building_compounds.doc b/doc/salome/gui/SMESH/input/building_compounds.doc index d42f38866..faf636b82 100644 --- a/doc/salome/gui/SMESH/input/building_compounds.doc +++ b/doc/salome/gui/SMESH/input/building_compounds.doc @@ -10,7 +10,7 @@ From the \b Mesh menu select Build Compound or click "Build Compound Mesh" button in the toolbar. -\image html image161.gif +\image html image161.png
"Build Compound Mesh" button
\par @@ -45,8 +45,6 @@ and elements, in which case it is possible to define the \b Tolerance for this operation. -\n Example: - -\image html image160.gif +\image html image160.gif "Example of a compound of two meshed cubes" */ diff --git a/doc/salome/gui/SMESH/input/changing_orientation_of_elements.doc b/doc/salome/gui/SMESH/input/changing_orientation_of_elements.doc index 5cd4e48d9..410245b04 100644 --- a/doc/salome/gui/SMESH/input/changing_orientation_of_elements.doc +++ b/doc/salome/gui/SMESH/input/changing_orientation_of_elements.doc @@ -11,7 +11,7 @@ nodes of the selected elements.
  • In the \b Modification menu select the \b Orientation item or click Orientation button in the toolbar. -\image html image79.gif +\image html image79.png
    "Orientation" button
    The following dialog box will appear: @@ -35,7 +35,7 @@ list.
    • -
  • Click the \b Apply or \b OK button to confirm the operation.
    • +
  • Click the \b Apply or Apply and Close button to confirm the operation.

    • See Also a sample TUI Script of a diff --git a/doc/salome/gui/SMESH/input/clipping.doc b/doc/salome/gui/SMESH/input/clipping.doc index 858789e9a..f3b19f374 100644 --- a/doc/salome/gui/SMESH/input/clipping.doc +++ b/doc/salome/gui/SMESH/input/clipping.doc @@ -16,13 +16,13 @@ object, if it is set to 0.5 the object is split in two halves; and Z). If the Show preview button is on, you can see the clipping plane in the 3D Viewer. -\image html image79.jpg +\image html image79.jpg "The plane and the cut object" If the Auto Apply button is on, you can preview the cross-section in the 3D Viewer. -\image html image99.gif +\image html image99.gif "The cross-section" -To get a new object from \b Clipping, click \b Ok. +To get a new object from \b Clipping, click \b Apply. */ diff --git a/doc/salome/gui/SMESH/input/constructing_groups_of_specific_elements.doc b/doc/salome/gui/SMESH/input/constructing_groups_of_specific_elements.doc deleted file mode 100644 index 654b6aab8..000000000 --- a/doc/salome/gui/SMESH/input/constructing_groups_of_specific_elements.doc +++ /dev/null @@ -1,17 +0,0 @@ -/*! - -\page constructing_groups_of_specific_elements_page Constructing groups of specific elements - -\n In MESH you can easily construct groups of specific elements (nodes, -edges, faces or volumes) which will be taken from a definite submesh. - -To construct a group of specific elements: - -\par -Right-click on a submesh in the Object Browser and choose the -Construct Group item or select your submesh in the Object Browser and -in the \b Mesh menu choose the Construct Group item. MESH will construct -several groups consisting of elements of the definite type: nodes, -edges, faces or volumes. - -*/ \ No newline at end of file diff --git a/doc/salome/gui/SMESH/input/constructing_meshes.doc b/doc/salome/gui/SMESH/input/constructing_meshes.doc index 995ee4377..d62feac7c 100644 --- a/doc/salome/gui/SMESH/input/constructing_meshes.doc +++ b/doc/salome/gui/SMESH/input/constructing_meshes.doc @@ -5,8 +5,8 @@ \n Construction of a mesh consists of: @@ -15,7 +15,7 @@ this mesh.
  • In the \b Mesh menu select Create Mesh or click "Create Mesh" button in the toolbar. -\image html image32.gif +\image html image32.png
    "Create Mesh" button
    The following dialog box will appear: @@ -27,7 +27,7 @@ The following dialog box will appear: it is "Mesh_1". Then select the object you wish to mesh in the Object Browser and click the "Add" button. -\image html image120.gif +\image html image120.png
    "Add" button
    Now you can define 1d Algorithm and 1d Hypotheses, which will be @@ -35,13 +35,13 @@ applied to the edges of your object. (Note that any object has edges, even if their existence is not apparent, for example, a sphere has 4 edges). Click the "Add Hypothesis" button to add a hypothesis. -\image html image121.gif +\image html image121.png
    "Add Hypothesis" button
    Click the "Edit Hypothesis" button to define values for the current hypothesis. -\image html image122.gif +\image html image122.png
    "Edit Hypothesis" button
    The use of additional hypotheses is optional (i.e. you may leave @@ -77,7 +77,7 @@ settings. In the same way you can apply this functionality for meshing Browser. From the \b Mesh menu select \b Compute or click "Compute" button of the toolbar. -\image html image28.gif +\image html image28.png
    "Compute" button
    The Mesh Computation information box appears. @@ -90,12 +90,21 @@ failure is provided. \image html meshcomputationfail.png After you select the error, Show Subshape button allows -visualizing the mesh elements that cause it. +visualizing the geometrical entity that causes it. -\image html failed_computation.png +\image html failed_computation.png "Example of the invalid input mesh" -Publish Subshape button allows importing it in a separate MED -or UNV file. +\Note Mesh Computation Information box does not appear if you set +"Mesh computation/Show a computation result notification" preference +to the "Never" value. This option gives the possibility to control mesh +computation reporting. There are the following possibilities: always +show information box, only if an error occurs or never. +By default, the information box is always shown after mesh computation operation. + +Publish Subshape button publishes the subshape, whose meshing +failed, in GEOM component as a child of the mesh geometry, which +allows analyzing the problem geometry and creating a submesh on it in +order to locally tune hypotheses. NOTE It is possible to define a 1D or a 2D mesh in a python script and then use such submeshes in the construction of a 3D diff --git a/doc/salome/gui/SMESH/input/constructing_submeshes.doc b/doc/salome/gui/SMESH/input/constructing_submeshes.doc index 571740e5f..a17569f7c 100644 --- a/doc/salome/gui/SMESH/input/constructing_submeshes.doc +++ b/doc/salome/gui/SMESH/input/constructing_submeshes.doc @@ -2,6 +2,23 @@ \page constructing_submeshes_page Constructing submeshes +Submesh is a mesh on a geometrical subobject created with algorithms +and/or hypotheses other than the algorithms and hypotheses assigned to +the parent mesh on the parent object. +

    +If a geometrical subobject belongs to several geometrical objects +having different meshes or submeshes, it will be meshed with the +hypotheses of a submesh of a lower dimension.
    +For example, a face of a box is meshed with a submesh using algorithms +and hypotheses other than the parent mesh on the whole box. The face +and the box share four edges, which will be meshed with algorithms and +hypotheses of the submesh on the face, because the face is a 2D object +while the box is a 3D object.
    + If the dimensions are the same, an arbitrary algorithm/hypothesis + will be used. This means that an edge shared by two faces each having + its own different submesh, will be meshed using algorithms and + hypotheses of any of the two, chosen randomly.
    + \n Construction of a submesh consists of:
    • Selecting a mesh which will encapsulate your submesh
      • @@ -14,11 +31,11 @@ at computation of this submesh
      To construct a submesh: \par -From the \b Mesh menu select Local Hyp. or click "Create +From the \b Mesh menu select Create Submesh or click "Create Sum-mesh" button in the toolbar. \image html image33.gif -
      "Create Sum-mesh" button
      +
      "Create Submesh" button
      \par The following dialog box will appear: diff --git a/doc/salome/gui/SMESH/input/convert_to_from_quadratic_mesh.doc b/doc/salome/gui/SMESH/input/convert_to_from_quadratic_mesh.doc index 84974a21c..072a91f7a 100644 --- a/doc/salome/gui/SMESH/input/convert_to_from_quadratic_mesh.doc +++ b/doc/salome/gui/SMESH/input/convert_to_from_quadratic_mesh.doc @@ -12,7 +12,7 @@ for more information about quadratic meshes. Mesh item, or click "Convert to/from quadratic" button in the toolbar. -\image html image154.gif +\image html image154.png
      "Convert to/from quadratic" button
      The following dialog box will appear: diff --git a/doc/salome/gui/SMESH/input/creating_groups.doc b/doc/salome/gui/SMESH/input/creating_groups.doc index bba92d58a..0e89b980d 100644 --- a/doc/salome/gui/SMESH/input/creating_groups.doc +++ b/doc/salome/gui/SMESH/input/creating_groups.doc @@ -43,11 +43,12 @@ mesh elements. \n Select from set of fields allows to choose a submesh or an existing group whose elements of the previously defined type will be added to the list of elements which will form your group. -\n Color Number (integer only, ranging from 0 to 9999) - allows to -assign to the group a certain index, for example, defining boundary -conditions. This feature introduces a useful element of preprocessing -in Mesh module. Note that Color number attribute has nothing to do -with the colors used for the display of the elements of the group. +\n Color - allows to assign to the group a certain color, for +example, defining boundary conditions. This feature introduces a +useful element of preprocessing in Mesh module. Note that Color attribute defines +the colors used for the display of the elements of the group. +\n Warning The Med Color group interface may change in future versions of Salome. + \image html creategroup.png @@ -73,6 +74,16 @@ a new group of mesh elements will be created. \image html a-creategroup.png +

      +To create multiple groups on geometry of both nodes and elements of +any type at once, in the \b Mesh menu select Create Groups from +Geometry.
      +Group names are same as those of geometrical objects. +Type of group of mesh elements is defined automatically by +Geometrical object nature. + +\image html create_groups_from_geometry.png + \image html image132.gif
      In this picture the cells which belong to a certain face are selected in green.
      @@ -81,4 +92,58 @@ selected in green. \ref tui_create_group_on_geometry "Create a Group on Geometry" operation. +

      Creation of groups using existing groups and sub-meshes.

      + +Application provides possibility to create new standalone groups using existing standalone groups, groups on geometry and sub-meshes. This functionality is implemented using "Select from" group box of "Create group" dialog box described above. + +This functionality is described on the example of creating new group from existing standalone groups and groups on geometry. + +Imagine there are group G1. It can be standalone group or group on geometry. + +To create group G2 containing all entities of group G1 and a faces graphically selected in 3D view following steps can be performed: +
        +
      • User opens "Create group" dialog box.
        • +
      • The user specifies "Face" type of entities and "G2" name of group.
        • +
      • The user checks "Group" check-box of "Select From" group box.
        • +
      • The user selects G1 group in object browser or 3D view.
        • +
      • The user presses "Add" push button of "Content" group box. "Id Elements" list-box is filled with identifiers of faces belonging to group G1.
        • +
      • The user selects other faces in 3D view.
        • +
      • The user presses "Apply" button. System creates group G2.
        • +
      + +Please note that group G2 does not have a references to source group G1. It contains list of faces identifiers only. So if G1 group will be changed group G2 will remain unmodified. + +
      +\anchor gui_create_dim_group +

      Creating groups of entities from existing groups of superior dimensions

      + +Application provides possibility for creating groups of entities from existing groups of superior dimensions. For example, it is possible to create group of nodes using list of existing groups of faces. + +To create groups of entities from existing groups of superior dimensions, in the \b Mesh menu select Group of underlying entities.
      + +The following dialog box will appear: + +\image html dimgroup_dlg.png + +In this dialog box you should specify the name of the resulting group, types of entities and set of source groups. + +For example, we have two source Volume groups illustrated on the figure below + +\image html dimgroup_src.png +
      Source groups
      + +In this case we obtain following results for Faces, Edges and Nodes. + +\image html dimgroup_2d.png +
      Faces
      + +\image html dimgroup_1d.png +
      Edges
      + +\image html dimgroup_0d.png +
      Nodes
      + +See Also a sample TUI Script of a +\ref tui_create_dim_group "Creating groups of entities from existing groups of superior dimensions" +operation. */ \ No newline at end of file diff --git a/doc/salome/gui/SMESH/input/creating_meshes.doc b/doc/salome/gui/SMESH/input/creating_meshes.doc deleted file mode 100644 index 3f392f2fc..000000000 --- a/doc/salome/gui/SMESH/input/creating_meshes.doc +++ /dev/null @@ -1,31 +0,0 @@ -/*! - -\page creating_meshes_page Creating meshes - -
        -
      • \subpage about_meshes_page
        • -
      • \subpage importing_exporting_meshes_page
        • -
      • \subpage constructing_meshes_page
        • -
      • \subpage defining_algos_page
        • -
          -
        • \ref basic_meshing_algos_page
          • -
        • \ref projection_algos_page
          • -
        • \ref radial_prism_algo_page
          • -
        • \ref segments_around_vertex_algo_page
          • -
        • \ref prism_3d_algo_page
          • -
        -
      • \subpage defining_hypo_page
        • -
          -
        • \ref about_hypo_page
          • -
        • \ref a1d_meshing_hypo_page
          • -
        • \ref a2d_meshing_hypo_page
          • -
        • \ref max_element_volume_hypo_page
          • -
        • \ref netgen_2d_3d_hypo_page
          • -
        • \ref additional_hypo_page
          • -
        -
      • \subpage constructing_submeshes_page
        • -
      • \subpage building_compounds_page
        • -
      • \subpage editing_meshes_page
        • -
      - -*/ \ No newline at end of file diff --git a/doc/salome/gui/SMESH/input/cutting_quadrangles.doc b/doc/salome/gui/SMESH/input/cutting_quadrangles.doc index d857165e1..cbc412855 100644 --- a/doc/salome/gui/SMESH/input/cutting_quadrangles.doc +++ b/doc/salome/gui/SMESH/input/cutting_quadrangles.doc @@ -12,7 +12,7 @@ corners.
    • In the \b Modification menu select the Cutting of quadrangles item or click "Cutting of quadrangles" button in the toolbar. -\image html image82.gif +\image html image82.png
      "Cutting of quadrangles" button
      The following dialog box will appear: @@ -50,12 +50,12 @@ list.
    • -
  • Click the \b Apply or \b OK button to confirm the operation.
    • +
  • Click the \b Apply or Apply and Close button to confirm the operation.
    • -\image html image52.jpg +\image html image52.jpg "The chosen quadrangular element" -\image html image51.jpg +\image html image51.jpg "Two resulting triangular elements"
    See Also a sample TUI Script of a \ref tui_cutting_quadrangles "Cutting Quadrangles" operation. diff --git a/doc/salome/gui/SMESH/input/defining_algos.doc b/doc/salome/gui/SMESH/input/defining_algos.doc deleted file mode 100644 index 1ddac9f37..000000000 --- a/doc/salome/gui/SMESH/input/defining_algos.doc +++ /dev/null @@ -1,13 +0,0 @@ -/*! - -\page defining_algos_page Defining Algorithms - -
      -
    • \subpage basic_meshing_algos_page
      • -
    • \subpage projection_algos_page
      • -
    • \subpage radial_prism_algo_page
      • -
    • \subpage segments_around_vertex_algo_page
      • -
    • \subpage prism_3d_algo_page
      • -
    - -*/ \ No newline at end of file diff --git a/doc/salome/gui/SMESH/input/defining_hypo.doc b/doc/salome/gui/SMESH/input/defining_hypo.doc deleted file mode 100644 index 5a4eb7503..000000000 --- a/doc/salome/gui/SMESH/input/defining_hypo.doc +++ /dev/null @@ -1,14 +0,0 @@ -/*! - -\page defining_hypo_page Defining hypotheses - -
      -
    • \subpage about_hypo_page
      • -
    • \subpage a1d_meshing_hypo_page
      • -
    • \subpage a2d_meshing_hypo_page
      • -
    • \subpage max_element_volume_hypo_page
      • -
    • \subpage netgen_2d_3d_hypo_page
      • -
    • \subpage additional_hypo_page
      • -
    - -*/ \ No newline at end of file diff --git a/doc/salome/gui/SMESH/input/deleting_groups.doc b/doc/salome/gui/SMESH/input/deleting_groups.doc index 02779cde6..21eea88df 100644 --- a/doc/salome/gui/SMESH/input/deleting_groups.doc +++ b/doc/salome/gui/SMESH/input/deleting_groups.doc @@ -6,8 +6,8 @@ select one or several groups you wish to delete in the 3D viewer or in the Object Browser. \n The selected groups will be listed in Delete groups with contents -menu. Then click Ok button to remove the selected groups and close the -menu or Apply button to remove them and proceed with the selection. +menu. Then click Apply and Close button to remove the selected groups and close the +menu or \b Apply button to remove them and proceed with the selection. \image html deletegroups.png diff --git a/doc/salome/gui/SMESH/input/diagonal_inversion_of_elements.doc b/doc/salome/gui/SMESH/input/diagonal_inversion_of_elements.doc index 871e110cc..8642ebfdb 100644 --- a/doc/salome/gui/SMESH/input/diagonal_inversion_of_elements.doc +++ b/doc/salome/gui/SMESH/input/diagonal_inversion_of_elements.doc @@ -10,7 +10,7 @@ formed by two neighboring triangles with one common edge.
  • From the \b Modification menu choose the Diagonal inversion item or click "Diagonal Inversion" button in the toolbar. -\image html image70.gif +\image html image70.png
    "Diagonal Inversion" button
    The following dialog box shall appear: @@ -20,12 +20,12 @@ The following dialog box shall appear:
  • Enter the ID of the required edge in the \b Edge field or select this edge in the 3D viewer.
    • -
  • Click the \b Apply or \b OK button.
    • +
  • Click the \b Apply or Apply and Close button.
    • -\image html image38.jpg +\image html image38.jpg "The selected edge" -\image html image36.jpg +\image html image36.jpg "The inverted edge"
    See Also a sample TUI Script of a \ref tui_diagonal_inversion "Diagonal Inversion of Elements" operation. diff --git a/doc/salome/gui/SMESH/input/display_mode.doc b/doc/salome/gui/SMESH/input/display_mode.doc index 7ba8e54bf..6817d29f9 100644 --- a/doc/salome/gui/SMESH/input/display_mode.doc +++ b/doc/salome/gui/SMESH/input/display_mode.doc @@ -17,6 +17,6 @@ and selecting Display Mode, you can display your mesh as: \b Shading and \b Wireframe modes can combine with \b Shrink, however \b Nodes can't. -\image html image55.gif +\image html image55.gif Shrink */ \ No newline at end of file diff --git a/doc/salome/gui/SMESH/input/editing_groups.doc b/doc/salome/gui/SMESH/input/editing_groups.doc index 5658f2f4e..b5031468a 100644 --- a/doc/salome/gui/SMESH/input/editing_groups.doc +++ b/doc/salome/gui/SMESH/input/editing_groups.doc @@ -17,11 +17,25 @@ The following dialog box will appear: In this dialog box you can modify the name of your group and add or remove the elements forming it. For more information see \ref creating_groups_page "Creating Groups" page. -
  • Click the \b OK or \b Apply button to confirm modification of the +
  • Click the \b Apply or Apply and Close button to confirm modification of the group.
    • +\n To convert an existing group on geometry into standalone group +of elements and modify: +
      +
    1. Select your group on geometry in the Object Browser and in the \b Mesh menu click +the Edit Group as Standalone item.
      2. + +\image html image74.gif +
      "Edit Group as Standalone" button
      + +The group on geometry will be converted into standalone group and can +be modified as group of elements +
    2. Click the \b Apply or Apply and Close button to confirm modification of the +group.
      3. +
      See Also a sample TUI Script of an \ref tui_edit_group "Edit Group" operation. -*/ \ No newline at end of file +*/ diff --git a/doc/salome/gui/SMESH/input/editing_meshes.doc b/doc/salome/gui/SMESH/input/editing_meshes.doc index b36f7849f..62685e557 100644 --- a/doc/salome/gui/SMESH/input/editing_meshes.doc +++ b/doc/salome/gui/SMESH/input/editing_meshes.doc @@ -13,17 +13,15 @@ Creation. You can also change values for the current hypothesis by clicking the "Edit Hypothesis" button. -\image html image122.gif +\image html image122.png
      "Edit Hypothesis" button
      -See how a mesh constructed on one and the same geometrical object +See how the mesh constructed on a geometrical object changes if we apply different algorithms to it. -\image html edit_mesh1.png +\image html edit_mesh1.png "Example of a mesh with Max. Element area 2D hypothesis roughly corresponding to 1D hypotheses on edges" -\image html edit_mesh_remove_hyp.png - -\image html edit_mesh_change_value_hyp.png +\image html edit_mesh_change_value_hyp.png "And now the Max Element area is greatly reduced"
      See Also a sample TUI Script of an \ref tui_editing_mesh "Edit Mesh" operation. diff --git a/doc/salome/gui/SMESH/input/extrusion.doc b/doc/salome/gui/SMESH/input/extrusion.doc index 674a9d9b4..ea25158f1 100644 --- a/doc/salome/gui/SMESH/input/extrusion.doc +++ b/doc/salome/gui/SMESH/input/extrusion.doc @@ -13,7 +13,7 @@ and Hexahedron solids respectively.
    3. From the \b Modification menu choose the \b Extrusion item or click "Extrusion" button in the toolbar. -\image html image91.gif +\image html image91.png
      "Extrusion" button
      The following dialog box will appear: @@ -28,7 +28,18 @@ The following dialog box will appear:
    4. the type of elements which will be extruded (1D or 2D),
    5. specify the IDs of the elements which will be extruded by selecting them in the 3D viewer or select the whole mesh or -submesh,
      6. +submesh, +
        +
      • Check on Select the whole mesh, submesh or group option +
      • Choosing them manually with the mouse in the 3D Viewer. You can +click on an element in the 3D viewer and it will be highlighted
        • +
      • Applying Filters. The Set filter button allows to apply a +definite filter to selection of the elements. See more +about filters on the +\ref selection_filter_library_page "Selection filter library" page.
        • +
      + +
    6. specify the distance at which the elements will be extruded,
    7. specify the vector along which the elements will be extruded,
    8. number of steps.
      9. @@ -39,9 +50,9 @@ elements of the source mesh to the newly created one.
    9. Click the \b Apply or \b OK button.
    -\image html image77.jpg +\image html image77.jpg "The mesh with an edge selected for extrusion" -\image html image76.jpg +\image html image76.jpg "The mesh with extruded edge"
    See Also a sample TUI Script of an \ref tui_extrusion "Extrusion" operation. diff --git a/doc/salome/gui/SMESH/input/extrusion_along_path.doc b/doc/salome/gui/SMESH/input/extrusion_along_path.doc index ce96f99d9..d35d23315 100644 --- a/doc/salome/gui/SMESH/input/extrusion_along_path.doc +++ b/doc/salome/gui/SMESH/input/extrusion_along_path.doc @@ -85,7 +85,7 @@ mesh.
  • From the \b Modification menu choose the Extrusion along a path item or click "Extrusion along a path" button in the toolbar. -\image html image101.gif +\image html image101.png
    "Extrusion along a path" button
    The following dialog box will appear: @@ -98,9 +98,16 @@ The following dialog box will appear:
  • In the dialog box you should:
    • select the type of elements which will be extruded (1D or 2D),
      • -
    • specify the IDs of the elements which will be extruded by -selecting them in the 3D viewer or Select the whole mesh, submesh -or group, +
    • specify the IDs of the elements which will be extruded +
        +
      • Check on Select the whole mesh, submesh or group option +
      • Choosing them manually with the mouse in the 3D Viewer. You can +click on an element in the 3D viewer and it will be highlighted
        • +
      • Applying Filters. The Set filter button allows to apply a +definite filter to selection of the elements. See more +about filters on the +\ref selection_filter_library_page "Selection filter library" page.
        • +
    • define the Path along which the elements will be extruded, \n Path definition consists of several elements: @@ -129,12 +136,15 @@ mesh in a helical fashion. You can set the values of angles at the right, add them to the list of angles at the left by pressing the "Add" button and remove them from the list by pressing the "Remove" button. -\image html image105.gif +\image html add.png
      "Add" button
      -\image html image106.gif +\image html remove.png
      "Remove" button
      +Linear variation of the angles option allows defining the angle of gradual rotation for the whole path. +At each step the shape will be rotated by angle/nb. of steps. +
    • @@ -150,4 +160,4 @@ duplicated nodes and faces, because no sewing is done.
    See Also a sample TUI Script of an \ref tui_extrusion_along_path "Extrusion along a Path" operation. -*/ \ No newline at end of file +*/ diff --git a/doc/salome/gui/SMESH/input/free_faces.doc b/doc/salome/gui/SMESH/input/free_faces.doc new file mode 100644 index 000000000..4a87b992a --- /dev/null +++ b/doc/salome/gui/SMESH/input/free_faces.doc @@ -0,0 +1,17 @@ +/*! + +\page free_faces_page Free faces + +\n This mesh quality control highlights faces which are connected +less than to two mesh volume elements. Free faces are shown with a color differs from +the color of shared faces. + +\image html free_faces.png +
    In this picture some volume mesh element are removed as +a result some faces become connected only to one +volume. i.e. become free. + +
    See Also a sample TUI Script of a +\ref tui_free_faces "Free Faces quality control" operation. + +*/ diff --git a/doc/salome/gui/SMESH/input/free_nodes.doc b/doc/salome/gui/SMESH/input/free_nodes.doc new file mode 100644 index 000000000..13f314309 --- /dev/null +++ b/doc/salome/gui/SMESH/input/free_nodes.doc @@ -0,0 +1,16 @@ +/*! + +\page free_nodes_page Free nodes + +\n This mesh quality control highlights nodes which are not connected +to any mesh element. Free nodes are shown with a color differs from +the color of nodes. + +\image html free_nodes.png +
    In this picture some nodes don't connected to a mesh element as +a result of deleting elements and adding several isolated nodes. + +
    See Also a sample TUI Script of a +\ref tui_free_nodes "Free Nodes quality control" operation. + +*/ diff --git a/doc/salome/gui/SMESH/input/ghs3d_hypo.doc b/doc/salome/gui/SMESH/input/ghs3d_hypo.doc new file mode 100644 index 000000000..414e342fa --- /dev/null +++ b/doc/salome/gui/SMESH/input/ghs3d_hypo.doc @@ -0,0 +1,69 @@ +/*! + +\page ghs3d_hypo_page GHS3D Parameters hypothesis + +\n GHS3D Parameters hypothesis works only with Tetrahedron (GHS3D) +algorithm. This algorithm is a commercial software. + +\image html ghs3d_parameters_basic.png + +
      +
    • Name - allows to define the name of the hypothesis (GHS3D +Parameters by default).
      • + +
    • To mesh holes - if checked, the algorithm will +create mesh in the holes inside a solid shape, else only the outermost +shape will be meshed. Volumic elements created within holes are bound +to the solid.
      • + +
    • Optimization level - allows choosing the required +optimization level: none, light, medium or strong. Higher level of +optimisation provides better mesh, but can be time-consuming. +
      • + +\image html ghs3d_parameters_advanced.png + +
    • Maximum memory size - launches ghs3d software with +work space limited to the specified amount of RAM, in Mbytes. If this option is +checked off, the software will be launched with 7O% of the total RAM space.
      • + +
    • Initial memory size - starts ghs3d software with +the specified amount of work space, in Mbytes. If this option is checked off, the +software will be started with 100 Megabytes of working space.
      • + +
    • Working directory - allows defining the folder for input and output +files of ghs3d software, which are the files starting with "GHS3D_" prefix.
      • + +
    • Keep working files - allows checking input and output files +of ghs3d software, while usually these files are removed after the +launch of the mesher.
      • + +
    • Verbose level - to choose verbosity level in the range from +0 to 10. +
      • 0, no standard output, +
      • 2, prints the data, quality statistics of the skin and final +meshes and indicates when the final mesh is being saved. In addition +the software gives indication regarding the CPU time. +
      • 10, same as 2 plus the main steps in the computation, quality +statistics histogram of the skin mesh, quality statistics histogram +together with the characteristics of the final mesh. +
      • + +
    • To create new nodes - if this option is checked off, ghs3d +tries to create tetrahedrons using only the nodes of the 2D mesh.
      • + +
    • To use boundary recovery version - enables using a +boundary recovery module which tries to +create volume meshes starting from very poor quality surface meshes +(almost flat triangles on the surface, high density propagation, +extreme aspect ratios, etc.) which fails with the standard version. The +resulting volume mesh will however most likely have a very poor +quality (poor aspect ratio of elements, tetrahedra with a very small +positive volume).
      • + +
    • Option as text - allows input of any text as command line +for ghs3d. This allows the input of advanced options in a free from.
      • + +
    + +*/ \ No newline at end of file diff --git a/doc/salome/gui/SMESH/input/ghs3dprl_hypo.doc b/doc/salome/gui/SMESH/input/ghs3dprl_hypo.doc new file mode 100644 index 000000000..40ffb918c --- /dev/null +++ b/doc/salome/gui/SMESH/input/ghs3dprl_hypo.doc @@ -0,0 +1,392 @@ +/*! + +\page ghs3dprl_hypo_page GHS3DPRL Parameters hypothesis + +\n GHS3DPRL Parameters hypothesis works only with Tetrahedron (Tepal with TetMesh-GHS3D) algorithm. +\n +\n This algorithm is a commercial software, its use requires a licence (http://www.distene.com/fr/build/offer.html). +\n The advantage of Tepal is the possibility to generate (for example) a partitioned +200 million tetrahedra mesh on a not-so-big memory computer (2Go RAM) +...in something like 50 hours of one CPU (Xeon, 2008). +This is an alternative to Pluging GHS3D where you should need something like a not-so-common CPU with 64Go RAM +to try to do a one-partitionned 200 million tetrahedra mesh ...in a much less time indeed. +\n +\n Notes: +\n This Plugin doesn't load in Memory the supposed plentiful big resulting meshes. +It's user choice: (in GUI Mesh mode) menu File-Import-MED Files. +\n Beware, to load one 5 millions tetrahedra MED file, GUI Salome needs 2Go RAM. +\n A new true parallel faster version of Tepal, using MPI, is expected in 2009. + +\image html ghs3dprl_parameters_basic.png + +
      +
    • +Name - allows to define the name of the hypothesis (GHS3DPRL Parameters by default). +
      • +
    • +MED_Name - allows to define the path and the basename of the +generated resulted MED files ("DOMAIN" by default). +Undefined path means environment variable $SALOME_TMP_DIR (or $TMP by default). +
      • +
    • +Nb_Part - allows to define the number of MED files generated, +the initial skin (triangles) will be meshed (tetrahedra) and partitioned +in Nb_Part by the elementary algorithm implemented in Tepal.
      +Beware, the (expected) number of total tetrahedra versus this parameter +involves the maximum tepal RAM use. +
      • +
    • +Keep_Files - if this box is checked, input files of Tepal +(GHS3DPRL.points and GHS3DPRL.faces) are deleted after use (...if no backgrounding). +
      • +
    • +Tepal_in_Background - if this box is checked, for big meshes, +launch Tepal execution and MED file generation in background, +allows user exiting of Salome. In this case, beware of the +job Tepal is "killSalome.py" independent, sometimes on other host. +
      • +
    • +To_Mesh_Holes - if this box is checked, force parameter component +of tetmesh-ghs3d to mesh holes. +
      • + +

      Modifying GHS3DPRL Advanced Parameters


      +GHS3DPRL Plugin launches standalone binary executable tepal2med which launches binary executable tepal.
      +tepal2med launches tepal, wait for the end of computation, and converts resulting output tepal files in expected MED files.
      +Some advanced optional parameters are accessibles as arguments.
      +If keep_files checked you a posteriori can always re-launch tepal2med in a Terminal as a command with yours parameters.
      Idem for tepal.

      +
    • +Advanced tepal2med Parameters - type "tepal2med --help" in a Terminal.

      + +\verbatim +myname@myhost > /export/home/myname/salome_5/GHS3DPRLPLUGIN_5/bin/salome/tepal2med --help +Available options: + --help : produces this help message + --casename : path and name of input tepal2med files which are + - output files of tepal .msg .noboite .faces .points .glo + - output file of GHS3DPRL_Plugin casename_skin.med (optional) + with initial skin and its initial groups + --number : number of partitions + --medname : path and name of output MED files + --limitswap : max size of working cpu memory (Mo) (before swapping on .temp files) + --verbose : trace of execution (0->6) + --test : more tests about joints, before generation of output files + --menu : a GUI menu for option number + --launchtepal : also launch tepal on files casename.faces and casename.points and option number + --meshholes : force parameter component of tetmesh-ghs3d to mesh holes + --background : force background mode from launch tepal and generation of final MED files (big meshes) + --deletegroups : regular expression (see QRegExp) which matches unwanted groups in final MED files + (try --deletegroups="(\bAll_Nodes|\bAll_Faces)" + (try --deletegroups="((\bAll_|\bNew_)(N|F|T))" +example: + tepal2med --casename=/tmp/GHS3DPRL --number=2 --medname=DOMAIN --limitswap=1000 + --verbose=0 --test=yes --menu=no --launchtepal=no + +\endverbatim + +

      • +
    • +

      +Advanced tepal Parameters - type "tepal" in a Terminal.

      + +\verbatim +myname@myhost > tepal + ===================================== + GHS3D-TEPAL 1.4.2 (Dec, 2006) 10-Dec-2008 AT 12:59:48 + ===================================== + + Distene SAS + Pole Teratec - BARD-1 + Domaine du Grand Rue + 91680 Bruyeres le Chatel + FRANCE + Phone: +33(0)1-69-26-62-10 Fax: +33(0)1-69-26-90-33 + EMail: support@distene.com + + COPYRIGHT (C)2006 DISTENE ALL RIGHTS RESERVED + + +USAGE : tepal options + +With options in : + --filename name (-f name) : + Basename of the input case (MANDATORY) + + --ndom n (-n n) : + Number of subdomains to make (MANDATORY) + + --ghs3d ghs3d options (-g ghs3d options) : + Run temesh ghs3d on a previously generated subdomain. (ghs3d options must be "quoted") + + --memory m (-m m) : + Max amount of memory (megabytes) allowed for ghs in the cutting process. (default is 0 : unlimited) + + --mesh_only (-Z ) : + Only (re)mesh all subdomains and update communications messages + + --mesh_call command (-c command) : + Call the user specified command for meshing all the subomains after their skin was generated + + --stats_only (-S ) : + Only compute and show some statistics on subdomains + + --rebuild (-r ) : + Merge final subdomains skins + + --rebuild_tetra (-R ) : + Merge final subdomains skins and tetraedra + + --rebuild_iface (-i ) : + Include interfaces in final subdomains merge + + --rebuild_retag (-t ) : + Tag vertices, faces (and tetra if selected) with their subdomain number in final subdomains merge (keeps the lowest tag for shared elements) + + --rebuild_ensight_parts (-e ) : + Build ensight geom file with parts + + --tetmesh_args str (-G str) : + Arguments to pass to Tetmesh during cutting process + + ============================================================================== + GHS3D-TEPAL SOFTWARE 1.4.2 (Dec, 2006) + END OF SESSION + COPYRIGHT (C)2006 DISTENE ALL RIGHTS RESERVED + ============================================================================== + ( Distene SAS + Phone: +33(0)1-69-26-62-10 Fax: +33(0)1-69-26-90-33 + EMail: support@distene.com ) + +\endverbatim + +

      • +
    • +

      +Advanced ghs3d Parameters (through tepal's --tetmesh_args) - type "ghs3d -h" in a Terminal.

      + +\verbatim +myname@myhost > ghs3d -h + +USE + /export/home/myname/ghs3d-4.0/DISTENE/Tools/TetMesh-GHS3D4.0/bin/Linux/ghs3dV4.0 + [-u] [-m memory>] [-M MEMORY] [-f prefix] [-v verbose] + [-c component] [-p0] [-C] [-E count] [-t] [-o level] + [-I filetype] [-a/-b] [-O n m] + +DESCRIPTION + + -u (-h) : prints this message. + + -m memory : launches the software with memory Megabytes of work space. + The default value of this parameter is 64 Megabytes and its + minimum value is 10 Megabytes. + It is also possible to set this parameter with the + environment variable GHS3D_MEMORY by means of an operation + equivalent to: + setenv GHS3D_MEMORY memory, + the value specified in the command line has the priority on + the environment variable. + + -M MEMORY : uses the automatic memory adjustment feature. + If MEMORY is zero, the size of the work space is initially + guessed from the input. If MEMORY is not zero, the + software starts with MEMORY Megabytes of work space. + The software then reallocates more and more memory as + needed. + The starting value when MEMORY equals 0 is 64 Megabytes, + the maximum is given with memory of the -m option if used + and the actual memory available. + + -f prefix : defines the generic prefix of the files. + + -v verbose : sets the output level parameter (the verbose parameter + must be in the range 0 to 10). + + -c component : chooses the meshed component. If component is + 0, all components to be meshed + 1, only the main (outermost) component to be meshed + + -p0 : disables creation of internal points. + + -C : uses alternate boundary recovery version. To be used only + when the boundary recovery of the standard version fails. + + -E count : sets the extended output for error messages. If -E is used, + the error messages found will be printed, up to a maximum + count of errors between 1 and 100. + + -t : generates an error file prefix.Log + + -o level : sets the desired optimisation level. + Valid optimisation levels are: + none, light, medium or standard, strong, + in increasing order of "quality vs speed" ratio. + + -I filetype : defines the input mesh format as follows: + -IP input files are ascii files, named prefix.points + and prefix.faces - this is the default + -IPb input files are binary files, named prefix.pointsb + and prefix.facesb + -IM input file is ascii file, named prefix.mesh + where prefix is given with the -f option + + -a/-b : selects the output file type: + -a for ascii (the default) and + -b for binary. + + -On : saves a NOPO file in addition. NOPO is the mesh data + structure of the Simail and Modulef software packages. + -Om : saves a mesh file in addition. + -Omn : saves both NOPO and mesh files. + + ============================================================================== + TETMESH-GHS3D SOFTWARE 4.0-3 (December, 2006) + END OF SESSION + COPYRIGHT (C)1989-2006 INRIA ALL RIGHTS RESERVED + ============================================================================== + ( Distene SAS + Phone: +33(0)1-69-26-62-10 Fax: +33(0)1-69-26-90-33 + EMail: support@distene.com ) + +\endverbatim + +

      • +

      Saving user's preferred GHS3DPRL Advanced Parameters


      +GHS3DPRL Plugin launches standalone binary executable tepal2med.
      +you may rename tepal2med as tepal2med.exe for example, and replace tepal2med by a shell script at your convenience to overriding parameters.
      ... or else $PATH modification... .
      Idem for tepal.

      +
    • +Advanced tepal2med Parameters - overriding parameter deletegroups

      + +\code +#!/bin/bash +#script tepal2med overriding parameter deletegroups +#we have renamed binary executable tepal2med as tepal2med.exe +#echo tepal2med initial parameters are $1 $2 $3 $4 ... or $* +#$0 is ignored + +tepal2med.exe $* --deletegroups="(\bAll_Nodes|\bAll_Faces)" + +\endcode + +

      • +
    • +

      +Advanced tepal Parameters - overriding parameter component of ghs3d (to mesh holes).

      + +\code +#!/bin/bash +#script tepal overriding parameter component of tetmesh-ghs3d +#we have renamed binary executable tepal as tepal.exe + +#optionnaly we could set licence only for us +DISTENE_LICENSE_FILE="Use global envvar: DLIM8VAR" +DLIM8VAR="dlim8 1:1:29030@is142356/0016175ef08c::a1ba1...etc...e19" +SIMULOGD_LICENSE_FILE=29029@is142356 + +tepal.exe $* --tetmesh_args "-c 0" + +\endcode + +

      • +
    • +

      +Advanced tepal Parameters - overriding launching tepal on other host.

      + +\code +#!/bin/bash +#script tepal overriding launching tepal on other host (tepal run 64 bits only) +#we have renamed binary executable tepal as tepal.exe +#common file system (same path) otherwise scp... on input or result files +#ssh -keygen -t rsa done and files id_rsa et id-rsa.pub move in ~/.ssh + +#example of typical command +#tepal -f /home/myname/tmp/GHS3DPRL -n 4 > /home/myname/tmp/tepal.log +#echo parameters $1 $2 $3 $4 ... or $* + +#tepal licence ought to be known on otherhost +ssh otherhost "tepal.exe $* > /home/myname/tmp/tepal.log" + +#or more and more +#ssh otherhost "tepal.exe $* --tetmesh_args \"-c 0\"" > /home/myname/tmp/tepal.log + +\endcode + +

      • + +

      TUI use.


      + +
    • +

      +example ex30_tepal.py.

      + +\code + +#!/bin/python +import os + +import geompy +import smesh + +# Parameters +# ---------- + +results = "/tmp/ZZ" + +radius = 50 +height = 200 + +# Build a cylinder +# ---------------- + +base = geompy.MakeVertex(0, 0, 0) +direction = geompy.MakeVectorDXDYDZ(0, 0, 1) + +cylinder = geompy.MakeCylinder(base, direction, radius, height) + +geompy.addToStudy(cylinder, "Cylinder") + +# Define a mesh on a geometry +# --------------------------- + +m = smesh.Mesh(cylinder) + +# 2D mesh with BLSURF +# ------------------- + +algo2d = m.Triangle(smesh.BLSURF) + +algo2d.SetPhysicalMesh(1) +algo2d.SetPhySize(5) + +algo2d.SetGeometricMesh(0) + +# 3D mesh with tepal +# ------------------ + +algo3d = m.Tetrahedron(smesh.GHS3DPRL) + +algo3d.SetMEDName(results) +algo3d.SetNbPart(4) +algo3d.SetBackground(False) +algo3d.SetKeepFiles(False) +algo3d.SetToMeshHoles(True) + +# Launch meshers +# -------------- + +status = m.Compute() + +# Test if ok +# ---------- + +if os.access(results+".xml", os.F_OK): + print "Ok: tepal" +else: + print "KO: tepal" +\endcode + +

      • +
    + + +*/ diff --git a/doc/salome/gui/SMESH/input/grouping_elements.doc b/doc/salome/gui/SMESH/input/grouping_elements.doc index a9a636793..56fe14c0d 100644 --- a/doc/salome/gui/SMESH/input/grouping_elements.doc +++ b/doc/salome/gui/SMESH/input/grouping_elements.doc @@ -2,13 +2,30 @@ \page grouping_elements_page Grouping elements +In Mesh module it is possible to \subpage creating_groups_page "create groups of mesh elements": +nodes, edges, faces or volumes:
      -
    • \subpage creating_groups_page
      • -
    • \subpage editing_groups_page
      • -
    • \subpage using_operations_on_groups_page
      • -
    • \subpage constructing_groups_of_specific_elements_page
      • -
    • \subpage deleting_groups_page
      • -
    • \subpage selection_filter_library_page
      • +
    • by selecting the elements of the specified kind by their IDs or +directly on the presentation in the VTK viewer - Standalone group tab of Create group +dialog.
      • +
    • by creating a group of elements of the selected type from all +such elements of the chosen geometrical object - Group on +geometry tab of Create group dialog.
      • +
    • by creating several groups of elements (nodes, +edges, faces and volumes) from the chosen submesh - using Mesh -> Construct +Group Menu item. In this case groups of elements are created automatically.
    +The created groups can be later: + +
      +
    • \subpage editing_groups_page "Edited"
      • +
    • \subpage using_operations_on_groups_page "Subjected to Boolean operations", or
      • +
    • \subpage deleting_groups_page "Deleted"
      • +
    + +An important tool, providing filters for creation of \b Standalone +groups is \subpage selection_filter_library_page. + + */ diff --git a/doc/salome/gui/SMESH/input/importing_exporting_meshes.doc b/doc/salome/gui/SMESH/input/importing_exporting_meshes.doc index e016ffff1..dbf96ab89 100644 --- a/doc/salome/gui/SMESH/input/importing_exporting_meshes.doc +++ b/doc/salome/gui/SMESH/input/importing_exporting_meshes.doc @@ -3,7 +3,9 @@ \page importing_exporting_meshes_page Importing and exporting meshes \n In MESH there is a functionality allowing importation/exportation -of meshes from \b MED, \b UNV (I-DEAS 10), \b DAT (Nastran) and STL format files. +of meshes from \b MED, \b UNV (I-DEAS 10), \b DAT (Nastran) and STL +format files. + To import a mesh: @@ -12,7 +14,8 @@ of meshes from \b MED, \b UNV (I-DEAS 10), \b DAT (Nastran) and STL format files select the corresponding format (MED, UNV and DAT) of the file containing your mesh.
  • In the standard Search File dialog box find the file for -importation.
    • +importation. It is possible to select multiple files to be imported all at once. +
  • Click the \b OK button.
    • diff --git a/doc/salome/gui/SMESH/input/index.doc b/doc/salome/gui/SMESH/input/index.doc index f09cdea83..2de722d16 100644 --- a/doc/salome/gui/SMESH/input/index.doc +++ b/doc/salome/gui/SMESH/input/index.doc @@ -1,114 +1,27 @@ /*! -\mainpage SMESH Module Reference Documentation +\mainpage Introduction to MESH +\image html a-viewgeneral.png + +\n \b MESH module of SALOME is destined for:
      -
    • \subpage introduction_to_mesh_page
      • -
    • \subpage running_mesh_module_page
      • -
    • \subpage introduction_to_mesh_python_page
      • -
    • \subpage creating_meshes_page
      • -
        -
      • \ref about_meshes_page
        • -
      • \ref importing_exporting_meshes_page
        • -
      • \ref constructing_meshes_page
        • -
      • \ref defining_algos_page
        • -
          -
        • \ref basic_meshing_algos_page
          • -
        • \ref projection_algos_page
          • -
        • \ref radial_prism_algo_page
          • -
        • \ref segments_around_vertex_algo_page
          • -
        • \ref prism_3d_algo_page
          • -
        -
      • \ref defining_hypo_page
        • -
          -
        • \ref about_hypo_page
          • -
        • \ref a1d_meshing_hypo_page
          • -
        • \ref a2d_meshing_hypo_page
          • -
        • \ref max_element_volume_hypo_page
          • -
        • \ref netgen_2d_3d_hypo_page
          • -
        • \ref additional_hypo_page
          • -
        -
      • \ref constructing_submeshes_page
        • -
      • \ref building_compounds_page
        • -
      • \ref editing_meshes_page
        • -
      -
    • \subpage viewing_meshes_page
      • -
        -
      • \ref viewing_meshes_overview_page
        • -
      • \ref mesh_infos_page
        • -
      • \ref numbering_page
        • -
      • \ref display_mode_page
        • -
      • \ref display_entity_page
        • -
      • \ref transparency_page
        • -
      • \ref clipping_page
        • -
      -
    • \subpage quality_controls_page
      • -
        -
      • \ref about_quality_controls_page
        • -
      • \ref free_borders_page
        • -
      • \ref borders_at_multi_connection_page
        • -
      • \ref length_page
        • -
      • \ref free_edges_page
        • -
      • \ref length_2d_page
        • -
      • \ref borders_at_multi_connection_2d_page
        • -
      • \ref area_page
        • -
      • \ref taper_page
        • -
      • \ref aspect_ratio_page
        • -
      • \ref minimum_angle_page
        • -
      • \ref warping_page
        • -
      • \ref skew_page
        • -
      • \ref aspect_ratio_3d_page
        • -
      • \ref volume_page
        • -
      -
    • \subpage grouping_elements_page
      • -
        -
      • \ref creating_groups_page
        • -
      • \ref editing_groups_page
        • -
      • \ref using_operations_on_groups_page
        • -
      • \ref constructing_groups_of_specific_elements_page
        • -
      • \ref deleting_groups_page
        • -
      • \ref selection_filter_library_page
        • -
      -
    • \subpage modifying_meshes_page
      • -
        -
      • \ref adding_nodes_and_elements_page
        • -
      • \ref adding_quadratic_elements_page
        • -
      • \ref removing_nodes_and_elements_page
        • -
      • \ref renumbering_nodes_and_elements_page
        • -
      • \ref transforming_meshes_page
        • -
          -
        • \ref translation_page
          • -
        • \ref rotation_page
          • -
        • \ref symmetry_page
          • -
        • \ref sewing_meshes_page
          • -
        • \ref merging_nodes_page
          • -
        • \ref merging_elements_page
          • -
        -
      • \ref moving_nodes_page
        • -
      • \ref mesh_through_point_page
        • -
      • \ref diagonal_inversion_of_elements_page
        • -
      • \ref uniting_two_triangles_page
        • -
      • \ref uniting_set_of_triangles_page
        • -
      • \ref changing_orientation_of_elements_page
        • -
      • \ref cutting_quadrangles_page
        • -
      • \ref smoothing_page
        • -
      • \ref extrusion_page
        • -
      • \ref extrusion_along_path_page
        • -
      • \ref revolution_page
        • -
      • \ref pattern_mapping_page
        • -
      • \ref convert_to_from_quadratic_mesh_page
        • -
      -
    • \subpage smeshpy_interface_page
      • -
    • \subpage tui_scripts_page
      • -
        -
      • \ref tui_creating_meshes_page
        • -
      • \ref tui_viewing_meshes_page
        • -
      • \ref tui_defining_hypotheses_page
        • -
      • \ref tui_quality_controls_page
        • -
      • \ref tui_grouping_elements_page
        • -
      • \ref tui_modifying_meshes_page
        • -
      • \ref tui_transforming_meshes_page
        • -
      +
    • \ref importing_exporting_meshes_page "import and export of meshes in MED format";
      • +
    • \subpage about_meshes_page "meshing geometrical models" +previously created or imported by the Geometry component;
      • +
    • \subpage viewing_meshes_overview_page "viewing created meshes" in +the VTK viewer;
      • +
    • \subpage grouping_elements_page "creating groups of mesh elements";
      • +
    • applying to meshes \subpage quality_page "Quality Controls" , +allowing to highlight important elements: +
    • \subpage modifying_meshes_page "modifying meshes" with a vast +array of dedicated operations.
      • +
    • \subpage using_notebook_mesh_page.
    +Almost all mesh module functionalities are accessible via +\subpage smeshpy_interface_page "Mesh module Python interface". + +\image html image7.jpg "Example of MESH module usage for engineering tasks" + */ diff --git a/doc/salome/gui/SMESH/input/introduction_to_mesh.doc b/doc/salome/gui/SMESH/input/introduction_to_mesh.doc deleted file mode 100644 index 5b80bb158..000000000 --- a/doc/salome/gui/SMESH/input/introduction_to_mesh.doc +++ /dev/null @@ -1,64 +0,0 @@ -/*! - -\page introduction_to_mesh_page Introduction to MESH - -\n \b MESH module of SALOME is destined for: -
      -
    • \ref importing_exporting_meshes_page "import and export of meshes in MED format",
      • -
    • \ref constructing_meshes_page "meshing geometrical models" -previously created or imported by the GEOM component. MESH module -allows to apply 1D, 2D, 3D meshing algorithms and a set of hypotheses: -
        -
      • \ref arithmetic_1d_anchor "Arithmetic 1D"
        • -
      • \ref average_length_anchor "Average Length"
        • -
      • \ref deflection_1d_anchor "Deflection 1D"
        • -
      • \ref number_of_segments_anchor "Number of segments"
        • -
      • \ref start_and_end_length_anchor "Start and end length"
        • -
      • \ref automatic_length_anchor "Automatic Length"
        • -
      • \ref max_element_area_anchor "Max Element Area"
        • -
      • \ref length_from_edges_anchor "Length from Edges"
        • -
      • \ref quadrangle_preference_anchor "Quadrangle Preference"
        • -
      • \ref max_element_volume_hypo_page "Max Element Volume"
        • -
      -
      • -
    • modification of locally generated meshes by -
        -
      • \ref adding_nodes_and_elements_page "Addition" of nodes and elements
        • -
      • \ref removing_nodes_and_elements_page "Removal" of nodes and elements
        • -
      -
      • -
    • \ref creating_groups_page "grouping mesh elements" and -\ref using_operations_on_groups_page "performing operations on these groups"
      • -
    • \ref about_quality_controls_page "quality control" of meshes basing on a set of definite criteria - - -for edges: -
        -
      • \ref length_page "Length of edges"
        • -
      • \ref borders_at_multi_connection_page "Borders at multi-connection"
        • -
      • \ref free_borders_page "Free borders"
        • -
      - -for faces: -
        -
      • \ref area_page "Area"
        • -
      • \ref free_edges_page "Free edges"
        • -
      • \ref borders_at_multi_connection_2d_page "Borders at multi-connection 2D"
        • -
      • \ref length_2d_page "Length 2D"
        • -
      • \ref minimum_angle_page "Minimum angle"
        • -
      • \ref taper_page "Taper"
        • -
      • \ref aspect_ratio_page "Aspect Ratio"
        • -
      • \ref warping_page "Warping"
        • -
      • \ref skew_page "Skew"
        • -
      - -for solids: -
        -
      • \ref aspect_ratio_3d_page "Aspect ratio 3D"
        • -
      • \ref volume_page "Volume"
        • -
      -
      • -
    - -\image html image7.jpg - -*/ \ No newline at end of file diff --git a/doc/salome/gui/SMESH/input/introduction_to_mesh_python.doc b/doc/salome/gui/SMESH/input/introduction_to_mesh_python.doc deleted file mode 100644 index 2fcc329a2..000000000 --- a/doc/salome/gui/SMESH/input/introduction_to_mesh_python.doc +++ /dev/null @@ -1,77 +0,0 @@ -/*! - -\page introduction_to_mesh_python_page Introduction to MESH module python interface - -\n Package smesh provides a standard API for creation and edition of meshes. -\n Below you can see an example of usage of the package smesh for 3d mesh generation. - -

    Example of 3d mesh generation with NETGEN:

    - -\n from geompy import * -\n import smesh - -# Geometry -\n # an assembly of a box, a cylinder and a truncated cone meshed with tetrahedral. - -# Define values -\n name = "ex21_lamp" -\n cote = 60 -\n section = 20 -\n size = 200 -\n radius_1 = 80 -\n radius_2 = 40 -\n height = 100 - -# Build a box -\n box = MakeBox(-cote, -cote, -cote, +cote, +cote, +cote) - -# Build a cylinder -\n pt1 = MakeVertex(0, 0, cote/3) -\n di1 = MakeVectorDXDYDZ(0, 0, 1) -\n cyl = MakeCylinder(pt1, di1, section, size) - -# Build a truncated cone -\n pt2 = MakeVertex(0, 0, size) -\n cone = MakeCone(pt2, di1, radius_1, radius_2, height) - -# Fuse -\n box_cyl = MakeFuse(box, cyl) -\n piece = MakeFuse(box_cyl, cone) - -# Add in study -\n addToStudy(piece, name) - -# Create a group of faces -\n group = CreateGroup(piece, ShapeType["FACE"]) -\n group_name = name + "_grp" -\n addToStudy(group, group_name) -\n group.SetName(group_name) - -# Add faces in the group -\n faces = SubShapeAllIDs(piece, ShapeType["FACE"]) -\n UnionIDs(group, faces) - -# Create a mesh - -# Define a mesh on a geometry -\n tetra = smesh.Mesh(piece, name) - -# Define 1D hypothesis -\n algo1d = tetra.Segment() -\n algo1d.LocalLength(10) - -# Define 2D hypothesis -\n algo2d = tetra.Triangle() -\n algo2d.LengthFromEdges() - -# Define 3D hypothesis -\n algo3d = tetra.Tetrahedron(smesh.NETGEN) -\n algo3d.MaxElementVolume(100) - -# Compute the mesh -\n tetra.Compute() - -# Create a groupe of faces -\n tetra.Group(group) - -*/ diff --git a/doc/salome/gui/SMESH/input/length_2d.doc b/doc/salome/gui/SMESH/input/length_2d.doc index 50bab5574..def8afa95 100644 --- a/doc/salome/gui/SMESH/input/length_2d.doc +++ b/doc/salome/gui/SMESH/input/length_2d.doc @@ -13,7 +13,7 @@ of your mesh.
  • Choose Controls > Length 2D or click "Length 2D" button in the toolbar. -\image html image34.gif +\image html image34.png
    "Length 2D" button
    Your mesh will be displayed in the viewer with its elements colored according to the applied mesh quality control criterion: diff --git a/doc/salome/gui/SMESH/input/merging_elements.doc b/doc/salome/gui/SMESH/input/merging_elements.doc index fef7cd25a..821f6f9f2 100644 --- a/doc/salome/gui/SMESH/input/merging_elements.doc +++ b/doc/salome/gui/SMESH/input/merging_elements.doc @@ -5,44 +5,42 @@ \n This functionality allows to merge coincident elements of a mesh selectable in the dialog box. + +\image html mergeelems_ico.png "Merge elements button" + + \image html mergeelems.png
      -
    • \b Name is the name of the mesh whose elements will be merged.
      • -
    • \b Tolerance is a maximum distance between elements sufficient for -merging. -
        -
      • \b Detect button generates the list of coincident elements for the given -\b Tolerance.
        • +
      • \b Name is the name of the mesh whose elements will be merged.
        • +
      • \b Tolerance is a maximum distance between elements sufficient for merging. +
          +
        • \b Detect button generates the list of coincident elements for the given \b Tolerance.
          • +
        • +
      • Coincident elements is a list of groupes of elements for + merging. All elements of each group will form one after the operation. +
          +
        • \b Remove button deletes the selected group from the list.
          • +
        • \b Add button adds to the list a group of elements selected in the + viewer with pressed "Shift" key.
          • +
        • Select all checkbox selects all groups.
          • +
        • +
      • Edit selected group list allows editing the selected group: +

        + \image html add.png +
        adds to the group the element selected in the viewer.
        +
        + \image html remove.png +
        removes from the group the selected element.
        +
        + \image html sort.png +
        moves the selected element to the first position in the + group. This means that all other elements will be merged into this + one.
        +
        +
        • +
      • To confirm your choice click \b Apply or Apply and Close button.
      -
      • -
    • Coincident elements is a list of groupes of elements for -merging. All elements of each group will form one after the operation. -
        -
      • \b Remove button deletes the selected group from the list.
        • -
      • \b Add button adds to the list a group of elements selected in the -viewer with pressed "Shift" key.
        • -
      • Select all checkbox selects all groups.
        • -
      -
      • -
    • Edit selected group list allows editing the selected -group: -

      -\image html add.gif -
      adds to the group the element selected in the viewer.
      -
      -\image html remove.gif -
      removes from the group the selected element.
      -
      -\image html sort.gif -
      moves the selected element to the first position in the -group. This means that all other elements will be merged into this -one.

      -
      • -
    -
    • -
  • To confirm your choice click \b OK or \b Apply button.
    • - In this picture you see a triangle which coincides with one of the elements of the mesh. After we apply Merge Elements functionality, the @@ -50,7 +48,7 @@ triangle will be completely merged with the mesh. \image html meshtrianglemergeelem1.png -
    See Also a sample TUI Script of a -\ref tui_merging_elements "Merge Elements" operation. +
    See Also a sample TUI Script of a +\ref tui_merging_elements "Merge Elements" operation. */ diff --git a/doc/salome/gui/SMESH/input/merging_nodes.doc b/doc/salome/gui/SMESH/input/merging_nodes.doc index 7c5d62273..fb88fb89e 100644 --- a/doc/salome/gui/SMESH/input/merging_nodes.doc +++ b/doc/salome/gui/SMESH/input/merging_nodes.doc @@ -5,6 +5,8 @@ \n This functionality allows user to detect groups of coincident nodes with desirable tolerance, edit these groups and merge. +\image html mergenodes_ico.png "Merge nodes button" + To merge nodes of your mesh:
    1. From the \b Modification choose \b Transformation and from its @@ -35,25 +37,25 @@ viewer with pressed "Shift" key.
    2. Edit selected group list allows editing the selected group:

      -\image html add.gif +\image html add.png
      adds to the group the node selected in the viewer.

      -\image html remove.gif +\image html remove.png
      removes from the group the selected node.

      -\image html sort.gif +\image html sort.png
      moves the selected node to the first position in the group. This means that all other nodes will be merged into this one.

      3. -
    3. To confirm your choice click \b OK or \b Apply button.
      4. +
    4. To confirm your choice click \b Apply or Apply and Close button.
    -\image html merging_nodes1.png +\image html merging_nodes1.png "The initial obgect" -\image html merging_nodes2.png +\image html merging_nodes2.png "The object has been merged with a very big tolerance"
    See Also a sample TUI Script of a \ref tui_merging_nodes "Merge Nodes" operation. diff --git a/doc/salome/gui/SMESH/input/mesh_infos.doc b/doc/salome/gui/SMESH/input/mesh_infos.doc index 259828995..37a3deaf4 100644 --- a/doc/salome/gui/SMESH/input/mesh_infos.doc +++ b/doc/salome/gui/SMESH/input/mesh_infos.doc @@ -18,7 +18,7 @@ in the Object Browser and select Standard Mesh Infos from the \b Mesh menu or click "Standard Mesh Infos" button in the toolbar. -\image html image49.gif +\image html image49.png
    "Standard Mesh Infos" button
    The following information will be displayed: @@ -54,7 +54,9 @@ the information is displayed in Python Console.

    Mesh Element Info

    The Mesh Element Info box gives basic information about the -type and the coordinates of the selected mesh element. +type and the coordinates of the selected mesh element. +\n It is possible to input the Element ID or to select the Element in +the Viewer. \image html eleminfo1.png diff --git a/doc/salome/gui/SMESH/input/minimum_angle.doc b/doc/salome/gui/SMESH/input/minimum_angle.doc index 172374575..af631b0ec 100644 --- a/doc/salome/gui/SMESH/input/minimum_angle.doc +++ b/doc/salome/gui/SMESH/input/minimum_angle.doc @@ -12,7 +12,7 @@ element (triangle or quadrangle).
  • Choose Controls > Minimum angle or click "Minimum Angle" button. -\image html image38.gif +\image html image38.png
    "Minimum Angle" button
    Your mesh will be displayed in the viewer with its elements colored diff --git a/doc/salome/gui/SMESH/input/modifying_meshes.doc b/doc/salome/gui/SMESH/input/modifying_meshes.doc index d7e1cdb62..d3149b730 100644 --- a/doc/salome/gui/SMESH/input/modifying_meshes.doc +++ b/doc/salome/gui/SMESH/input/modifying_meshes.doc @@ -2,33 +2,49 @@ \page modifying_meshes_page Modifying meshes +Salome provides an extremely vast specter of mesh modification and +transformation operations, giving the possibility to: +
      -
    • \subpage adding_nodes_and_elements_page
      • -
    • \subpage adding_quadratic_elements_page
      • -
    • \subpage removing_nodes_and_elements_page
      • -
    • \subpage renumbering_nodes_and_elements_page
      • -
    • \subpage transforming_meshes_page
      • -
        -
      • \ref translation_page
        • -
      • \ref rotation_page
        • -
      • \ref symmetry_page
        • -
      • \ref sewing_meshes_page
        • -
      • \ref merging_nodes_page
        • -
      • \ref merging_elements_page
        • -
      -
    • \subpage moving_nodes_page
      • -
    • \subpage mesh_through_point_page
      • -
    • \subpage diagonal_inversion_of_elements_page
      • -
    • \subpage uniting_two_triangles_page
      • -
    • \subpage uniting_set_of_triangles_page
      • -
    • \subpage changing_orientation_of_elements_page
      • -
    • \subpage cutting_quadrangles_page
      • -
    • \subpage smoothing_page
      • -
    • \subpage extrusion_page
      • -
    • \subpage extrusion_along_path_page
      • -
    • \subpage revolution_page
      • -
    • \subpage pattern_mapping_page
      • -
    • \subpage convert_to_from_quadratic_mesh_page
      • +
    • \subpage adding_nodes_and_elements_page "Add" mesh elements from +nodes to polyhedrons at an arbitrary place in the mesh.
      • +
    • \subpage adding_quadratic_elements_page "Add quadratic" mesh +elements (used in quadratic meshes) from quadratic nodes to quadratic polyhedrons at an arbitrary place in the mesh.
      • +
    • \subpage removing_nodes_and_elements_page "Remove" any existing +mesh elements.
      • +
    • \subpage renumbering_nodes_and_elements_page "Renumber" nodes and +elements of the mesh.
      • +
    • \subpage translation_page "Translate" in the indicated direction the mesh or some of +its elements.
      • +
    • \subpage rotation_page "Rotate" by the indicated axis and angle +the mesh or some of its elements.
      • +
    • Create a \subpage symmetry_page "symmetrical copy" of the mesh +through a point or a vector of symmetry.
      • +
    • Unite meshes by \subpage sewing_meshes_page "sewing" free borders, +conform free borders, border to side or side elements.
      • +
    • \subpage merging_nodes_page "Merge Notes", considered coincident +within the indicated tolerance.
      • +
    • \subpage merging_elements_page "Merge Elements", considered coincident +within the indicated tolerance.
      • +
    • \subpage moving_nodes_page "Move Nodes" to an arbitrary location +with consequent transformation of all adjacent elements and edges.
      • +
    • \subpage mesh_through_point_page "Make node at a point", existing +or created anew.
      • +
    • \subpage diagonal_inversion_of_elements_page "Invert an edge" between neighboring triangles.
      • +
    • \subpage uniting_two_triangles_page "Unite two triangles".
      • +
    • \subpage uniting_set_of_triangles_page "Unite several adjacent triangles".
      • +
    • \subpage changing_orientation_of_elements_page "Change orientation" + of the selected elements.
      • +
    • \subpage cutting_quadrangles_page "Cut a quadrangle" into two triangles.
      • +
    • \subpage smoothing_page "Smooth" elements, reducung distortions in +them by adjusting the locations of element corners.
      • +
    • Create an \subpage extrusion_page "extrusion" along a vector.
      • +
    • Create an \subpage extrusion_along_path_page "extrusion along a path".
      • +
    • Create an edge or a surface by \subpage revolution_page "revolution" +of the selected node or edge.
      • +
    • Apply \subpage pattern_mapping_page "pattern mapping".
      • +
    • \subpage convert_to_from_quadratic_mesh_page "Convert regular mesh to quadratic", +or vice versa.
    */ \ No newline at end of file diff --git a/doc/salome/gui/SMESH/input/moving_nodes.doc b/doc/salome/gui/SMESH/input/moving_nodes.doc index 2c0cd795b..d44ddc249 100644 --- a/doc/salome/gui/SMESH/input/moving_nodes.doc +++ b/doc/salome/gui/SMESH/input/moving_nodes.doc @@ -11,7 +11,7 @@ after the displaced node.
  • From the \b Modification menu choose the Move node item or click "Move Node" button in the toolbar. -\image html image67.gif +\image html image67.png
    "Move Node" button
    The following dialog box shall appear: @@ -23,12 +23,12 @@ The following dialog box shall appear: select this node in the 3D viewer. The coordinates of your node will be automatically displayed in the \b Coordinates set of fields.
  • Set new coordinates for your node in the \b Coordinates set of fields.
    • -
  • Click the \b Apply or \b OK button.
    • +
  • Click the \b Apply or Apply and Close button.
    • -\image html moving_nodes1.png +\image html moving_nodes1.png "The initial mesh" -\image html moving_nodes2.png +\image html moving_nodes2.png "The node has been moved, transforming all adjacent edges"
    See Also a sample TUI Script of a \ref tui_moving_nodes "Moving Nodes" operation. diff --git a/doc/salome/gui/SMESH/input/netgen_2d_3d_hypo.doc b/doc/salome/gui/SMESH/input/netgen_2d_3d_hypo.doc index 395283ca1..f81ed2618 100644 --- a/doc/salome/gui/SMESH/input/netgen_2d_3d_hypo.doc +++ b/doc/salome/gui/SMESH/input/netgen_2d_3d_hypo.doc @@ -34,4 +34,34 @@ not possible. create regular (possessing even sides) elements. +\image html netgen3d_simple.png + +Netgen 2D simple parameters and Netgen 3D simple parameters allow defining the size of elements for each dimension. Note that Netgen algorithm does not strictly follow the input parameters. The actual mesh can be more or less dense than required.
    + +\b 1D group allows defining the size of 1D elements in either of two ways: +
      +
    • Number of Segments has the same sense as \ref +number_of_segments_anchor "Number of segments" hypothesis with +equidistant distribution.
      • +
    • Average Length has the same sense as \ref +average_length_anchor "Average Length" hypothesis.
      • +
    + +\b 2D group allows defining the size of 2D elements +
      +
    • Length from edges if checked in, acts like \ref +length_from_edges_anchor "Length from Edges" hypothesis, else
      • +
    • Max. Element Area defines the maximum element area like \ref +max_element_area_anchor "Max Element Area" hypothesis.
      • +
    + +\b 3D groups allows defining the size of 3D elements. +