Merge branch 'master' into pre/medCompatibility

diff --git a/doc/salome/examples/creating_meshes_ex08.py b/doc/salome/examples/creating_meshes_ex08.py
index 7fa7a7dcffc3161a293aa5e6a3624c2c5608166e..ff41f09c65ab6f8a2ef59520cb88bf62a07c40fa 100644 (file)
--- a/doc/salome/examples/creating_meshes_ex08.py
+++ b/doc/salome/examples/creating_meshes_ex08.py
@@ -15,9 +15,12 @@ box = geompy.MakeBoxDXDYDZ(100,100,100)
 face = geompy.SubShapeAllSorted(box, geompy.ShapeType["FACE"])[0]
 
 # generate a prismatic 3D mesh
-mesh = smesh.Mesh(box)
+mesh = smesh.Mesh(box, "box")
 localAlgo = mesh.Triangle(face)
-mesh.AutomaticHexahedralization()
+mesh.Segment().NumberOfSegments( 3 )
+mesh.Quadrangle()
+mesh.Prism()
+mesh.Compute()
 
 # objects to copy
 fGroup = mesh.GroupOnGeom( face, "2D on face")
@@ -45,3 +48,12 @@ newMesh = smesh.CopyMesh( mesh.GetIDSource( nodeIds, SMESH.NODE), "some nodes co
 
 # 6. copy a sub-mesh
 newMesh = smesh.CopyMesh( subMesh, "sub-mesh copy" )
+
+
+# make a new mesh with same hypotheses on a modified geometry
+
+smallBox = geompy.MakeScaleAlongAxes( box, None, 1, 0.5, 0.5 )
+cutBox = geompy.MakeCut( box, smallBox, theName="box - smallBox" )
+
+ok, newMesh, groups, submehses, hyps, invIDs = smesh.CopyMeshWithGeom( mesh, cutBox, "cutBox" )
+newMesh.Compute()

diff --git a/doc/salome/gui/SMESH/input/smeshpy_interface.rst b/doc/salome/gui/SMESH/input/smeshpy_interface.rst
index ce80d7411d90c8e4871ad583682fedb4d592c9f5..922a1e2b785495704861ac64c72d1c5556b56ee0 100644 (file)
--- a/doc/salome/gui/SMESH/input/smeshpy_interface.rst
+++ b/doc/salome/gui/SMESH/input/smeshpy_interface.rst
@@ -29,7 +29,6 @@ A usual workflow to generate a mesh on geometry is following:
 
 #. Create an instance of :class:`smeshBuilder.smeshBuilder`:
        .. code-block:: python
-               :linenos:
 
                from salome.smesh import smeshBuilder
                smesh = smeshBuilder.New()
@@ -37,13 +36,11 @@ A usual workflow to generate a mesh on geometry is following:
 #. Create a :class:`smeshBuilder.Mesh` object:
 
        .. code-block:: python
-               :linenos:
 
                mesh = smesh.Mesh( geometry )
 
 #. Create and assign :ref:`algorithms <basic_meshing_algos_page>` by calling corresponding methods of the mesh. If a sub-shape is provided as an argument, a :ref:`sub-mesh <constructing_submeshes_page>` is implicitly created on this sub-shape:
        .. code-block:: python
-               :linenos:
 
                regular1D = mesh.Segment()
                mefisto   = mesh.Triangle( smeshBuilder.MEFISTO )
@@ -52,7 +49,6 @@ A usual workflow to generate a mesh on geometry is following:
 
 #. Create and assign :ref:`hypotheses <about_hypo_page>` by calling corresponding methods of algorithms:
        .. code-block:: python
-               :linenos:
 
                segLen10 = regular1D.LocalLength( 10. )
                maxArea  = mefisto.LocalLength( 100. )
@@ -61,7 +57,6 @@ A usual workflow to generate a mesh on geometry is following:
   
 #. :ref:`compute_anchor` the mesh (generate mesh nodes and elements):
        .. code-block:: python
-               :linenos:
 
                mesh.Compute()
 
@@ -82,7 +77,6 @@ Example of 3d mesh generation:
 ##############################
 
 .. literalinclude:: ../../../examples/3dmesh.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/3dmesh.py>`

diff --git a/doc/salome/gui/SMESH/input/tui_creating_meshes.rst b/doc/salome/gui/SMESH/input/tui_creating_meshes.rst
index 46b4f9ff410caf5124db80619315ac322590fc2c..d4c1c8f9af48509a70d8108396c75b71842d175b 100644 (file)
--- a/doc/salome/gui/SMESH/input/tui_creating_meshes.rst
+++ b/doc/salome/gui/SMESH/input/tui_creating_meshes.rst
@@ -16,7 +16,6 @@ Construction of a mesh
 ======================
 
 .. literalinclude:: ../../../examples/creating_meshes_ex01.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/creating_meshes_ex01.py>`
@@ -27,7 +26,6 @@ Construction of a sub-mesh
 ==========================
 
 .. literalinclude:: ../../../examples/creating_meshes_ex02.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/creating_meshes_ex02.py>`
@@ -38,7 +36,6 @@ Change priority of sub-meshes in mesh
 =====================================
 
 .. literalinclude:: ../../../examples/creating_meshes_ex03.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/creating_meshes_ex03.py>`
@@ -49,7 +46,6 @@ Intermediate edition while meshing
 ==================================
 
 .. literalinclude:: ../../../examples/a3DmeshOnModified2Dmesh.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/a3DmeshOnModified2Dmesh.py>`
@@ -60,7 +56,6 @@ Editing a mesh (i.e. changing hypotheses)
 =========================================
 
 .. literalinclude:: ../../../examples/creating_meshes_ex04.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/creating_meshes_ex04.py>`
@@ -71,7 +66,6 @@ Export of a Mesh
 ================
 
 .. literalinclude:: ../../../examples/creating_meshes_ex05.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/creating_meshes_ex05.py>`
@@ -85,7 +79,6 @@ The next script creates a hexahedral mesh on a cylinder. A picture below the scr
 demonstrates the resulting mesh.
 
 .. literalinclude:: ../../../examples/creating_meshes_ex06.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/creating_meshes_ex06.py>`
@@ -100,7 +93,6 @@ Building a compound of meshes
 =============================
 
 .. literalinclude:: ../../../examples/creating_meshes_ex07.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/creating_meshes_ex07.py>`
@@ -111,7 +103,6 @@ Mesh Copying
 ============
 
 .. literalinclude:: ../../../examples/creating_meshes_ex08.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/creating_meshes_ex08.py>`

diff --git a/doc/salome/gui/SMESH/input/tui_defining_hypotheses.rst b/doc/salome/gui/SMESH/input/tui_defining_hypotheses.rst
index c839e94b9750a478d8284bd934005dbcc9b77301..facc0fdc13cc2c1bdde740ba7299a4cecb589f3b 100644 (file)
--- a/doc/salome/gui/SMESH/input/tui_defining_hypotheses.rst
+++ b/doc/salome/gui/SMESH/input/tui_defining_hypotheses.rst
@@ -53,7 +53,6 @@ Arithmetic Progression and Geometric Progression
 ================================================
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex01.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex01.py>`
@@ -64,7 +63,6 @@ Adaptive
 ========
 
 .. literalinclude:: ../../../examples/defining_hypotheses_adaptive1d.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_adaptive1d.py>`
@@ -76,7 +74,6 @@ Deflection and Number of Segments
 =================================
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex02.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex02.py>`
@@ -88,7 +85,6 @@ Start and End Length
 ====================
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex03.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex03.py>`
@@ -100,7 +96,6 @@ Local Length
 ============
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex04.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex04.py>`
@@ -115,7 +110,6 @@ Maximum Element Area
 ====================
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex05.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex05.py>`
@@ -127,7 +121,6 @@ Maximum Element Volume
 ======================
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex06.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex06.py>`
@@ -139,7 +132,6 @@ Length from Edges
 =================
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex07.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex07.py>`
@@ -153,7 +145,6 @@ Propagation
 ===========
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex08.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex08.py>`
@@ -165,7 +156,6 @@ Defining Meshing Algorithms
 ###########################
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex09.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex09.py>`
@@ -177,7 +167,6 @@ Projection Algorithms
 =====================
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex10.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex10.py>`
@@ -186,7 +175,6 @@ Projection 1D2D
 ===============
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex11.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex11.py>`
@@ -197,7 +185,6 @@ Projection 1D2D
 #################################
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex12.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex12.py>`
@@ -208,7 +195,6 @@ Radial Quadrangle 1D-2D example
 ###############################
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex13.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex13.py>`
@@ -219,7 +205,6 @@ Quadrangle Parameters example 1 (meshing a face with 3 edges)
 ##############################################################
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex14.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex14.py>`
@@ -228,7 +213,6 @@ Quadrangle Parameters example 2 (using different types)
 #######################################################
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex15.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex15.py>`
@@ -239,7 +223,6 @@ Quadrangle Parameters example 2 (using different types)
 #################################################
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex16.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex16.py>`
@@ -250,7 +233,6 @@ Viscous layers construction
 ###########################
 
 .. literalinclude:: ../../../examples/defining_hypotheses_ex17.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_ex17.py>`
@@ -261,7 +243,6 @@ Radial Prism example
 ####################
 
 .. literalinclude:: ../../../examples/radial_prism_3d_algo.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/radial_prism_3d_algo.py>`
@@ -272,7 +253,6 @@ Usage of Body Fitting algorithm
 ###############################
 
 .. literalinclude:: ../../../examples/cartesian_algo.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/cartesian_algo.py>`
@@ -287,7 +267,6 @@ which is actually just a stub allowing to use your own 2D algorithm
 implemented in Python.
 
 .. literalinclude:: ../../../examples/use_existing_faces.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/use_existing_faces.py>`
@@ -304,7 +283,6 @@ Usage of Extrusion 3D meshing algorithm
 ########################################
 
 .. literalinclude:: ../../../examples/prism_3d_algo.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/prism_3d_algo.py>`
@@ -321,7 +299,6 @@ Usage of Medial Axis Projection algorithm
 #########################################
 
 .. literalinclude:: ../../../examples/quad_medial_axis_algo.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quad_medial_axis_algo.py>`
@@ -333,7 +310,6 @@ Usage of Segments around Vertex algorithm
 #########################################
 
 .. literalinclude:: ../../../examples/defining_hypotheses_len_near_vertex.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/defining_hypotheses_len_near_vertex.py>`

diff --git a/doc/salome/gui/SMESH/input/tui_filters.rst b/doc/salome/gui/SMESH/input/tui_filters.rst
index 1e64974d91e685e39bdae0ad5d4161f596933f84..35ecd8c70f10bb7b6a88829b4df3b341952453c5 100644 (file)
--- a/doc/salome/gui/SMESH/input/tui_filters.rst
+++ b/doc/salome/gui/SMESH/input/tui_filters.rst
@@ -37,7 +37,6 @@ filters 2D mesh elements (faces) according to the aspect ratio value:
 * threshold is floating point value (aspect ratio)
 
 .. literalinclude:: ../../../examples/filters_ex01.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex01.py>`
@@ -56,7 +55,6 @@ filters 3D mesh elements (volumes) according to the aspect ratio value:
 * threshold is floating point value (aspect ratio)
 
 .. literalinclude:: ../../../examples/filters_ex02.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex02.py>`
@@ -75,7 +73,6 @@ filters 2D mesh elements (faces) according to the warping angle value:
 * threshold is floating point value (warping angle)
 
 .. literalinclude:: ../../../examples/filters_ex03.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex03.py>`
@@ -94,7 +91,6 @@ filters 2D mesh elements (faces) according to the minimum angle value:
 * threshold is floating point value (minimum angle)
 
 .. literalinclude:: ../../../examples/filters_ex04.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex04.py>`
@@ -113,7 +109,6 @@ filters 2D mesh elements (faces) according to the taper value:
 * threshold is floating point value (taper)
 
 .. literalinclude:: ../../../examples/filters_ex05.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex05.py>`
@@ -132,7 +127,6 @@ filters 2D mesh elements (faces) according to the skew value:
 * threshold is floating point value (skew)
 
 .. literalinclude:: ../../../examples/filters_ex06.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex06.py>`
@@ -151,7 +145,6 @@ filters 2D mesh elements (faces) according to the area value:
 * threshold is floating point value (area)
 
 .. literalinclude:: ../../../examples/filters_ex07.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex07.py>`
@@ -170,7 +163,6 @@ filters 3D mesh elements (volumes) according to the volume value:
 * threshold is floating point value (volume)
 
 .. literalinclude:: ../../../examples/filters_ex08.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex08.py>`
@@ -189,7 +181,6 @@ filters 1D mesh elements (edges) which represent free borders of a mesh:
 * threshold value is not required
 
 .. literalinclude:: ../../../examples/filters_ex09.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex09.py>`
@@ -209,7 +200,6 @@ nodes, not mesh segments) belonging to one face of mesh only:
 * threshold value is not required
 
 .. literalinclude:: ../../../examples/filters_ex10.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex10.py>`
@@ -228,7 +218,6 @@ filters free nodes:
 * threshold value is not required
 
 .. literalinclude:: ../../../examples/filters_ex11.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex11.py>`
@@ -247,7 +236,6 @@ filters free faces:
 * threshold value is not required
 
 .. literalinclude:: ../../../examples/filters_ex12.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex12.py>`
@@ -266,7 +254,6 @@ filters faces with bare borders:
 * threshold value is not required
 
 .. literalinclude:: ../../../examples/filters_ex13.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex13.py>`
@@ -286,7 +273,6 @@ filters coplanar faces:
 * tolerance is in degrees
 
 .. literalinclude:: ../../../examples/filters_ex14.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex14.py>`
@@ -303,7 +289,6 @@ filters over-constrained faces:
 * threshold value is not required
 
 .. literalinclude:: ../../../examples/filters_ex15.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex15.py>`
@@ -322,7 +307,6 @@ filters mesh elements basing on the same set of nodes:
 * threshold value is not required
 
 .. literalinclude:: ../../../examples/filters_ex16.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex16.py>`
@@ -340,7 +324,6 @@ filters mesh nodes which are coincident with other nodes (within a given toleran
 * default tolerance is 1.0e-7
 
 .. literalinclude:: ../../../examples/filters_ex17.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex17.py>`
@@ -357,7 +340,6 @@ filters nodes according to a number of elements of highest dimension connected t
 * threshold is an integer value (number of elements)
 
 .. literalinclude:: ../../../examples/filters_node_nb_conn.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_node_nb_conn.py>`
@@ -375,7 +357,6 @@ connections (faces and volumes on whose border the segment lies):
 * threshold is integer value (number of connections)
 
 .. literalinclude:: ../../../examples/filters_ex18.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex18.py>`
@@ -395,7 +376,6 @@ faces connected to a border (link between nodes, not mesh segment):
 * threshold is integer value (number of connections)
 
 .. literalinclude:: ../../../examples/filters_ex19.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex19.py>`
@@ -414,7 +394,6 @@ filters 1D mesh elements (edges) according to the edge length value:
 * threshold is floating point value (length)
 
 .. literalinclude:: ../../../examples/filters_ex20.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex20.py>`
@@ -434,7 +413,6 @@ edges (links between nodes):
 * threshold is floating point value (edge length)
 
 .. literalinclude:: ../../../examples/filters_ex21.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex21.py>`
@@ -454,7 +432,6 @@ of its edges and diagonals:
 * threshold is floating point value (length)
 
 .. literalinclude:: ../../../examples/filters_ex22.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex22.py>`
@@ -474,7 +451,6 @@ of its edges and diagonals:
 * threshold is floating point value (edge/diagonal length)
 
 .. literalinclude:: ../../../examples/filters_ex23.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex23.py>`
@@ -494,7 +470,6 @@ shared with other volumes and without a face on it:
 * threshold value is not required
 
 .. literalinclude:: ../../../examples/filters_ex24.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex24.py>`
@@ -513,7 +488,6 @@ filters over-constrained volumes, whose all nodes are on the mesh boundary:
 * threshold value is not required
 
 .. literalinclude:: ../../../examples/filters_ex25.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex25.py>`
@@ -533,7 +507,6 @@ defined by threshold value:
 * threshold is mesh group object
 
 .. literalinclude:: ../../../examples/filters_belong2group.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_belong2group.py>`
@@ -552,7 +525,6 @@ shape defined by threshold value:
 * tolerance is a distance between a node and the geometrical object; it is used if an node is not associated to any geometry.
 
 .. literalinclude:: ../../../examples/filters_ex26.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex26.py>`
@@ -573,7 +545,6 @@ shape defined by threshold value:
 it is used if an node is not associated to any geometry.
 
 .. literalinclude:: ../../../examples/filters_ex27.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex27.py>`
@@ -592,7 +563,6 @@ plane defined by threshold value with the given tolerance:
 * default tolerance is 1.0e-7
 
 .. literalinclude:: ../../../examples/filters_ex28.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex28.py>`
@@ -611,7 +581,6 @@ cylindrical face defined by threshold value with the given tolerance:
 * default tolerance is 1.0e-7
 
 .. literalinclude:: ../../../examples/filters_ex29.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex29.py>`
@@ -630,7 +599,6 @@ arbitrary surface defined by threshold value with the given tolerance:
 * default tolerance is 1.0e-7
 
 .. literalinclude:: ../../../examples/filters_ex30.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex30.py>`
@@ -648,7 +616,6 @@ specified identifiers range:
 * threshold is string listing required IDs and/or ranges of IDs, e.g."1,2,3,50-60,63,67,70-78"
 
 .. literalinclude:: ../../../examples/filters_ex31.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex31.py>`
@@ -666,7 +633,6 @@ the point of view of MED convention.
 * threshold is not required
 
 .. literalinclude:: ../../../examples/filters_ex32.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex32.py>`
@@ -684,7 +650,6 @@ filters linear / quadratic mesh elements:
 * if unary operator is set to SMESH.FT_LogicalNOT, the quadratic elements are selected, otherwise (by default) linear elements are selected
 
 .. literalinclude:: ../../../examples/filters_ex33.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex33.py>`
@@ -701,7 +666,6 @@ filters mesh entities, belonging to the group with the color defined by the thre
 * threshold should be of SALOMEDS.Color type
 
 .. literalinclude:: ../../../examples/filters_ex34.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex34.py>`
@@ -720,7 +684,6 @@ entity type.
 * threshold is either of smesh.GeometryType values. Type *SMESH.GeometryType._items* in the Python Console to see all geometric types.
 
 .. literalinclude:: ../../../examples/filters_ex35.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex35.py>`
@@ -737,7 +700,6 @@ filters mesh elements by the geometric type and number of nodes.
 * threshold is either of SMESH.EntityType values. Type *SMESH.EntityType._items* in the Python Console to see all entity types.
 
 .. literalinclude:: ../../../examples/filters_ex37.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex37.py>`
@@ -754,7 +716,6 @@ filters ball elements by diameter.
 * threshold is floating point value (ball diameter)
 
 .. literalinclude:: ../../../examples/filters_ex38.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex38.py>`
@@ -771,7 +732,6 @@ filters elements of a specified domain.
 * threshold is either (1) node ID or (2)  geometrical vertex or (3) 3 coordinates of a point.
 
 .. literalinclude:: ../../../examples/filters_ex39.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex39.py>`
@@ -784,7 +744,6 @@ How to combine several criteria into a filter?
 Several criteria can be combined into a filter.
 
 .. literalinclude:: ../../../examples/filters_ex36.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/filters_ex36.py>`

diff --git a/doc/salome/gui/SMESH/input/tui_grouping_elements.rst b/doc/salome/gui/SMESH/input/tui_grouping_elements.rst
index 1f4dffe2ec54d1a3e79f4c1003d2edcefeba848d..45e8dcdbfd2bc0328ccea65a17f7183b8aa510b4 100644 (file)
--- a/doc/salome/gui/SMESH/input/tui_grouping_elements.rst
+++ b/doc/salome/gui/SMESH/input/tui_grouping_elements.rst
@@ -13,7 +13,6 @@ Create a Standalone Group
 =========================
 
 .. literalinclude:: ../../../examples/grouping_elements_ex01.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/grouping_elements_ex01.py>`
@@ -28,7 +27,6 @@ Create a Group on Geometry
 ==========================
 
 .. literalinclude:: ../../../examples/grouping_elements_ex02.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/grouping_elements_ex02.py>`
@@ -39,7 +37,6 @@ Create a Group on Filter
 ========================
 
 .. literalinclude:: ../../../examples/grouping_elements_ex03.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/grouping_elements_ex03.py>`
@@ -50,7 +47,6 @@ Edit a Group
 ============
 
 .. literalinclude:: ../../../examples/grouping_elements_ex04.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/grouping_elements_ex04.py>`
@@ -65,7 +61,6 @@ Union of groups
 ===============
 
 .. literalinclude:: ../../../examples/grouping_elements_ex05.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/grouping_elements_ex05.py>`
@@ -80,7 +75,6 @@ Intersection of groups
 ======================
 
 .. literalinclude:: ../../../examples/grouping_elements_ex06.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/grouping_elements_ex06.py>`
@@ -95,7 +89,6 @@ Cut of groups
 =============
 
 .. literalinclude:: ../../../examples/grouping_elements_ex07.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/grouping_elements_ex07.py>`
@@ -110,7 +103,6 @@ Creating groups of entities basing on nodes of other groups
 ===========================================================
 
 .. literalinclude:: ../../../examples/grouping_elements_ex08.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/grouping_elements_ex08.py>`

diff --git a/doc/salome/gui/SMESH/input/tui_measurements.rst b/doc/salome/gui/SMESH/input/tui_measurements.rst
index 06eb255b0e700e3d2626419968e3f5eada310c97..b3f5964509e71cf5f6b01459561bd69add74bf4a 100644 (file)
--- a/doc/salome/gui/SMESH/input/tui_measurements.rst
+++ b/doc/salome/gui/SMESH/input/tui_measurements.rst
@@ -10,7 +10,6 @@ Minimum Distance
 ================
 
 .. literalinclude:: ../../../examples/measurements_ex01.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/measurements_ex01.py>`
@@ -21,7 +20,6 @@ Bounding Box
 ============
 
 .. literalinclude:: ../../../examples/measurements_ex02.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/measurements_ex02.py>`
@@ -32,7 +30,6 @@ Basic Properties
 ================
 
 .. literalinclude:: ../../../examples/measurements_ex03.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/measurements_ex03.py>`

diff --git a/doc/salome/gui/SMESH/input/tui_modifying_meshes.rst b/doc/salome/gui/SMESH/input/tui_modifying_meshes.rst
index e90ba372608a56474e39ece39fe757672fc8b3e6..0981dd7af4975f30cbb3611700e04a319b239fe6 100644 (file)
--- a/doc/salome/gui/SMESH/input/tui_modifying_meshes.rst
+++ b/doc/salome/gui/SMESH/input/tui_modifying_meshes.rst
@@ -18,7 +18,6 @@ Add Node
 ********
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex01.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex01.py>`
@@ -29,7 +28,6 @@ Add 0D Element
 **************
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex02.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex02.py>`
@@ -40,7 +38,6 @@ Add 0D Element on Element Nodes
 *******************************
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex03.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex03.py>`
@@ -51,7 +48,6 @@ Add Edge
 ********
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex04.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex04.py>`
@@ -62,7 +58,6 @@ Add Triangle
 ************
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex05.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex05.py>`
@@ -73,7 +68,6 @@ Add Quadrangle
 **************
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex06.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex06.py>`
@@ -84,7 +78,6 @@ Add Tetrahedron
 ***************
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex07.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex07.py>`
@@ -95,7 +88,6 @@ Add Hexahedron
 **************
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex08.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex08.py>`
@@ -106,7 +98,6 @@ Add Polygon
 ***********
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex09.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex09.py>`
@@ -117,7 +108,6 @@ Add Polyhedron
 **************
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex10.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex10.py>`
@@ -133,7 +123,6 @@ Removing Nodes
 **************
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex11.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex11.py>`
@@ -144,7 +133,6 @@ Removing Elements
 *****************
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex12.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex12.py>`
@@ -155,7 +143,6 @@ Removing Orphan Nodes
 *********************
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex13.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex13.py>`
@@ -166,7 +153,6 @@ Moving Nodes
 ============
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex15.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex15.py>`
@@ -177,7 +163,6 @@ Diagonal Inversion
 ==================
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex16.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex16.py>`
@@ -188,7 +173,6 @@ Uniting two Triangles
 =====================
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex17.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex17.py>`
@@ -199,7 +183,6 @@ Uniting a Set of Triangles
 ==========================
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex18.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex18.py>`
@@ -210,7 +193,6 @@ Orientation
 ===========
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex19.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex19.py>`
@@ -221,7 +203,6 @@ Cutting Quadrangles
 ===================
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex20.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex20.py>`
@@ -232,7 +213,6 @@ Split Volumes into Tetrahedra
 =============================
 
 .. literalinclude:: ../../../examples/modifying_meshes_split_vol.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_split_vol.py>`
@@ -243,7 +223,6 @@ Smoothing
 =========
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex21.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex21.py>`
@@ -254,7 +233,6 @@ Extrusion
 =========
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex22.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex22.py>`
@@ -265,7 +243,6 @@ Extrusion along a Path
 ======================
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex23.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex23.py>`
@@ -276,7 +253,6 @@ Revolution
 ==========
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex24.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex24.py>`
@@ -287,7 +263,6 @@ Pattern Mapping
 ===============
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex25.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex25.py>`
@@ -298,7 +273,6 @@ Convert mesh to/from quadratic
 ==============================
 
 .. literalinclude:: ../../../examples/modifying_meshes_ex26.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/modifying_meshes_ex26.py>`
@@ -309,7 +283,6 @@ Split bi-quadratic into linear
 ==============================
 
 .. literalinclude:: ../../../examples/split_biquad.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/split_biquad.py>`
@@ -339,7 +312,6 @@ This example represents an iron cable (a thin cylinder) in a concrete bloc (a bi
 The big cylinder is defined by two geometric volumes.
 
 .. literalinclude:: ../../../examples/generate_flat_elements.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/generate_flat_elements.py>`

diff --git a/doc/salome/gui/SMESH/input/tui_notebook_smesh.rst b/doc/salome/gui/SMESH/input/tui_notebook_smesh.rst
index 9a0fc2f918000a6e3e98e98d49d6fdffae2cf976..e05865b47349e835fa772523603f95bd1a7381c1 100644 (file)
--- a/doc/salome/gui/SMESH/input/tui_notebook_smesh.rst
+++ b/doc/salome/gui/SMESH/input/tui_notebook_smesh.rst
@@ -11,7 +11,6 @@ Notebook Smesh
 ==============
 
 .. literalinclude:: ../../../examples/notebook_smesh.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/notebook_smesh.py>`

diff --git a/doc/salome/gui/SMESH/input/tui_quality_controls.rst b/doc/salome/gui/SMESH/input/tui_quality_controls.rst
index 9563bdb96bc70b6b81df7ade67eb47ce0a46e2a8..566d69bac6b1f486e59aaafc28e739c6a5fe3e4b 100644 (file)
--- a/doc/salome/gui/SMESH/input/tui_quality_controls.rst
+++ b/doc/salome/gui/SMESH/input/tui_quality_controls.rst
@@ -13,7 +13,6 @@ Free Borders
 ============
 
 .. literalinclude:: ../../../examples/quality_controls_ex01.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex01.py>`
@@ -25,7 +24,6 @@ Borders at Multiconnection
 ==========================
 
 .. literalinclude:: ../../../examples/quality_controls_ex02.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex02.py>`
@@ -37,7 +35,6 @@ Length 1D
 =========
 
 .. literalinclude:: ../../../examples/quality_controls_ex03.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex03.py>`
@@ -48,7 +45,6 @@ Free Edges
 ==========
 
 .. literalinclude:: ../../../examples/quality_controls_ex04.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex04.py>`
@@ -59,7 +55,6 @@ Free Nodes
 ==========
 
 .. literalinclude:: ../../../examples/quality_controls_ex05.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex05.py>`
@@ -70,7 +65,6 @@ Free Faces
 ==========
 
 .. literalinclude:: ../../../examples/quality_controls_ex06.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex06.py>`
@@ -81,7 +75,6 @@ Bare border faces
 =================
 
 .. literalinclude:: ../../../examples/quality_controls_ex07.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex07.py>`
@@ -92,7 +85,6 @@ Bare border volumes
 ===================
 
 .. literalinclude:: ../../../examples/quality_controls_ex08.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex08.py>`
@@ -103,7 +95,6 @@ Over-constrained faces
 ======================
 
 .. literalinclude:: ../../../examples/quality_controls_ex09.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex09.py>`
@@ -114,7 +105,6 @@ Over-constrained volumes
 ========================
 
 .. literalinclude:: ../../../examples/quality_controls_ex10.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex10.py>`
@@ -125,7 +115,6 @@ Length 2D
 =========
 
 .. literalinclude:: ../../../examples/quality_controls_ex11.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex11.py>`
@@ -137,7 +126,6 @@ Borders at Multiconnection 2D
 =============================
 
 .. literalinclude:: ../../../examples/quality_controls_ex12.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex12.py>`
@@ -148,7 +136,6 @@ Area
 ====
 
 .. literalinclude:: ../../../examples/quality_controls_ex13.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex13.py>`
@@ -159,7 +146,6 @@ Taper
 =====
 
 .. literalinclude:: ../../../examples/quality_controls_ex14.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex14.py>`
@@ -170,7 +156,6 @@ Aspect Ratio
 ============
 
 .. literalinclude:: ../../../examples/quality_controls_ex15.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex15.py>`
@@ -181,7 +166,6 @@ Minimum Angle
 =============
 
 .. literalinclude:: ../../../examples/quality_controls_ex16.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex16.py>`
@@ -192,7 +176,6 @@ Warping
 =======
 
 .. literalinclude:: ../../../examples/quality_controls_ex17.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex17.py>`
@@ -203,7 +186,6 @@ Skew
 ====
 
 .. literalinclude:: ../../../examples/quality_controls_ex18.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex18.py>`
@@ -214,7 +196,6 @@ Element Diameter 2D
 ===================
 
 .. literalinclude:: ../../../examples/quality_controls_ex19.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex19.py>`
@@ -225,7 +206,6 @@ Aspect Ratio 3D
 ===============
 
 .. literalinclude:: ../../../examples/quality_controls_ex20.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex20.py>`
@@ -236,7 +216,6 @@ Volume
 ======
 
 .. literalinclude:: ../../../examples/quality_controls_ex21.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex21.py>`
@@ -247,7 +226,6 @@ Element Diameter 3D
 ===================
 
 .. literalinclude:: ../../../examples/quality_controls_ex22.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/quality_controls_ex22.py>`

diff --git a/doc/salome/gui/SMESH/input/tui_transforming_meshes.rst b/doc/salome/gui/SMESH/input/tui_transforming_meshes.rst
index 0be8e0a6d3125f0b054621e3b4e43c5a1ff40609..23b755f80624c36754530da982b653b7c20174fa 100644 (file)
--- a/doc/salome/gui/SMESH/input/tui_transforming_meshes.rst
+++ b/doc/salome/gui/SMESH/input/tui_transforming_meshes.rst
@@ -13,7 +13,6 @@ Translation
 ===========
 
 .. literalinclude:: ../../../examples/transforming_meshes_ex01.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/transforming_meshes_ex01.py>`
@@ -24,7 +23,6 @@ Rotation
 ========
 
 .. literalinclude:: ../../../examples/transforming_meshes_ex02.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/transforming_meshes_ex02.py>`
@@ -35,7 +33,6 @@ Scale
 =====
 
 .. literalinclude:: ../../../examples/transforming_meshes_ex03.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/transforming_meshes_ex03.py>`
@@ -46,7 +43,6 @@ Symmetry
 ========
 
 .. literalinclude:: ../../../examples/transforming_meshes_ex04.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/transforming_meshes_ex04.py>`
@@ -57,7 +53,6 @@ Merging Nodes
 =============
 
 .. literalinclude:: ../../../examples/transforming_meshes_ex05.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/transforming_meshes_ex05.py>`
@@ -68,7 +63,6 @@ Merging Elements
 ================
 
 .. literalinclude:: ../../../examples/transforming_meshes_ex06.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/transforming_meshes_ex06.py>`
@@ -79,7 +73,6 @@ Sew Meshes Border to Side
 =========================
 
 .. literalinclude:: ../../../examples/transforming_meshes_ex07.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/transforming_meshes_ex07.py>`
@@ -90,7 +83,6 @@ Sew Conform Free Borders
 ========================
 
 .. literalinclude:: ../../../examples/transforming_meshes_ex08.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/transforming_meshes_ex08.py>`
@@ -101,7 +93,6 @@ Sew Free Borders
 ================
 
 .. literalinclude:: ../../../examples/transforming_meshes_ex09.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/transforming_meshes_ex09.py>`
@@ -112,7 +103,6 @@ Sew Side Elements
 =================
 
 .. literalinclude:: ../../../examples/transforming_meshes_ex10.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/transforming_meshes_ex10.py>`
@@ -123,7 +113,6 @@ Duplicate nodes or/and elements
 ===============================
 
 .. literalinclude:: ../../../examples/transforming_meshes_ex11.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/transforming_meshes_ex11.py>`
@@ -134,7 +123,6 @@ Create boundary elements
 ========================
 
 .. literalinclude:: ../../../examples/transforming_meshes_ex12.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/transforming_meshes_ex12.py>`
@@ -145,7 +133,6 @@ Reorient faces
 ==============
 
 .. literalinclude:: ../../../examples/transforming_meshes_ex13.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/transforming_meshes_ex13.py>`

diff --git a/doc/salome/gui/SMESH/input/tui_viewing_meshes.rst b/doc/salome/gui/SMESH/input/tui_viewing_meshes.rst
index c1c3bfd2ee08804d7330615aa4758e3d78cadeb4..d1320ec873a49fc7bc89455c5df0126ad216eeee 100644 (file)
--- a/doc/salome/gui/SMESH/input/tui_viewing_meshes.rst
+++ b/doc/salome/gui/SMESH/input/tui_viewing_meshes.rst
@@ -11,7 +11,6 @@ Viewing Mesh Infos
 ##################
 
 .. literalinclude:: ../../../examples/viewing_meshes_ex01.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/viewing_meshes_ex01.py>`
@@ -23,7 +22,6 @@ Find Element by Point
 #####################
 
 .. literalinclude:: ../../../examples/viewing_meshes_ex02.py
-    :linenos:
     :language: python
 
 :download:`Download this script <../../../examples/viewing_meshes_ex02.py>`

diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx
index 23828463e502abad943db89795f061953591eddc..d27c878763da7ae88397e73fc80a31731cfe16b5 100644 (file)
--- a/src/SMESH/SMESH_Mesh.cxx
+++ b/src/SMESH/SMESH_Mesh.cxx
@@ -80,8 +80,6 @@
 #include <pthread.h>
 #endif
 
-using namespace std;
-
 // maximum stored group name length in MED file
 #define MAX_MED_GROUP_NAME_LENGTH 80
 
@@ -189,7 +187,7 @@ SMESH_Mesh::~SMESH_Mesh()
     sm->ComputeStateEngine( SMESH_subMesh::MESH_ENTITY_REMOVED );
 
   // delete groups
-  map < int, SMESH_Group * >::iterator itg;
+  std::map < int, SMESH_Group * >::iterator itg;
   for (itg = _mapGroup.begin(); itg != _mapGroup.end(); itg++) {
     SMESH_Group *aGroup = (*itg).second;
     delete aGroup;
@@ -276,7 +274,7 @@ void SMESH_Mesh::ShapeToMesh(const TopoDS_Shape & aShape)
     // - sub-meshes
     _subMeshHolder->DeleteAll();
     //  - groups on geometry
-    map <int, SMESH_Group *>::iterator i_gr = _mapGroup.begin();
+    std::map <int, SMESH_Group *>::iterator i_gr = _mapGroup.begin();
     while ( i_gr != _mapGroup.end() ) {
       if ( dynamic_cast<SMESHDS_GroupOnGeom*>( i_gr->second->GetGroupDS() )) {
         _myMeshDS->RemoveGroup( i_gr->second->GetGroupDS() );
@@ -518,13 +516,13 @@ int SMESH_Mesh::MEDToMesh(const char* theFileName, const char* theMeshName)
   Driver_Mesh::Status status = myReader.Perform();
 #ifdef _DEBUG_
   SMESH_ComputeErrorPtr er = myReader.GetError();
-  if ( er && !er->IsOK() ) cout << er->myComment << endl;
+  if ( er && !er->IsOK() ) std::cout << er->myComment << std::endl;
 #endif
 
   // Reading groups (sub-meshes are out of scope of MED import functionality)
-  list<TNameAndType> aGroupNames = myReader.GetGroupNamesAndTypes();
+  std::list<TNameAndType> aGroupNames = myReader.GetGroupNamesAndTypes();
   int anId;
-  list<TNameAndType>::iterator name_type = aGroupNames.begin();
+  std::list<TNameAndType>::iterator name_type = aGroupNames.begin();
   for ( ; name_type != aGroupNames.end(); name_type++ )
   {
     SMESH_Group* aGroup = AddGroup( name_type->second, name_type->first.c_str(), anId );
@@ -647,7 +645,7 @@ SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape,
     // NOTE: this is not a correct way to check a name of hypothesis,
     // there should be an attribute of hypothesis saying that it can/can't
     // be global/local
-    string hypName = anHyp->GetName();
+    std::string hypName = anHyp->GetName();
     if ( hypName == "NotConformAllowed" )
     {
       if(MYDEBUG) MESSAGE( "Hypothesis <NotConformAllowed> can be only global" );
@@ -787,7 +785,7 @@ SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape,
  */
 //=============================================================================
 
-const list<const SMESHDS_Hypothesis*>&
+const std::list<const SMESHDS_Hypothesis*>&
 SMESH_Mesh::GetHypothesisList(const TopoDS_Shape & aSubShape) const
   throw(SALOME_Exception)
 {
@@ -834,8 +832,8 @@ const SMESH_Hypothesis * SMESH_Mesh::GetHypothesis(const SMESH_subMesh *   aSubM
 
   {
     const TopoDS_Shape & aSubShape = aSubMesh->GetSubShape();
-    const list<const SMESHDS_Hypothesis*>& hypList = _myMeshDS->GetHypothesis(aSubShape);
-    list<const SMESHDS_Hypothesis*>::const_iterator hyp = hypList.begin();
+    const std::list<const SMESHDS_Hypothesis*>& hypList = _myMeshDS->GetHypothesis(aSubShape);
+    std::list<const SMESHDS_Hypothesis*>::const_iterator hyp = hypList.begin();
     for ( ; hyp != hypList.end(); hyp++ ) {
       const SMESH_Hypothesis * h = cSMESH_Hyp( *hyp );
       if ( aFilter.IsOk( h, aSubShape)) {
@@ -851,12 +849,12 @@ const SMESH_Hypothesis * SMESH_Mesh::GetHypothesis(const SMESH_subMesh *   aSubM
       const_cast< std::vector< SMESH_subMesh * > & > ( aSubMesh->GetAncestors() );
     SortByMeshOrder( ancestors );
 
-    vector<SMESH_subMesh*>::const_iterator smIt = ancestors.begin(); 
+    std::vector<SMESH_subMesh*>::const_iterator smIt = ancestors.begin(); 
     for ( ; smIt != ancestors.end(); smIt++ )
     {
       const TopoDS_Shape& curSh = (*smIt)->GetSubShape();
-      const list<const SMESHDS_Hypothesis*>& hypList = _myMeshDS->GetHypothesis(curSh);
-      list<const SMESHDS_Hypothesis*>::const_iterator hyp = hypList.begin();
+      const std::list<const SMESHDS_Hypothesis*>& hypList = _myMeshDS->GetHypothesis(curSh);
+      std::list<const SMESHDS_Hypothesis*>::const_iterator hyp = hypList.begin();
       for ( ; hyp != hypList.end(); hyp++ ) {
         const SMESH_Hypothesis * h = cSMESH_Hyp( *hyp );
         if (aFilter.IsOk( h, curSh )) {
@@ -880,11 +878,11 @@ const SMESH_Hypothesis * SMESH_Mesh::GetHypothesis(const SMESH_subMesh *   aSubM
  */
 //================================================================================
 
-int SMESH_Mesh::GetHypotheses(const TopoDS_Shape &                aSubShape,
-                              const SMESH_HypoFilter&             aFilter,
-                              list <const SMESHDS_Hypothesis * >& aHypList,
-                              const bool                          andAncestors,
-                              list< TopoDS_Shape > *              assignedTo/*=0*/) const
+int SMESH_Mesh::GetHypotheses(const TopoDS_Shape &                     aSubShape,
+                              const SMESH_HypoFilter&                  aFilter,
+                              std::list <const SMESHDS_Hypothesis * >& aHypList,
+                              const bool                               andAncestors,
+                              std::list< TopoDS_Shape > *              assignedTo/*=0*/) const
 {
   return GetHypotheses( const_cast< SMESH_Mesh* >(this)->GetSubMesh( aSubShape ),
                         aFilter, aHypList, andAncestors, assignedTo );
@@ -901,22 +899,22 @@ int SMESH_Mesh::GetHypotheses(const TopoDS_Shape &                aSubShape,
  */
 //================================================================================
 
-int SMESH_Mesh::GetHypotheses(const SMESH_subMesh *               aSubMesh,
-                              const SMESH_HypoFilter&             aFilter,
-                              list <const SMESHDS_Hypothesis * >& aHypList,
-                              const bool                          andAncestors,
-                              list< TopoDS_Shape > *              assignedTo/*=0*/) const
+int SMESH_Mesh::GetHypotheses(const SMESH_subMesh *                    aSubMesh,
+                              const SMESH_HypoFilter&                  aFilter,
+                              std::list <const SMESHDS_Hypothesis * >& aHypList,
+                              const bool                               andAncestors,
+                              std::list< TopoDS_Shape > *              assignedTo/*=0*/) const
 {
   if ( !aSubMesh ) return 0;
 
-  set<string> hypTypes; // to exclude same type hypos from the result list
+  std::set< std::string > hypTypes; // to exclude same type hypos from the result list
   int nbHyps = 0;
 
   // only one main hypothesis is allowed
   bool mainHypFound = false;
 
   // fill in hypTypes
-  list<const SMESHDS_Hypothesis*>::const_iterator hyp;
+  std::list<const SMESHDS_Hypothesis*>::const_iterator hyp;
   for ( hyp = aHypList.begin(); hyp != aHypList.end(); hyp++ ) {
     if ( hypTypes.insert( (*hyp)->GetName() ).second )
       nbHyps++;
@@ -927,7 +925,7 @@ int SMESH_Mesh::GetHypotheses(const SMESH_subMesh *               aSubMesh,
   // get hypos from aSubShape
   {
     const TopoDS_Shape & aSubShape = aSubMesh->GetSubShape();
-    const list<const SMESHDS_Hypothesis*>& hypList = _myMeshDS->GetHypothesis(aSubShape);
+    const std::list<const SMESHDS_Hypothesis*>& hypList = _myMeshDS->GetHypothesis(aSubShape);
     for ( hyp = hypList.begin(); hyp != hypList.end(); hyp++ )
     {
       const SMESH_Hypothesis* h = cSMESH_Hyp( *hyp );
@@ -952,11 +950,11 @@ int SMESH_Mesh::GetHypotheses(const SMESH_subMesh *               aSubMesh,
       const_cast< std::vector< SMESH_subMesh * > & > ( aSubMesh->GetAncestors() );
     SortByMeshOrder( ancestors );
 
-    vector<SMESH_subMesh*>::const_iterator smIt = ancestors.begin();
+    std::vector<SMESH_subMesh*>::const_iterator smIt = ancestors.begin();
     for ( ; smIt != ancestors.end(); smIt++ )
     {
       const TopoDS_Shape& curSh = (*smIt)->GetSubShape();
-      const list<const SMESHDS_Hypothesis*>& hypList = _myMeshDS->GetHypothesis(curSh);
+      const std::list<const SMESHDS_Hypothesis*>& hypList = _myMeshDS->GetHypothesis(curSh);
       for ( hyp = hypList.begin(); hyp != hypList.end(); hyp++ )
       {
         const SMESH_Hypothesis* h = cSMESH_Hyp( *hyp );
@@ -998,7 +996,7 @@ SMESH_Hypothesis * SMESH_Mesh::GetHypothesis(const int anHypId) const
  */
 //=============================================================================
 
-const list<SMESHDS_Command*> & SMESH_Mesh::GetLog() throw(SALOME_Exception)
+const std::list<SMESHDS_Command*> & SMESH_Mesh::GetLog() throw(SALOME_Exception)
 {
   Unexpect aCatch(SalomeException);
   return _myMeshDS->GetScript()->GetCommands();
@@ -1102,11 +1100,11 @@ throw(SALOME_Exception)
  */
 //================================================================================
 
-list<SMESH_subMesh*>
+std::list<SMESH_subMesh*>
 SMESH_Mesh::GetGroupSubMeshesContaining(const TopoDS_Shape & aSubShape) const
   throw(SALOME_Exception)
 {
-  list<SMESH_subMesh*> found;
+  std::list<SMESH_subMesh*> found;
 
   SMESH_subMesh * subMesh = GetSubMeshContaining(aSubShape);
   if ( !subMesh )
@@ -1173,7 +1171,7 @@ bool SMESH_Mesh::IsUsedHypothesis(SMESHDS_Hypothesis * anHyp,
     // look trough hypotheses used by algo
     const SMESH_HypoFilter* hypoKind;
     if (( hypoKind = algo->GetCompatibleHypoFilter( !hyp->IsAuxiliary() ))) {
-      list <const SMESHDS_Hypothesis * > usedHyps;
+      std::list <const SMESHDS_Hypothesis * > usedHyps;
       if ( GetHypotheses( aSubMesh, *hypoKind, usedHyps, true ))
         return ( find( usedHyps.begin(), usedHyps.end(), anHyp ) != usedHyps.end() );
     }
@@ -1199,8 +1197,8 @@ void SMESH_Mesh::NotifySubMeshesHypothesisModification(const SMESH_Hypothesis* h
 
   SMESH_Algo *algo;
   const SMESH_HypoFilter* compatibleHypoKind;
-  list <const SMESHDS_Hypothesis * > usedHyps;
-  vector< SMESH_subMesh* > smToNotify;
+  std::list <const SMESHDS_Hypothesis * > usedHyps;
+  std::vector< SMESH_subMesh* > smToNotify;
   bool allMeshedEdgesNotified = true;
 
   SMESH_subMeshIteratorPtr smIt( _subMeshHolder->GetIterator() );
@@ -1381,12 +1379,12 @@ bool SMESH_Mesh::IsComputedOK()
 bool SMESH_Mesh::HasDuplicatedGroupNamesMED()
 {
   // Corrected for Mantis issue 0020028
-  map< SMDSAbs_ElementType, set<string> > aGroupNames;
-  for ( map<int, SMESH_Group*>::iterator it = _mapGroup.begin(); it != _mapGroup.end(); it++ )
+  std::map< SMDSAbs_ElementType, std::set< std::string > > aGroupNames;
+  for ( std::map<int, SMESH_Group*>::iterator it = _mapGroup.begin(); it != _mapGroup.end(); it++ )
   {
     SMESH_Group*       aGroup = it->second;
     SMDSAbs_ElementType aType = aGroup->GetGroupDS()->GetType();
-    string         aGroupName = aGroup->GetName();
+    std::string    aGroupName = aGroup->GetName();
     aGroupName.resize( MAX_MED_GROUP_NAME_LENGTH );
     if ( !aGroupNames[aType].insert(aGroupName).second )
       return true;
@@ -1459,17 +1457,19 @@ void SMESH_Mesh::ExportMED(const char *        file,
   //set<string> aGroupNames; // Corrected for Mantis issue 0020028
   if ( !meshPart )
   {
-    map< SMDSAbs_ElementType, set<string> > aGroupNames;
+    std::map< SMDSAbs_ElementType, std::set<std::string> > aGroupNames;
     char aString [256];
     int maxNbIter = 10000; // to guarantee cycle finish
-    for ( map<int, SMESH_Group*>::iterator it = _mapGroup.begin(); it != _mapGroup.end(); it++ ) {
+    for ( std::map<int, SMESH_Group*>::iterator it = _mapGroup.begin();
+          it != _mapGroup.end();
+          it++ ) {
       SMESH_Group*       aGroup   = it->second;
       SMESHDS_GroupBase* aGroupDS = aGroup->GetGroupDS();
       if ( aGroupDS ) {
         SMDSAbs_ElementType aType = aGroupDS->GetType();
-        string aGroupName0 = aGroup->GetName();
+        std::string aGroupName0 = aGroup->GetName();
         aGroupName0.resize(MAX_MED_GROUP_NAME_LENGTH);
-        string aGroupName = aGroupName0;
+        std::string aGroupName = aGroupName0;
         for (int i = 1; !aGroupNames[aType].insert(aGroupName).second && i < maxNbIter; i++) {
           sprintf(&aString[0], "GR_%d_%s", i, aGroupName0.c_str());
           aGroupName = aString;
@@ -1568,11 +1568,12 @@ void SMESH_Mesh::ExportUNV(const char *        file,
   // pass group names to SMESHDS
   if ( !meshPart )
   {
-    for ( map<int, SMESH_Group*>::iterator it = _mapGroup.begin(); it != _mapGroup.end(); it++ ) {
+    std::map<int, SMESH_Group*>::iterator it = _mapGroup.begin();
+    for ( ; it != _mapGroup.end(); it++ ) {
       SMESH_Group*       aGroup   = it->second;
       SMESHDS_GroupBase* aGroupDS = aGroup->GetGroupDS();
       if ( aGroupDS ) {
-        string aGroupName = aGroup->GetName();
+        std::string aGroupName = aGroup->GetName();
         aGroupDS->SetStoreName( aGroupName.c_str() );
         myWriter.AddGroup( aGroupDS );
       }
@@ -1616,11 +1617,12 @@ void SMESH_Mesh::ExportCGNS(const char *        file,
   int res = Driver_Mesh::DRS_FAIL;
 
   // pass group names to SMESHDS
-  for ( map<int, SMESH_Group*>::iterator it = _mapGroup.begin(); it != _mapGroup.end(); it++ ) {
+  std::map<int, SMESH_Group*>::iterator it = _mapGroup.begin();
+  for ( ; it != _mapGroup.end(); it++ ) {
     SMESH_Group*       group   = it->second;
     SMESHDS_GroupBase* groupDS = group->GetGroupDS();
     if ( groupDS ) {
-      string groupName = group->GetName();
+      std::string groupName = group->GetName();
       groupDS->SetStoreName( groupName.c_str() );
     }
   }
@@ -1699,7 +1701,7 @@ double SMESH_Mesh::GetComputeProgress() const
       }
       catch (...) {
 #ifdef _DEBUG_
-        cerr << "Exception in " << algo->GetName() << "::GetProgress()" << endl;
+        std::cerr << "Exception in " << algo->GetName() << "::GetProgress()" << std::endl;
 #endif
       }
       if ( 0. < rate && rate < 1.001 )
@@ -2046,7 +2048,7 @@ SMESH_Group* SMESH_Mesh::AddGroup (SMESHDS_GroupBase* groupDS) throw(SALOME_Exce
   if ( !groupDS ) 
     throw SALOME_Exception(LOCALIZED ("SMESH_Mesh::AddGroup(): NULL SMESHDS_GroupBase"));
 
-  map <int, SMESH_Group*>::iterator i_g = _mapGroup.find( groupDS->GetID() );
+  std::map <int, SMESH_Group*>::iterator i_g = _mapGroup.find( groupDS->GetID() );
   if ( i_g != _mapGroup.end() && i_g->second )
   {
     if ( i_g->second->GetGroupDS() == groupDS )
@@ -2074,9 +2076,9 @@ SMESH_Group* SMESH_Mesh::AddGroup (SMESHDS_GroupBase* groupDS) throw(SALOME_Exce
 
 bool SMESH_Mesh::SynchronizeGroups()
 {
-  const size_t                       nbGroups = _mapGroup.size();
-  const set<SMESHDS_GroupBase*>&       groups = _myMeshDS->GetGroups();
-  set<SMESHDS_GroupBase*>::const_iterator gIt = groups.begin();
+  const size_t                            nbGroups = _mapGroup.size();
+  const std::set<SMESHDS_GroupBase*>&       groups = _myMeshDS->GetGroups();
+  std::set<SMESHDS_GroupBase*>::const_iterator gIt = groups.begin();
   for ( ; gIt != groups.end(); ++gIt )
   {
     SMESHDS_GroupBase* groupDS = (SMESHDS_GroupBase*) *gIt;
@@ -2098,7 +2100,7 @@ bool SMESH_Mesh::SynchronizeGroups()
 
 SMESH_Mesh::GroupIteratorPtr SMESH_Mesh::GetGroups() const
 {
-  typedef map <int, SMESH_Group *> TMap;
+  typedef std::map <int, SMESH_Group *> TMap;
   return GroupIteratorPtr( new SMDS_mapIterator<TMap>( _mapGroup ));
 }
 
@@ -2122,10 +2124,11 @@ SMESH_Group* SMESH_Mesh::GetGroup (const int theGroupID)
  */
 //=============================================================================
 
-list<int> SMESH_Mesh::GetGroupIds() const
+std::list<int> SMESH_Mesh::GetGroupIds() const
 {
-  list<int> anIds;
-  for ( map<int, SMESH_Group*>::const_iterator it = _mapGroup.begin(); it != _mapGroup.end(); it++ )
+  std::list<int> anIds;
+  std::map<int, SMESH_Group*>::const_iterator it = _mapGroup.begin();
+  for ( ; it != _mapGroup.end(); it++ )
     anIds.push_back( it->first );
   
   return anIds;
@@ -2194,7 +2197,7 @@ ostream& SMESH_Mesh::Dump(ostream& save)
   save << ++clause << ") Total number of polyhedrons:\t" << NbPolyhedrons() << endl << endl;
   for ( int isQuadratic = 0; isQuadratic < 2; ++isQuadratic )
   {
-    string orderStr = isQuadratic ? "quadratic" : "linear";
+    std::string orderStr = isQuadratic ? "quadratic" : "linear";
     SMDSAbs_ElementOrder order  = isQuadratic ? ORDER_QUADRATIC : ORDER_LINEAR;
 
     save << ++clause << ") Total number of " << orderStr << " edges:\t" << NbEdges(order) << endl;
@@ -2205,7 +2208,7 @@ ostream& SMESH_Mesh::Dump(ostream& save)
       save << clause << ".1) Number of " << orderStr << " triangles:  \t" << nb3 << endl;
       save << clause << ".2) Number of " << orderStr << " quadrangles:\t" << nb4 << endl;
       if ( nb3 + nb4 !=  NbFaces(order) ) {
-        map<int,int> myFaceMap;
+        std::map<int,int> myFaceMap;
         SMDS_FaceIteratorPtr itFaces=_myMeshDS->facesIterator();
         while( itFaces->more( ) ) {
           int nbNodes = itFaces->next()->NbNodes();
@@ -2214,7 +2217,7 @@ ostream& SMESH_Mesh::Dump(ostream& save)
           myFaceMap[ nbNodes ] = myFaceMap[ nbNodes ] + 1;
         }
         save << clause << ".3) Faces in detail: " << endl;
-        map <int,int>::iterator itF;
+        std::map <int,int>::iterator itF;
         for (itF = myFaceMap.begin(); itF != myFaceMap.end(); itF++)
           save << "--> nb nodes: " << itF->first << " - nb elements:\t" << itF->second << endl;
       }
@@ -2230,7 +2233,7 @@ ostream& SMESH_Mesh::Dump(ostream& save)
       save << clause << ".3) Number of " << orderStr << " prisms:      \t" << nb6 << endl;
       save << clause << ".4) Number of " << orderStr << " pyramids:    \t" << nb5 << endl;
       if ( nb8 + nb4 + nb5 + nb6 != NbVolumes(order) ) {
-        map<int,int> myVolumesMap;
+        std::map<int,int> myVolumesMap;
         SMDS_VolumeIteratorPtr itVolumes=_myMeshDS->volumesIterator();
         while( itVolumes->more( ) ) {
           int nbNodes = itVolumes->next()->NbNodes();
@@ -2239,7 +2242,7 @@ ostream& SMESH_Mesh::Dump(ostream& save)
           myVolumesMap[ nbNodes ] = myVolumesMap[ nbNodes ] + 1;
         }
         save << clause << ".5) Volumes in detail: " << endl;
-        map <int,int>::iterator itV;
+        std::map <int,int>::iterator itV;
         for (itV = myVolumesMap.begin(); itV != myVolumesMap.end(); itV++)
           save << "--> nb nodes: " << itV->first << " - nb elements:\t" << itV->second << endl;
       }
@@ -2269,7 +2272,7 @@ SMDSAbs_ElementType SMESH_Mesh::GetElementType( const int id, const bool iselem
 SMESH_Group* SMESH_Mesh::ConvertToStandalone ( int theGroupID )
 {
   SMESH_Group* aGroup = 0;
-  map < int, SMESH_Group * >::iterator itg = _mapGroup.find( theGroupID );
+  std::map < int, SMESH_Group * >::iterator itg = _mapGroup.find( theGroupID );
   if ( itg == _mapGroup.end() )
     return aGroup;
 
@@ -2395,12 +2398,12 @@ bool SMESH_Mesh::SortByMeshOrder(std::vector<SMESH_subMesh*>& theListToSort) con
     return true;
   
   bool res = false;
-  vector<SMESH_subMesh*> onlyOrderedList, smVec;
+  std::vector<SMESH_subMesh*> onlyOrderedList, smVec;
 
   // collect all ordered submeshes in one list as pointers
   // and get their positions within theListToSort
-  typedef vector<SMESH_subMesh*>::iterator TPosInList;
-  map< int, TPosInList > sortedPos;
+  typedef std::vector<SMESH_subMesh*>::iterator TPosInList;
+  std::map< int, TPosInList > sortedPos;
   TPosInList smBeg = theListToSort.begin(), smEnd = theListToSort.end();
   TListOfListOfInt::const_iterator      listIdsIt = _mySubMeshOrder.begin();
   for( ; listIdsIt != _mySubMeshOrder.end(); listIdsIt++)
@@ -2431,7 +2434,7 @@ bool SMESH_Mesh::SortByMeshOrder(std::vector<SMESH_subMesh*>& theListToSort) con
     {
       TPosInList smPos = find( smBeg, smEnd, smVec[i] );
       if ( smPos != smEnd ) {
-        sortedPos[ distance( smBeg, smPos )] = smPos;
+        sortedPos[ std::distance( smBeg, smPos )] = smPos;
         if ( sortedPos.size() > onlyOrderedList.size() )
           onlyOrderedList.push_back( smVec[i] );
       }
@@ -2441,11 +2444,11 @@ bool SMESH_Mesh::SortByMeshOrder(std::vector<SMESH_subMesh*>& theListToSort) con
     return res;
   res = true;
 
-  vector<SMESH_subMesh*>::iterator onlyBIt = onlyOrderedList.begin();
-  vector<SMESH_subMesh*>::iterator onlyEIt = onlyOrderedList.end();
+  std::vector<SMESH_subMesh*>::iterator onlyBIt = onlyOrderedList.begin();
+  std::vector<SMESH_subMesh*>::iterator onlyEIt = onlyOrderedList.end();
 
   // iterate on ordered sub-meshes and insert them in detected positions
-  map< int, TPosInList >::iterator i_pos = sortedPos.begin();
+  std::map< int, TPosInList >::iterator i_pos = sortedPos.begin();
   for ( ; onlyBIt != onlyEIt; ++onlyBIt, ++i_pos )
     *(i_pos->second) = *onlyBIt;
 

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 9058ebcefcdcd511a20ef7e5db915a59e58d2234..48f8eb6e4e4a9b891250289afcc147716a96c8b7 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -1857,6 +1857,7 @@ void SMESHGUI::OnEditDelete()
   _PTR(GenericAttribute) anAttr;
   _PTR(AttributeIOR) anIOR;
 
+  const int objectCountLimit = 30; // PAL23599
   int objectCount = 0;
   QString aNameList;
   QString aParentComponent = QString::null;
@@ -1866,29 +1867,33 @@ void SMESHGUI::OnEditDelete()
     Handle(SALOME_InteractiveObject) anIO = anIt.Value();
     if ( anIO.IsNull() ) continue;
     
-    QString father = "unknown";
+    QString father = "unknown", name;
 
     _PTR(SObject) aSO = aStudy->FindObjectID( anIO->getEntry() );
     if (aSO) {
       father = QString::fromStdString( aSO->GetFatherComponent()->ComponentDataType() );
       // check if object is reference
       _PTR(SObject) aRefSObj;
-      aNameList.append("\n    - ");
       if ( aSO->ReferencedObject( aRefSObj ) ) {
-        QString aRefName = QString::fromStdString ( aRefSObj->GetName() );
-        aNameList.append( aRefName );
+        name = QString::fromStdString ( aRefSObj->GetName() );
         father = QString::fromStdString ( aRefSObj->GetFatherComponent()->ComponentDataType() );
       }
       else
-        aNameList.append(anIO->getName());
+        name = anIO->getName();
       objectCount++;
     }
+    if ( objectCount < objectCountLimit ) { // avoid occupying the whole screen
+      aNameList.append("\n    - ");
+      aNameList.append( name );
+    }
 
     if( aParentComponent.isNull() )
       aParentComponent = father;
     else if( !aParentComponent.isEmpty() && aParentComponent!=father )
       aParentComponent = "";
   }
+  if ( objectCount >= objectCountLimit )
+    aNameList.append("\n    - ...");
 
   if ( objectCount == 0 )
     return; // No Valid Objects Selected
@@ -5444,7 +5449,7 @@ void SMESHGUI::preferencesChanged( const QString& sect, const QString& name )
          name=="selection_precision_node"    ||
          name=="selection_precision_element" ||
          name=="selection_precision_object"   ||
-        name=="selection_increment")
+         name=="selection_increment")
     {
       SMESH::UpdateSelectionProp( this );
     }

diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index c383a29fc6b0e6eb90f2d4c131d174d19652d798..ffab1b05646c38130011d64b642ac0fce86d2e11 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -3780,11 +3780,13 @@ throw ( SALOME::SALOME_Exception )
   } // loop on groups
 
   // set mesh name
-  SALOMEDS::SObject_wrap soNew = ObjectToSObject( theNewMesh );
-  SALOMEDS::SObject_wrap soOld = ObjectToSObject( theSourceMesh );
-  CORBA::String_var oldName = soOld->GetName();
-  SetName( soNew, oldName.in(), "Mesh" );
-
+  if ( !theMeshName || !theMeshName[0] )
+  {
+    SALOMEDS::SObject_wrap soNew = ObjectToSObject( theNewMesh );
+    SALOMEDS::SObject_wrap soOld = ObjectToSObject( theSourceMesh );
+    CORBA::String_var oldName = soOld->GetName();
+    SetName( soNew, oldName.in(), "Mesh" );
+  }
   // mark invalid objects
   shapeMapper.GetInvalid( theInvalidEntries, invalidSObjects );
 

diff --git a/src/SMESH_SWIG/smeshBuilder.py b/src/SMESH_SWIG/smeshBuilder.py
index a93d9f7320d98c56cb5445402405658c1b6909a6..1a39b452b4e7378b542b51589fcad7ae194f24f0 100755 (executable)
--- a/src/SMESH_SWIG/smeshBuilder.py
+++ b/src/SMESH_SWIG/smeshBuilder.py
@@ -6196,7 +6196,7 @@ class Mesh(metaclass = MeshMeta):
                 nodes must be the same. Use :meth:`FindFreeBorders` to get nodes of holes.
             groupName (string): name of a group to add new faces
         Returns:
-            a :class:`group <SMESH.SMESH_GroupBase>` containing the new faces; or :code:`None` if :option:`groupName` == ""
+            a :class:`group <SMESH.SMESH_GroupBase>` containing the new faces; or :code:`None` if `groupName` == ""
         """