From: vsr Date: Mon, 17 Nov 2014 14:08:20 +0000 (+0300) Subject: Merge branch 'master' into V7_5_BR X-Git-Tag: V7_5_0rc1~3 X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=381c06d4b74ecbc55b08a7fd1f73ff0ee419a2f7;hp=bff3771eab25def0f01abb6e18327009a932d5b8 Merge branch 'master' into V7_5_BR --- diff --git a/CMakeLists.txt b/CMakeLists.txt index a88f8c23a..0eb2d6251 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,11 +28,11 @@ CMAKE_POLICY(SET CMP0003 NEW) STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 4) -SET(${PROJECT_NAME_UC}_PATCH_VERSION 1) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 5) +SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) -SET(${PROJECT_NAME_UC}_VERSION_DEV 1) +SET(${PROJECT_NAME_UC}_VERSION_DEV 0) # Find KERNEL # =========== diff --git a/doc/salome/gui/SMESH/input/1d_meshing_hypo.doc b/doc/salome/gui/SMESH/input/1d_meshing_hypo.doc index 8c38c8ddf..6ba10611e 100644 --- a/doc/salome/gui/SMESH/input/1d_meshing_hypo.doc +++ b/doc/salome/gui/SMESH/input/1d_meshing_hypo.doc @@ -168,8 +168,8 @@ The direction of the splitting 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 by directly picking them +if the geometry object is selected for the meshing. In this case it is +possible to select edges to be reversed either by directly picking them in the 3D viewer or by selecting the edges or groups of edges in the Object Browser. @@ -212,7 +212,7 @@ integral on the range between two nodes equal for all segments. pairs t - F(t), where \b t ranges from 0 to 1, and the module computes the formula, which will rule the change of length of segments and shows in the plot the density function curve in red and the node -distribution as blue crosses. The node distribution is computed the +distribution as blue crosses. The node distribution is computed in the same way as for \ref analyticdensity_anchor "Distribution with Analytic Density". You can select the Conversion mode from\b Exponent and Cut @@ -238,10 +238,10 @@ constructed on them. The direction of the splitting 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 +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 by directly picking them +if the geometry object is selected for the meshing. In this case it is +possible to select edges to be reversed either by directly picking them in the 3D viewer or by selecting the edges or groups of edges in the Object Browser. diff --git a/doc/salome/gui/SMESH/input/constructing_meshes.doc b/doc/salome/gui/SMESH/input/constructing_meshes.doc index 5d26cae6c..2a1a0c3aa 100644 --- a/doc/salome/gui/SMESH/input/constructing_meshes.doc +++ b/doc/salome/gui/SMESH/input/constructing_meshes.doc @@ -35,7 +35,7 @@ Hexahedral, Tetrahedral, Triangular and \b Quadrilateral (there can be less items for the geometry of lower dimensions). - Selection of a mesh type hides all meshing algorithms that can not + Selection of a mesh type hides all meshing algorithms that cannot generate elements of this type.
  • Apply \subpage basic_meshing_algos_page "meshing algorithms" and @@ -160,10 +160,10 @@ List of sets of hypotheses. Tag [custom] is automatically added to the sets defined by the user. - \note \a Automatic in the names of pre-defined sets of - hypotheses means only that initially \ref - automatic_length_anchor "Automatic Length" hypothesis was - included in these sets, and not that these sets are suitable for + \note \a "Automatic" in the names of predefined sets of + hypotheses came from previous versions of SALOME where + \ref automatic_length_anchor "Automatic Length" hypothesis + was included in these sets, and not that these sets are suitable for meshing any geometry.
    • diff --git a/doc/salome/gui/SMESH/input/constructing_submeshes.doc b/doc/salome/gui/SMESH/input/constructing_submeshes.doc index 782b5662e..d88161c44 100644 --- a/doc/salome/gui/SMESH/input/constructing_submeshes.doc +++ b/doc/salome/gui/SMESH/input/constructing_submeshes.doc @@ -8,7 +8,7 @@ hypotheses assigned to the parent mesh on the parent geometrical object, that allows getting a local mesh refinement. A sub-shape to create a sub-mesh on should be retrieved from the shape -of the parent mesh one of the following ways:
  • Click the \b Apply or Apply and Close button to confirm the operation.
    • diff --git a/src/SMESHGUI/SMESH_msg_fr.ts b/src/SMESHGUI/SMESH_msg_fr.ts index 91596f776..da6ba66a9 100755 --- a/src/SMESHGUI/SMESH_msg_fr.ts +++ b/src/SMESHGUI/SMESH_msg_fr.ts @@ -398,7 +398,7 @@ MEN_CHOOSE - Choose... + Choisir... MEN_EDIT @@ -7761,7 +7761,7 @@ en raison de leurs types incompatibles: SMESHGUI_DisplayEntitiesDlg WRN_AT_LEAST_ONE - At least one entity type should be chosen! + Au moins une entité devrait être choisie!