From: prascle Date: Mon, 7 Dec 2009 16:20:46 +0000 (+0000) Subject: merge from V5_1_3rc5 X-Git-Tag: smds_memimp_V5_1_3~13 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8bc3c946fbe59d2d3920e0b677e4270bcdc375cc;p=modules%2Fsmesh.git merge from V5_1_3rc5 --- diff --git a/adm_local/unix/config_files/check_qwt.m4 b/adm_local/unix/config_files/check_qwt.m4 index 7fde4754c..736c5b5c8 100644 --- a/adm_local/unix/config_files/check_qwt.m4 +++ b/adm_local/unix/config_files/check_qwt.m4 @@ -44,15 +44,25 @@ AC_ARG_WITH(qwt_inc, AC_MSG_RESULT("select $withval as path to QWT includes") ]) +libqwt_name=qwt if test -z $QWTHOME; then AC_MSG_RESULT(QWTHOME not defined) + AC_MSG_NOTICE(Trying native Qwt...) exist_ok=no if test "x$exist_ok" = "xno"; then - for d in /usr/local /usr ; do - AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so,exist_ok=yes,exist_ok=no) + for d in /usr /usr/local ; do + for extension in qwt-qt4 qwt; do + AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/lib${extension}.so,exist_ok=yes,exist_ok=no) + if test "x$exist_ok" = "xyes"; then + QWTHOME=$d + AC_MSG_RESULT(lib${extension}.so detected in $d/lib) + libqwt_name=${extension} + dnl break, libqwt-qt4.so is choosen before libqwt.so since it is surely the Qt4 version. + break + fi + done if test "x$exist_ok" = "xyes"; then - QWTHOME=$d - AC_MSG_RESULT(libqwt.so detected in $d/lib) + break fi done fi @@ -69,7 +79,10 @@ if test -z $QWTHOME; then fi if test "x$exist_ok" = "xyes"; then if test -z $QWT_INCDIR; then - QWT_INCDIR=$QWTHOME"/include/qwt" + QWT_INCDIR=$QWTHOME"/include/qwt-qt4" + if test ! -f $QWT_INCDIR/qwt.h ; then + QWT_INCDIR=/usr/include/qwt + fi if test ! -f $QWT_INCDIR/qwt.h ; then QWT_INCDIR=$QWTHOME"/include" fi @@ -84,6 +97,7 @@ if test -z $QWTHOME; then qwt_ok=no fi else + AC_MSG_NOTICE(Trying Qwt from $QWTHOME ...) if test -z $QWT_INCDIR; then QWT_INCDIR="$QWTHOME/include" fi @@ -119,9 +133,9 @@ else LIBS_old=$LIBS LIBS="$LIBS $QT_LIBS" if test "x$QWTHOME" = "x/usr" ; then - LIBS="$LIBS -lqwt" + LIBS="$LIBS -l${libqwt_name}" else - LIBS="$LIBS -L$QWTHOME/lib -lqwt" + LIBS="$LIBS -L$QWTHOME/lib -l${libqwt_name}" fi CXXFLAGS_old=$CXXFLAGS @@ -148,9 +162,9 @@ else else AC_MSG_RESULT(yes) if test "x$QWTHOME" = "x/usr" ; then - QWT_LIBS=" -lqwt" + QWT_LIBS=" -l${libqwt_name}" else - QWT_LIBS="-L$QWTHOME/lib -lqwt" + QWT_LIBS="-L$QWTHOME/lib -l${libqwt_name}" fi fi diff --git a/bin/smesh_setenv.py b/bin/smesh_setenv.py index b3240bfa2..a25e5180b 100644 --- a/bin/smesh_setenv.py +++ b/bin/smesh_setenv.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, diff --git a/configure.ac b/configure.ac index 59e035781..7f5e389b6 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ # Modified by : Alexander BORODIN (OCN) - autotools usage # Created from configure.in.base # -AC_INIT([Salome2 Project SMESH module], [5.1.2], [webmaster.salome@opencascade.com], [SalomeSMESH]) +AC_INIT([Salome2 Project SMESH module], [5.1.3], [webmaster.salome@opencascade.com], [SalomeSMESH]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -87,7 +87,7 @@ dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairie echo echo --------------------------------------------- -echo Coniguring production +echo Configuring production echo --------------------------------------------- echo AC_ENABLE_DEBUG(yes) diff --git a/doc/salome/gui/SMESH/images/2d_from_3d_menu.png b/doc/salome/gui/SMESH/images/2d_from_3d_menu.png new file mode 100644 index 000000000..ec5117214 Binary files /dev/null and b/doc/salome/gui/SMESH/images/2d_from_3d_menu.png differ diff --git a/doc/salome/gui/SMESH/images/blsurf_parameters.png b/doc/salome/gui/SMESH/images/blsurf_parameters.png index cfafbc481..7988a9c85 100644 Binary files a/doc/salome/gui/SMESH/images/blsurf_parameters.png 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 index d29ecc497..d317ced16 100644 Binary files a/doc/salome/gui/SMESH/images/blsurf_parameters_advanced.png and b/doc/salome/gui/SMESH/images/blsurf_parameters_advanced.png differ diff --git a/doc/salome/gui/SMESH/images/blsurf_parameters_enforced_vertices.png b/doc/salome/gui/SMESH/images/blsurf_parameters_enforced_vertices.png new file mode 100644 index 000000000..e55dec36b Binary files /dev/null and b/doc/salome/gui/SMESH/images/blsurf_parameters_enforced_vertices.png differ diff --git a/doc/salome/gui/SMESH/images/blsurf_parameters_sizemap.png b/doc/salome/gui/SMESH/images/blsurf_parameters_sizemap.png index 0d87e6608..2b3819759 100644 Binary files a/doc/salome/gui/SMESH/images/blsurf_parameters_sizemap.png and b/doc/salome/gui/SMESH/images/blsurf_parameters_sizemap.png differ diff --git a/doc/salome/gui/SMESH/images/ghs3d_enforced_vertices.png b/doc/salome/gui/SMESH/images/ghs3d_enforced_vertices.png new file mode 100644 index 000000000..c47174396 Binary files /dev/null and b/doc/salome/gui/SMESH/images/ghs3d_enforced_vertices.png differ diff --git a/doc/salome/gui/SMESH/images/ghs3d_enforced_vertices_screenshot.png b/doc/salome/gui/SMESH/images/ghs3d_enforced_vertices_screenshot.png new file mode 100644 index 000000000..fc885700f Binary files /dev/null and b/doc/salome/gui/SMESH/images/ghs3d_enforced_vertices_screenshot.png differ diff --git a/doc/salome/gui/SMESH/images/ghs3d_parameters_advanced.png b/doc/salome/gui/SMESH/images/ghs3d_parameters_advanced.png index 4f36203ba..1d6b7c7a2 100644 Binary files a/doc/salome/gui/SMESH/images/ghs3d_parameters_advanced.png 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 index 0cce50bb8..cd92b45fc 100644 Binary files a/doc/salome/gui/SMESH/images/ghs3d_parameters_basic.png and b/doc/salome/gui/SMESH/images/ghs3d_parameters_basic.png differ diff --git a/doc/salome/gui/SMESH/images/hypo_quad_params_2.png b/doc/salome/gui/SMESH/images/hypo_quad_params_2.png new file mode 100644 index 000000000..9f6fa251e Binary files /dev/null and b/doc/salome/gui/SMESH/images/hypo_quad_params_2.png differ diff --git a/doc/salome/gui/SMESH/images/hypo_quad_params_res_2.png b/doc/salome/gui/SMESH/images/hypo_quad_params_res_2.png new file mode 100644 index 000000000..6dc37e298 Binary files /dev/null and b/doc/salome/gui/SMESH/images/hypo_quad_params_res_2.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 c61d388a5..aba2b6598 100644 --- a/doc/salome/gui/SMESH/input/1d_meshing_hypo.doc +++ b/doc/salome/gui/SMESH/input/1d_meshing_hypo.doc @@ -199,31 +199,27 @@ minimum and maximum value of this parameter. \anchor fixed_points_1d_anchor

Fixed points 1D hypothesis

-Fixed points 1D hypothesis allows to split edges into segments -using set of fixed points given by normalized parameters on edge and -set of numbers of segments for splitting each sub-segment between -fixed points. Optionally it is possible to set flag -Same Nb. Segments for all intervals and -only one value for mentioned number of segments. - -The direction of the splitting is defined by the orientation of the +Fixed points 1D hypothesis allows splitting edges through a +set of points parameterized on the edge (from 1 to 0) and a number of segments for each +interval limited by the points. + +\image html hypo_fixedpnt_dlg.png + +It is possible to check in Same Nb. Segments for all intervals +option and to define one value for all intervals. + +The splitting direction is defined by the orientation of the underlying geometrical edge. "Reverse Edges" list box allows to specify the edges for which the splitting should be made in the -direction opposing to their orientation. This list box is enabled only -if the geometry object is selected for the meshing. In this case the -user can select edges to be reversed either directly picking them in -the 3D viewer or by selecting the edges or groups of edges in the +direction opposite to their orientation. This list box is enabled only +if the geometrical object is selected for meshing. In this case it is +possible to select the edges to be reversed either directly picking them in +the 3D viewer or selecting the edges or groups of edges in the Object browser. -Using of this hypothesis for quadrangle face where main mesh is -created using Quadrangle(Mapping) and NumberOfSegments -hypothesises. Creation hypothesis FixedPoint_1D for submesh on -one edge: +\image html mesh_fixedpnt.png "Example of a submesh on the edge built using Fixed points 1D hypothesis" -\image html hypo_fixedpnt_dlg.png - -Resulting 2D mesh: - -\image html mesh_fixedpnt.png +See Also a sample TUI Script of a +\ref tui_fixed_points "Defining Fixed Points" hypothesis operation. */ diff --git a/doc/salome/gui/SMESH/input/2d_meshing_hypo.doc b/doc/salome/gui/SMESH/input/2d_meshing_hypo.doc index c912c568f..dd42e9962 100644 --- a/doc/salome/gui/SMESH/input/2d_meshing_hypo.doc +++ b/doc/salome/gui/SMESH/input/2d_meshing_hypo.doc @@ -23,6 +23,8 @@ which will compose the mesh of these 2D faces. \image html a-maxelarea.png +\n + \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 @@ -52,6 +54,18 @@ used as a degenerated edge. \image html hypo_quad_params_res.png "The resulting mesh" +This hypothesis can be also used to mesh a segment of a circular face. +Please, consider that there is a limitation on the selectiion of the degenerated +vertex for the faces built with the angle > 180 degrees (see the picture). + +\image html hypo_quad_params_2.png "3/4 of a circular face" + +In this case, selection of a wrong vertex for the Quadrangle parameters +hypothesis will generate a wrong mesh. The picture below +shows the good (left) and the bad (right) results of meshing. + +\image html hypo_quad_params_res_2.png "The resulting meshes" +
\anchor quadrangle_preference_anchor

Quadrangle Preference

diff --git a/doc/salome/gui/SMESH/input/about_hypo.doc b/doc/salome/gui/SMESH/input/about_hypo.doc index 578823bd6..cc8f5fd52 100644 --- a/doc/salome/gui/SMESH/input/about_hypo.doc +++ b/doc/salome/gui/SMESH/input/about_hypo.doc @@ -28,6 +28,7 @@ them, you operate numerical values): diff --git a/doc/salome/gui/SMESH/input/about_meshes.doc b/doc/salome/gui/SMESH/input/about_meshes.doc index 84e84cdcf..8a81c7ea0 100644 --- a/doc/salome/gui/SMESH/input/about_meshes.doc +++ b/doc/salome/gui/SMESH/input/about_meshes.doc @@ -26,6 +26,7 @@ entities including: -\Note that BLSURF and GHS3D are commercial meshers and require a +\note 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: @@ -56,8 +56,7 @@ There is also a number of more specific algorithms:
  • \subpage radial_prism_algo_page "for meshing geometrical objects with cavities"
  • \subpage segments_around_vertex_algo_page "for defining the local size of elements around a certain node"
  • \subpage prism_3d_algo_page "for meshing prismatic shapes"
    • -
  • \subpage radial_quadrangle_1D2D_algo_page "for meshing special 2d -faces (circles and part of circles)"
    • +
  • \subpage radial_quadrangle_1D2D_algo_page "for meshing special 2d faces (circles and part of circles)"
    • \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 index ecbd5a74f..03c0fc594 100644 --- a/doc/salome/gui/SMESH/input/blsurf_hypo.doc +++ b/doc/salome/gui/SMESH/input/blsurf_hypo.doc @@ -5,6 +5,8 @@ \n BLSURF Parameters hypothesis works only with BLSURF 2d algorithm. This algorithm is a commercial software. +

    General parameters

    + \image html blsurf_parameters.png