From a8c3e199b7fa1bf4ed5895a312cc5d5f6aee25e6 Mon Sep 17 00:00:00 2001 From: eap Date: Thu, 26 May 2016 17:38:08 +0300 Subject: [PATCH] Minor DOC changes --- doc/salome/examples/3dmesh.py | 19 ++++++++++++++++++- .../gui/SMESH/input/smeshpy_interface.doc | 7 ++++--- .../input/tui_work_on_objects_from_gui.doc | 19 +++++++++++++------ src/SMESH/SMESH_MeshEditor.cxx | 2 +- 4 files changed, 36 insertions(+), 11 deletions(-) diff --git a/doc/salome/examples/3dmesh.py b/doc/salome/examples/3dmesh.py index 57a1440e0..665534d80 100644 --- a/doc/salome/examples/3dmesh.py +++ b/doc/salome/examples/3dmesh.py @@ -1,4 +1,4 @@ -# 3d mesh generation +# 3d mesh generation and mesh exploration import salome salome.salome_init() @@ -76,3 +76,20 @@ tetra.Compute() # Create a mesh group of all triangles generated on geom faces present in faces_group group = tetra.Group(faces_group) + +### +# Explore the mesh +### + +# Retrieve coordinates of nodes +coordStr = "" +for node in tetra.GetNodesId(): + x,y,z = tetra.GetNodeXYZ( node ) + coordStr += "%s (%s, %s, %s) " % ( node, x,y,z ) + pass + +# Retrieve nodal connectivity of triangles +triaStr = "" +for tria in tetra.GetElementsByType( SMESH.FACE ): + nodes = tetra.GetElemNodes( tria ) + triaStr += "%s (%s, %s, %s) " % ( tria, nodes[0], nodes[1], nodes[2] ) diff --git a/doc/salome/gui/SMESH/input/smeshpy_interface.doc b/doc/salome/gui/SMESH/input/smeshpy_interface.doc index 92bd2f41d..bbb287f2f 100644 --- a/doc/salome/gui/SMESH/input/smeshpy_interface.doc +++ b/doc/salome/gui/SMESH/input/smeshpy_interface.doc @@ -18,7 +18,7 @@ in the \ref smeshBuilder and \ref StdMeshersBuilder Python packages. Class \ref smeshBuilder.smeshBuilder "smeshBuilder" provides an interface to create and handle meshes. It can be used to create an empty mesh or to import mesh from the data file. -As soon as mesh is created, it is possible to manage it via its own +As soon as a mesh is created, it is possible to manage it via its own methods, described in class \ref smeshBuilder.Mesh "Mesh" documentation. Class \ref smeshstudytools.SMeshStudyTools "SMeshStudyTools" provides several methods to manipulate mesh objects in Salome study. @@ -57,7 +57,7 @@ A usual workflow to generate a mesh on geometry is following: 
       \ref Mesh.Compute "mesh.Compute"()
- + An easiest way to start with Python scripting is to do something in @@ -68,7 +68,8 @@ by calling \a dir() Python built-in function. All methods of the Mesh Group can be found in \ref tui_create_standalone_group sample script. -An example below demonstrates usage of the Python API for 3d mesh generation. +An example below demonstrates usage of the Python API for 3d mesh +generation and for retrieving information on mesh nodes and elements. \anchor example_3d_mesh

Example of 3d mesh generation:

diff --git a/doc/salome/gui/SMESH/input/tui_work_on_objects_from_gui.doc b/doc/salome/gui/SMESH/input/tui_work_on_objects_from_gui.doc index 569d821a9..ddd1658a7 100644 --- a/doc/salome/gui/SMESH/input/tui_work_on_objects_from_gui.doc +++ b/doc/salome/gui/SMESH/input/tui_work_on_objects_from_gui.doc @@ -4,16 +4,23 @@ It is sometimes useful to work alternatively in the GUI of SALOME and in the Python Console. To fetch an object from the TUI simply type: -\code -myMesh_ref = salome.IDToObject("ID") -// were ID is the string looking like "0:1:2:3" that appears in the object browser in the Entry column -// ( If hidden show it by right clicking and checking the checkbox Entry) +\code{.py} +myMesh_ref = salome.IDToObject( ID ) +# were ID is a string looking like "0:1:2:3" that appears in the Object Browser in the Entry column. +# ( If hidden, show it by right clicking and checking the checkbox Entry ) myMesh = smesh.Mesh(myMesh_ref) \endcode or -\code +\code{.py} myMesh_ref = salome.myStudy.FindObjectByPath("/Mesh/myMesh").GetObject() -// "/Mesh/myMesh" is the path to the desired object in the object browser +#'/Mesh/myMesh' is a path to the desired object in the Object Browser +myMesh = smesh.Mesh(myMesh_ref) +\endcode +or +\code{.py} +# get a selected mesh +from salome.gui import helper +myMesh_ref = helper.getSObjectSelected()[0].GetObject() myMesh = smesh.Mesh(myMesh_ref) \endcode diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx index e4f2bda00..5969649c0 100644 --- a/src/SMESH/SMESH_MeshEditor.cxx +++ b/src/SMESH/SMESH_MeshEditor.cxx @@ -2124,7 +2124,7 @@ namespace // No adjacent prisms. Select a variant with a best aspect ratio. - double badness[2] = { 0, 0 }; + double badness[2] = { 0., 0. }; static SMESH::Controls::NumericalFunctorPtr aspectRatio( new SMESH::Controls::AspectRatio); const SMDS_MeshNode** nodes = vol.GetNodes(); for ( int variant = 0; variant < nbVariants; ++variant ) -- 2.39.2