From 43f41f0c11ce8e843ca6b0abac6f6f36c11d72b3 Mon Sep 17 00:00:00 2001 From: eap Date: Thu, 3 Mar 2016 15:42:23 +0300 Subject: [PATCH] 23250: [CEA 1766] 3D tab is empty when editing mesh + minor changes in docs + fix other problems with Mesh Dialog: 1) at mesh edition, old hypothesis remain assigned after playing with Mesh Type and Hypo Sets (change is in isSelectedHyp()) 2) When a 3D algo is unset due to change of Mesh Type, its hypotheses remain assigned and a new hyp can be created --- doc/salome/examples/filters_ex01.py | 1 + doc/salome/examples/filters_ex09.py | 10 +- doc/salome/examples/filters_ex10.py | 10 +- doc/salome/examples/filters_ex13.py | 2 +- doc/salome/examples/filters_ex17.py | 10 +- doc/salome/examples/filters_ex18.py | 27 +++++- .../SMESH/images/bare_border_volumes_smpl.png | Bin 7555 -> 8103 bytes doc/salome/gui/SMESH/input/about_filters.doc | 10 +- doc/salome/gui/SMESH/input/about_meshes.doc | 3 +- .../SMESH/input/selection_filter_library.doc | 8 +- doc/salome/gui/SMESH/input/tui_filters.doc | 91 +++++++++--------- src/SMESHGUI/SMESHGUI_MeshDlg.cxx | 21 ++-- src/SMESHGUI/SMESHGUI_MeshOp.cxx | 32 ++++-- src/SMESHGUI/SMESHGUI_MeshOp.h | 2 +- src/SMESH_PY/smeshstudytools.py | 4 +- src/SMESH_SWIG/smeshBuilder.py | 2 +- 16 files changed, 138 insertions(+), 95 deletions(-) diff --git a/doc/salome/examples/filters_ex01.py b/doc/salome/examples/filters_ex01.py index 88305c97f..8af735e71 100644 --- a/doc/salome/examples/filters_ex01.py +++ b/doc/salome/examples/filters_ex01.py @@ -1,4 +1,5 @@ # Aspect ratio +# This script demonstrates various usages of filters # create mesh from SMESH_mechanic import * diff --git a/doc/salome/examples/filters_ex09.py b/doc/salome/examples/filters_ex09.py index 9efa00871..dd6415930 100644 --- a/doc/salome/examples/filters_ex09.py +++ b/doc/salome/examples/filters_ex09.py @@ -1,23 +1,21 @@ # Free borders -# create mesh - -import salome +# initialize SALOME and modules +import salome, SMESH salome.salome_init() -import GEOM from salome.geom import geomBuilder geompy = geomBuilder.New(salome.myStudy) - -import SMESH, SALOMEDS from salome.smesh import smeshBuilder smesh = smeshBuilder.New(salome.myStudy) +# create mesh face = geompy.MakeFaceHW(100, 100, 1) geompy.addToStudy( face, "quadrangle" ) mesh = smesh.Mesh(face) mesh.Segment().NumberOfSegments(10) mesh.Triangle().MaxElementArea(25) mesh.Compute() + # get all free borders filter = smesh.GetFilter(SMESH.EDGE, SMESH.FT_FreeBorders) ids = mesh.GetIdsFromFilter(filter) diff --git a/doc/salome/examples/filters_ex10.py b/doc/salome/examples/filters_ex10.py index 423b91029..bf6f7419b 100644 --- a/doc/salome/examples/filters_ex10.py +++ b/doc/salome/examples/filters_ex10.py @@ -1,23 +1,21 @@ # Free edges -# create mesh - -import salome +# initialize SALOME and modules +import salome, SMESH salome.salome_init() -import GEOM from salome.geom import geomBuilder geompy = geomBuilder.New(salome.myStudy) - -import SMESH, SALOMEDS from salome.smesh import smeshBuilder smesh = smeshBuilder.New(salome.myStudy) +# create mesh face = geompy.MakeFaceHW(100, 100, 1) geompy.addToStudy( face, "quadrangle" ) mesh = smesh.Mesh(face) mesh.Segment().NumberOfSegments(10) mesh.Triangle().MaxElementArea(25) mesh.Compute() + # get all faces with free edges filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_FreeEdges) ids = mesh.GetIdsFromFilter(filter) diff --git a/doc/salome/examples/filters_ex13.py b/doc/salome/examples/filters_ex13.py index f56d39f84..8d8077083 100644 --- a/doc/salome/examples/filters_ex13.py +++ b/doc/salome/examples/filters_ex13.py @@ -4,7 +4,7 @@ from SMESH_mechanic import * # remove some faces to have faces with bare borders mesh.RemoveElements( mesh.GetElementsByType(SMESH.FACE)[0:5] ) -# get all faces bare borders +# get all faces with bare borders filter = smesh.GetFilter(SMESH.FACE, SMESH.FT_BareBorderFace) ids = mesh.GetIdsFromFilter(filter) print "Faces with bare borders:", ids diff --git a/doc/salome/examples/filters_ex17.py b/doc/salome/examples/filters_ex17.py index c3f80d65a..9dc01b49c 100644 --- a/doc/salome/examples/filters_ex17.py +++ b/doc/salome/examples/filters_ex17.py @@ -1,16 +1,12 @@ # Double nodes - import salome salome.salome_init() -import GEOM from salome.geom import geomBuilder geompy = geomBuilder.New(salome.myStudy) - -import SMESH, SALOMEDS +import SMESH from salome.smesh import smeshBuilder smesh = smeshBuilder.New(salome.myStudy) -import salome_notebook # make a mesh on a box box = geompy.MakeBoxDXDYDZ(100,100,100) @@ -20,8 +16,8 @@ mesh.Quadrangle() mesh.Hexahedron() mesh.Compute() # copy all elements with translation -mesh.TranslateObject( mesh, smesh.MakeDirStruct( 10,0,0), Copy=True ) -# create filters to find nodes equal within tolerance of 1e-5 +mesh.TranslateObject( mesh, [10,0,0], Copy=True ) +# create a filter to find nodes equal within tolerance of 1e-5 filter = smesh.GetFilter(SMESH.NODE, SMESH.FT_EqualNodes, Tolerance=1e-5) # get equal nodes print "Number of equal nodes:", len( mesh.GetIdsFromFilter( filter )) diff --git a/doc/salome/examples/filters_ex18.py b/doc/salome/examples/filters_ex18.py index 805f54e06..32950cc50 100644 --- a/doc/salome/examples/filters_ex18.py +++ b/doc/salome/examples/filters_ex18.py @@ -1,8 +1,25 @@ # Borders at multi-connection -# create mesh -from SMESH_mechanic import * -# get border edges with number of connected faces = 5 -filter = smesh.GetFilter(SMESH.EDGE, SMESH.FT_MultiConnection, 5) +import salome +salome.salome_init() +from salome.geom import geomBuilder +geompy = geomBuilder.New(salome.myStudy) +import SMESH +from salome.smesh import smeshBuilder +smesh = smeshBuilder.New(salome.myStudy) + +# make a mesh on a box +box = geompy.MakeBoxDXDYDZ(100,100,100) +mesh = smesh.Mesh( box, "Box" ) +mesh.Segment().NumberOfSegments(10) +mesh.Quadrangle() +mesh.Hexahedron() +mesh.Compute() +# copy all elements with translation and merge nodes +mesh.TranslateObject( mesh, [10,0,0], Copy=True ) +mesh.MergeNodes( mesh.FindCoincidentNodes( 1e-5 )) + +# get mesh edges with number of connected elements (faces and volumes) == 3 +filter = smesh.GetFilter(SMESH.EDGE, SMESH.FT_MultiConnection, 3) ids = mesh.GetIdsFromFilter(filter) -print "Number of border edges with 5 faces connected:", len(ids) +print "Number of border edges with 3 faces connected:", len(ids) diff --git a/doc/salome/gui/SMESH/images/bare_border_volumes_smpl.png b/doc/salome/gui/SMESH/images/bare_border_volumes_smpl.png index a1e799aa24f7f6356cafff6064981c648eb1c6a8..3508518fd1d8db83f741a7d3defd952539cbe4ff 100644 GIT binary patch literal 8103 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 TP&VMr`wr9dmWJi}*Y5rgGiEg( literal 7555 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 diff --git a/doc/salome/gui/SMESH/input/about_filters.doc b/doc/salome/gui/SMESH/input/about_filters.doc index f331fa4be..7468931a1 100644 --- a/doc/salome/gui/SMESH/input/about_filters.doc +++ b/doc/salome/gui/SMESH/input/about_filters.doc @@ -4,11 +4,11 @@ \b Filters allow picking only the mesh elements satisfying to a specific condition or a set of conditions. Filters can be used to create -or edit mesh groups, remove elements from the mesh object, control +or edit mesh groups, remove elements from the mesh, control mesh quality by different parameters, etc. Several criteria can be combined together by using logical operators \a -AND and \a OR. In addition, applied filter criterion can be reverted +AND and \a OR. In addition, a filter criterion can be reverted using logical operator \a NOT. Some filtering criteria use the functionality of \ref quality_page "mesh quality controls" @@ -27,6 +27,8 @@ about selection filters and their usage in GUI. entities (nodes or elements) for the operations, which require the list of entities as input parameter (create/modify group, remove nodes/elements, etc) and for the operations, which accept objects - as input parameter. The page \ref tui_filters_page provides - examples of the filters usage in Python scripts. + (groups, sub-meshes) as input parameter. The page \ref + tui_filters_page provides examples of the filters usage in Python + scripts. + */ diff --git a/doc/salome/gui/SMESH/input/about_meshes.doc b/doc/salome/gui/SMESH/input/about_meshes.doc index 621a47e99..1490bce12 100644 --- a/doc/salome/gui/SMESH/input/about_meshes.doc +++ b/doc/salome/gui/SMESH/input/about_meshes.doc @@ -100,7 +100,8 @@ The mesh can include the following entities: Every mesh entity has an attribute associating it to a sub-shape it is generated on (if any). The node generated on the geometrical edge or surface in addition stores its position in parametric space of the -associated geometrical entity. +associated geometrical entity. This attribute is set up by meshing +algorithms generating elements and nodes. Mesh entities are identified by integer IDs starting from 1. Nodes and elements are counted separately, i.e. there can be a node diff --git a/doc/salome/gui/SMESH/input/selection_filter_library.doc b/doc/salome/gui/SMESH/input/selection_filter_library.doc index c87d928e8..145c48fec 100644 --- a/doc/salome/gui/SMESH/input/selection_filter_library.doc +++ b/doc/salome/gui/SMESH/input/selection_filter_library.doc @@ -73,7 +73,9 @@ the filtering algorithm works faster because node-to-shape association is used instead of measuring distance between nodes and the shape, and \b Tolerance is not used. If the threshold shape is any other shape, the algorithm works slower because distance between nodes and the -shape is measured and is compared with \b Tolerance. +shape is measured and is compared with \b Tolerance. The latter +approach (distance measurement) is also used if an element is not +associated to any shape.
  • Lying on Geom selects entities whose at least one node lies on the shape defined by the Threshold Value. @@ -82,7 +84,9 @@ the filtering algorithm works faster because node-to-shape association is used instead of measuring distance between nodes and the shape, and \b Tolerance is not used. If the threshold shape is any other shape, the algorithm works slower because distance between nodes and the -shape is measured and is compared with \b Tolerance. +shape is measured and is compared with \b Tolerance. The latter +approach (distance measurement) is also used if an element is not +associated to any shape.
  • Belong to Mesh Group selects entities included into the mesh group defined by the Threshold Value. diff --git a/doc/salome/gui/SMESH/input/tui_filters.doc b/doc/salome/gui/SMESH/input/tui_filters.doc index cfe65fff5..7356103dc 100755 --- a/doc/salome/gui/SMESH/input/tui_filters.doc +++ b/doc/salome/gui/SMESH/input/tui_filters.doc @@ -6,7 +6,7 @@ Filters allow picking only the mesh elements satisfying to a specific condition or a set of conditions. Filters can be used to create -or edit mesh groups, remove elements from the mesh object, control +or edit mesh groups, remove elements from the mesh, control mesh quality by different parameters, etc. Several filtering criteria can be combined together by using logical @@ -24,7 +24,7 @@ Python scripts. \section filter_aspect_ratio Aspect ratio -Filter 2D mesh elements (faces) according to the aspect ratio value: +filters 2D mesh elements (faces) according to the aspect ratio value: - element type should be \a SMESH.FACE - functor type should be \a SMESH.FT_AspectRatio - threshold is floating point value (aspect ratio) @@ -35,7 +35,7 @@ Filter 2D mesh elements (faces) according to the aspect ratio value: \section filter_aspect_ratio_3d Aspect ratio 3D -Filter 3D mesh elements (volumes) according to the aspect ratio value: +filters 3D mesh elements (volumes) according to the aspect ratio value: - element type is \a SMESH.VOLUME - functor type is \a SMESH.FT_AspectRatio3D - threshold is floating point value (aspect ratio) @@ -46,7 +46,7 @@ Filter 3D mesh elements (volumes) according to the aspect ratio value: \section filter_warping_angle Warping angle -Filter 2D mesh elements (faces) according to the warping angle value: +filters 2D mesh elements (faces) according to the warping angle value: - element type is \a SMESH.FACE - functor type is \a SMESH.FT_Warping - threshold is floating point value (warping angle) @@ -57,7 +57,7 @@ Filter 2D mesh elements (faces) according to the warping angle value: \section filter_minimum_angle Minimum angle -Filter 2D mesh elements (faces) according to the minimum angle value: +filters 2D mesh elements (faces) according to the minimum angle value: - element type is \a SMESH.FACE - functor type is \a SMESH.FT_MinimumAngle - threshold is floating point value (minimum angle) @@ -68,7 +68,7 @@ Filter 2D mesh elements (faces) according to the minimum angle value: \section filter_taper Taper -Filter 2D mesh elements (faces) according to the taper value: +filters 2D mesh elements (faces) according to the taper value: - element type is \a SMESH.FACE - functor type is \a SMESH.FT_Taper - threshold is floating point value (taper) @@ -79,7 +79,7 @@ Filter 2D mesh elements (faces) according to the taper value: \section filter_skew Skew -Filter 2D mesh elements (faces) according to the skew value: +filters 2D mesh elements (faces) according to the skew value: - element type is \a SMESH.FACE - functor type is \a SMESH.FT_Skew - threshold is floating point value (skew) @@ -90,7 +90,7 @@ Filter 2D mesh elements (faces) according to the skew value: \section filter_area Area -Filter 2D mesh elements (faces) according to the area value: +filters 2D mesh elements (faces) according to the area value: - element type is \a SMESH.FACE - functor type is \a SMESH.FT_Area - threshold is floating point value (area) @@ -101,7 +101,7 @@ Filter 2D mesh elements (faces) according to the area value: \section filter_volume Volume -Filter 3D mesh elements (volumes) according to the volume value: +filters 3D mesh elements (volumes) according to the volume value: - element type is \a SMESH.VOLUME - functor type is \a SMESH.FT_Volume3D - threshold is floating point value (volume) @@ -112,7 +112,7 @@ Filter 3D mesh elements (volumes) according to the volume value: \section filter_free_borders Free borders -Filter 1D mesh elements (edges) which represent free borders of a mesh: +filters 1D mesh elements (edges) which represent free borders of a mesh: - element type is \a SMESH.EDGE - functor type is \a SMESH.FT_FreeBorders - threshold value is not required @@ -123,8 +123,8 @@ Filter 1D mesh elements (edges) which represent free borders of a mesh: \section filter_free_edges Free edges -Filter 2D mesh elements (faces) consisting of edges belonging to one -element of mesh only: +filters 2D mesh elements (faces) having edges (i.e. links between +nodes, not mesh segments) belonging to one face of mesh only: - element type is \a SMESH.FACE - functor type is \a SMESH.FT_FreeEdges - threshold value is not required @@ -135,7 +135,7 @@ element of mesh only: \section filter_free_nodes Free nodes -Filter free nodes: +filters free nodes: - element type is \a SMESH.NODE - functor type is \a SMESH.FT_FreeNodes - threshold value is not required @@ -146,7 +146,7 @@ Filter free nodes: \section filter_free_faces Free faces -Filter free faces: +filters free faces: - element type is \a SMESH.FACE - functor type is \a SMESH.FT_FreeFaces - threshold value is not required @@ -157,7 +157,7 @@ Filter free faces: \section filter_bare_border_faces Bare border faces -Filter faces with bare borders: +filters faces with bare borders: - element type is \a SMESH.FACE - functor type is \a SMESH.FT_BareBorderFace - threshold value is not required @@ -168,7 +168,7 @@ Filter faces with bare borders: \section filter_coplanar_faces Coplanar faces -Filter faces with bare borders: +filters coplanar faces: - element type is \a SMESH.FACE - functor type is \a SMESH.FT_CoplanarFaces - threshold value is the face ID @@ -178,7 +178,7 @@ Filter faces with bare borders: \section filter_over_constrained_faces Over-constrained faces -Filter over-constrained faces: +filters over-constrained faces: - element type is \a SMESH.FACE - functor type is \a SMESH.FT_OverConstrainedFace - threshold value is not required @@ -189,7 +189,7 @@ Filter over-constrained faces: \section filter_double_elements Double edges, Double faces, Double volumes -filter mesh elements basing on the same set of nodes: +filters mesh elements basing on the same set of nodes: - element type is either \a SMESH.EGDE, \a SMESH.FACE or \a SMESH.VOLUME - functor type is either \a SMESH.FT_EqualEdges, \a SMESH.FT_EqualFaces or \a SMESH.FT_EqualVolumes, @@ -211,8 +211,8 @@ filters mesh nodes which are coincident with other nodes (within a given toleran \section filter_borders_multiconnection Borders at multi-connection -Filter border 1D mesh elements (edges) according to the specified number of -connections (faces belonging the border edges) +filters 1D mesh elements (segments) according to the specified number of +connections (faces and volumes on whose border the segment lies): - element type is \a SMESH.EDGE - functor type is \a SMESH.FT_MultiConnection - threshold is integer value (number of connections) @@ -223,8 +223,8 @@ connections (faces belonging the border edges) \section filter_borders_multiconnection_2d Borders at multi-connection 2D -Filter 2D mesh elements (faces) which consist of edges belonging -to the specified number of mesh elements +filters 2D mesh elements (faces) with the specified maximal number of +faces connected to a border (link between nodes, not mesh segment): - element type is \a SMESH.FACE - functor type is \a SMESH.FT_MultiConnection2D - threshold is integer value (number of connections) @@ -235,7 +235,7 @@ to the specified number of mesh elements \section filter_length Length -Filter 1D mesh elements (edges) according to the edge length value: +filters 1D mesh elements (edges) according to the edge length value: - element type should be \a SMESH.EDGE - functor type should be \a SMESH.FT_Length - threshold is floating point value (length) @@ -246,8 +246,8 @@ Filter 1D mesh elements (edges) according to the edge length value: \section filter_length_2d Length 2D -Filter 2D mesh elements (faces) corresponding to the maximum length. -value of its edges: +filters 2D mesh elements (faces) according to the maximum length of its +edges (links between nodes): - element type should be \a SMESH.FACE - functor type should be \a SMESH.FT_Length2D - threshold is floating point value (edge length) @@ -258,11 +258,11 @@ value of its edges: \section filter_max_element_length_2d Element Diameter 2D -Filter 2D mesh elements (faces) corresponding to the maximum length -value of its edges and diagonals: +filters 2D mesh elements (faces) according to the maximum length +of its edges and diagonals: - element type should be \a SMESH.FACE - functor type should be \a SMESH.FT_MaxElementLength2D -- threshold is floating point value (edge/diagonal length) +- threshold is floating point value (length) \tui_script{filters_ex22.py} @@ -270,8 +270,8 @@ value of its edges and diagonals: \section filter_max_element_length_3d Element Diameter 3D -Filter 3D mesh elements (volumes) corresponding to the maximum length -value of its edges and diagonals: +filters 3D mesh elements (volumes) according to the maximum length +of its edges and diagonals: - element type should be \a SMESH.VOLUME - functor type should be \a SMESH.FT_MaxElementLength3D - threshold is floating point value (edge/diagonal length) @@ -282,7 +282,8 @@ value of its edges and diagonals: \section filter_bare_border_volumes Bare border volumes -Filter 3D mesh elements with bare borders: +filters 3D mesh elements with bare borders, i.e. having a facet not +shared with other volumes and without a face on it: - element type is \a SMESH.VOLUME - functor type is \a SMESH.FT_BareBorderVolume - threshold value is not required @@ -293,7 +294,7 @@ Filter 3D mesh elements with bare borders: \section filter_over_constrained_volumes Over-constrained volumes -Filter over-constrained volumes: +filters over-constrained volumes, whose all nodes are on the mesh boundary: - element type is \a SMESH.VOLUME - functor type is \a SMESH.FT_OverConstrainedVolume - threshold value is not required @@ -304,7 +305,7 @@ Filter over-constrained volumes: \section filter_belong_to_group Belong to Mesh Group -Filter mesh entities (nodes or elements) included in a mesh group +filters mesh entities (nodes or elements) included in a mesh group defined by threshold value: - element type can be any entity type, from \a SMESH.NODE to \a SMESH.VOLUME - functor type should be \a SMESH.FT_BelongToMeshGroup @@ -314,27 +315,31 @@ defined by threshold value: \section filter_belong_to_geom Belong to Geom -Filter mesh entities (nodes or elements) which all nodes lie on the +filters mesh entities (nodes or elements) which all nodes lie on the shape defined by threshold value: - element type can be any entity type, from \a SMESH.NODE to \a SMESH.VOLUME - functor type should be \a SMESH.FT_BelongToGeom - threshold is geometrical object +- tolerance is a distance between a node and the geometrical object; +it is used if an node is not associated to any geometry. \tui_script{filters_ex26.py} \section filter_lying_on_geom Lying on Geom -Filter mesh entities (nodes or elements) at least one node of which lies on the +filters mesh entities (nodes or elements) at least one node of which lies on the shape defined by threshold value: - element type can be any entity type, from \a SMESH.NODE to \a SMESH.VOLUME - functor type should be \a SMESH.FT_LyingOnGeom - threshold is geometrical object +- tolerance is a distance between a node and the geometrical object; +it is used if an node is not associated to any geometry. \tui_script{filters_ex27.py} \section filter_belong_to_plane Belong to Plane -Filter mesh entities (nodes or elements) which all nodes belong to the +filters mesh entities (nodes or elements) which all nodes belong to the plane defined by threshold value with the given tolerance: - element type can be: \a SMESH.NODE, \a SMESH.EDGE, \a SMESH.FACE - functor type should be \a SMESH.FT_BelongToPlane @@ -345,7 +350,7 @@ plane defined by threshold value with the given tolerance: \section filter_belong_to_cylinder Belong to Cylinder -Filter mesh entities (nodes or elements) which all nodes belong to the +filters mesh entities (nodes or elements) which all nodes belong to the cylindrical face defined by threshold value with the given tolerance: - element type can be: \a , \a SMESH.EDGE, \a SMESH.FACE - functor type should be \a SMESH.FT_BelongToCylinder @@ -356,7 +361,7 @@ cylindrical face defined by threshold value with the given tolerance: \section filter_belong_to_surface Belong to Surface -Filter mesh entities (nodes or elements) which all nodes belong to the +filters mesh entities (nodes or elements) which all nodes belong to the arbitrary surface defined by threshold value with the given tolerance: - element type can be: \a SMESH.NODE, \a SMESH.EDGE, \a SMESH.FACE - functor type should be \a SMESH.FT_BelongToGenSurface @@ -367,7 +372,7 @@ arbitrary surface defined by threshold value with the given tolerance: \section filter_range_of_ids Range of IDs -Filter mesh entities elements (nodes or elements) according to the +filters mesh entities elements (nodes or elements) according to the specified identifiers range: - element type can be any entity type, from \a SMESH.NODE to \a SMESH.VOLUME - functor type is \a SMESH.FT_RangeOfIds @@ -377,7 +382,7 @@ specified identifiers range: \section filter_bad_oriented_volume Badly oriented volume -Filter 3D mesh elements (volumes), which are incorrectly oriented from +filters 3D mesh elements (volumes), which are incorrectly oriented from the point of view of MED convention. - element type should be \a SMESH.VOLUME - functor type is \a SMESH.FT_BadOrientedVolume @@ -387,7 +392,7 @@ the point of view of MED convention. \section filter_linear_or_quadratic Linear / quadratic -Filter linear / quadratic mesh elements: +filters linear / quadratic mesh elements: - element type should be any element type, e.g.: \a SMESH.EDGE, \a SMESH.FACE, \a SMESH.VOLUME - functor type is \a SMESH.FT_LinearOrQuadratic - threshold is not required @@ -398,7 +403,7 @@ elements are selected, otherwise (by default) linear elements are selected \section filter_group_color Group color -Filter mesh entities, belonging to the group with the color defined by the threshold value. +filters mesh entities, belonging to the group with the color defined by the threshold value. - element type can be any entity type, from \a SMESH.NODE to \a SMESH.VOLUME - functor type is \a SMESH.FT_GroupColor - threshold should be of SALOMEDS.Color type @@ -407,7 +412,7 @@ Filter mesh entities, belonging to the group with the color defined by the thres \section filter_geom_type Geometry type -Filter mesh elements by the geometric type defined with the threshold +filters mesh elements by the geometric type defined with the threshold value. The list of available geometric types depends on the element entity type. - element type should be any element type, e.g.: \a SMESH.EDGE, \a SMESH.FACE, \a SMESH.VOLUME diff --git a/src/SMESHGUI/SMESHGUI_MeshDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshDlg.cxx index 4973a5d1e..253ef61b3 100644 --- a/src/SMESHGUI/SMESHGUI_MeshDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshDlg.cxx @@ -338,17 +338,24 @@ void SMESHGUI_MeshTab::setCurrentHyp( const int theId, const int theIndex ) } else // more than one additional hyp assigned { - // move a hyp from myHypCombo[ AddHyp ] to myAddHypList - for ( int i = 1, nb = myHypCombo[ AddHyp ]->count(); i < nb; ++i ) + if ( theIndex > 0 ) { - int curIndex = myHypCombo[ AddHyp ]->itemData( i ).toInt(); - if ( theIndex == curIndex ) + // move a hyp from myHypCombo[ AddHyp ] to myAddHypList + for ( int i = 1, nb = myHypCombo[ AddHyp ]->count(); i < nb; ++i ) { - addItem( myHypCombo[ AddHyp ]->itemText( i ), theId, theIndex ); - myHypCombo[ AddHyp ]->removeItem( i ); - break; + int curIndex = myHypCombo[ AddHyp ]->itemData( i ).toInt(); + if ( theIndex == curIndex ) + { + addItem( myHypCombo[ AddHyp ]->itemText( i ), theId, theIndex ); + myHypCombo[ AddHyp ]->removeItem( i ); + break; + } } } + else + { + myAddHypList->clear(); + } } } diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx index 69053214a..cc873f15b 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx @@ -2010,6 +2010,9 @@ int SMESHGUI_MeshOp::currentHyp( const int theDim, const int theHypType ) const bool SMESHGUI_MeshOp::isSelectedHyp( int theDim, int theHypType, int theIndex) const { + if ( theIndex < 0 ) + return false; + if ( theHypType < AddHyp ) // only one hyp can be selected return currentHyp( theDim, theHypType ) == theIndex; @@ -2050,17 +2053,28 @@ bool SMESHGUI_MeshOp::isAccessibleDim( const int theDim ) const * \param theDim - dimension of hypothesis or algorithm * \param theHypType - Type of hypothesis (Algo, MainHyp, AddHyp) * \param theIndex - Index of hypothesis + * \param updateHypsOnAlgoDeselection - to clear and disable hyps if algo deselected * * Gets current hypothesis or algorithms */ //================================================================================ -void SMESHGUI_MeshOp::setCurrentHyp( const int theDim, - const int theHypType, - const int theIndex ) +void SMESHGUI_MeshOp::setCurrentHyp( const int theDim, + const int theHypType, + const int theIndex, + const bool updateHypsOnAlgoDeselection) { myIgnoreAlgoSelection = true; myDlg->tab( theDim )->setCurrentHyp( theHypType, theIndex + 1 ); myIgnoreAlgoSelection = false; + + if ( updateHypsOnAlgoDeselection && theHypType == Algo && theIndex < 0 ) + { + const QStringList noHyps; + myDlg->tab( theDim )->setAvailableHyps( MainHyp, noHyps ); + myDlg->tab( theDim )->setExistingHyps ( MainHyp, noHyps ); + myDlg->tab( theDim )->setAvailableHyps( AddHyp, noHyps ); + myDlg->tab( theDim )->setExistingHyps ( AddHyp, noHyps ); + } } //================================================================================ @@ -2645,7 +2659,7 @@ void SMESHGUI_MeshOp::setAvailableMeshType( const QStringList& theTypeMesh ) * \param theIndex - Index of current type of mesh */ //================================================================================ -void SMESHGUI_MeshOp::onAlgoSetByMeshType( const int theTabIndex, const int theIndex) +void SMESHGUI_MeshOp::onAlgoSetByMeshType( const int theTabIndex, const int theIndex ) { setFilteredAlgoData( theTabIndex, theIndex); } @@ -2705,8 +2719,8 @@ void SMESHGUI_MeshOp::setFilteredAlgoData( const int theTabIndex, const int theI } else for ( int i = SMESH::DIM_0D; i <= SMESH::DIM_3D; i++ ) { - if ( i > myMaxShapeDim || ( isReqDisBound && i != aReqDim ) ) myDlg->disableTab( i ); - else myDlg->enableTab( i ); + if ( i > myMaxShapeDim || ( isReqDisBound && i < aReqDim ) ) myDlg->disableTab( i ); + else myDlg->enableTab( i ); } myDlg->setCurrentTab( theTabIndex ); } @@ -2740,7 +2754,7 @@ void SMESHGUI_MeshOp::setFilteredAlgoData( const int theTabIndex, const int theI //set new algorithm list and select the current algorithm myDlg->tab( dim )->setAvailableHyps( Algo, anAvailableAlgs ); anCurrentCompareType = ( anCompareType == "HEXA" || anCompareType == "QUAD" ) ? "QUAD" : "TRIA"; - setCurrentHyp( dim, Algo, anCurrentAvailableAlgo ); + setCurrentHyp( dim, Algo, anCurrentAvailableAlgo, /*updateHyps=*/true ); } for ( int i = myMaxShapeDim; i >= SMESH::DIM_0D; i-- ) { @@ -2753,7 +2767,7 @@ void SMESHGUI_MeshOp::setFilteredAlgoData( const int theTabIndex, const int theI for (int j = myMaxShapeDim; j >= SMESH::DIM_0D; j--) { if ( currentHyp( j, Algo ) < 0 ) { myDlg->disableTab( j ); - setCurrentHyp( j , Algo, -1 ); + setCurrentHyp( j , Algo, -1, /*updateHyps=*/true ); } } break; @@ -2763,8 +2777,8 @@ void SMESHGUI_MeshOp::setFilteredAlgoData( const int theTabIndex, const int theI } } if ( aDim == SMESH::DIM_2D) { + setCurrentHyp( SMESH::DIM_3D, Algo, -1, /*updateHyps=*/true ); myDlg->disableTab( SMESH::DIM_3D ); - setCurrentHyp( SMESH::DIM_3D, Algo, -1); } int currentTab = ( theTabIndex <= aDim ) ? theTabIndex : aDim; diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.h b/src/SMESHGUI/SMESHGUI_MeshOp.h index 35bd50672..6d26686b4 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.h +++ b/src/SMESHGUI/SMESHGUI_MeshOp.h @@ -128,7 +128,7 @@ private: bool isSelectedHyp( int, int, int ) const; int nbDlgHypTypes( const int ) const; bool isAccessibleDim( const int ) const; - void setCurrentHyp( const int, const int, const int ); + void setCurrentHyp( const int, const int, const int, const bool=false); void setDefaultName( const QString& prefix="" ) const; SMESH::SMESH_Hypothesis_var getAlgo( const int ); void readMesh(); diff --git a/src/SMESH_PY/smeshstudytools.py b/src/SMESH_PY/smeshstudytools.py index 51bcc3567..7d4277211 100644 --- a/src/SMESH_PY/smeshstudytools.py +++ b/src/SMESH_PY/smeshstudytools.py @@ -127,8 +127,8 @@ class SMeshStudyTools: from salome.smesh import smeshBuilder smesh = smeshBuilder.New(self.editor.study) - meshObject=smesh.IDToObject(entry) - return meshObject + meshObject=salome.IDToObject(entry) + return smesh.Mesh( meshObject ) ## Returns the SMESH object associated to the specified \em SObject, # (the SObject is an item in the objects browser). diff --git a/src/SMESH_SWIG/smeshBuilder.py b/src/SMESH_SWIG/smeshBuilder.py index 2c98e1653..67e3c71b3 100644 --- a/src/SMESH_SWIG/smeshBuilder.py +++ b/src/SMESH_SWIG/smeshBuilder.py @@ -1970,7 +1970,7 @@ class Mesh: # @param groupName the name of the mesh group # @param elementType the type of elements in the group; either of # (SMESH.NODE, SMESH.EDGE, SMESH.FACE, SMESH.VOLUME). - # @param elemIDs the list of ids + # @param elemIDs either the list of ids, group, sub-mesh, or filter # @return SMESH_Group # @ingroup l2_grps_create def MakeGroupByIds(self, groupName, elementType, elemIDs): -- 2.30.2