From 18e7b9c7521fc13f643973ea953b08bdbf6dfbda Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 4 Sep 2015 16:55:55 +0300 Subject: [PATCH] IPAL52860: Free Edges control mis-location and mis-visibility IPAL19098: Confusing "Precision" of "Average Length" implemented for NPAL17873 --- doc/salome/gui/SMESH/images/free_borders1.png | Bin 5648 -> 1830 bytes .../gui/SMESH/input/1d_meshing_hypo.doc | 17 +++++++++------ .../SMESH/input/about_quality_controls.doc | 2 +- doc/salome/gui/SMESH/input/free_borders.doc | 10 +++++---- doc/salome/gui/SMESH/input/free_edges.doc | 2 +- .../SMESH/input/selection_filter_library.doc | 20 ++++++++++-------- src/Controls/SMESH_Controls.cxx | 19 ++++------------- src/SMESHGUI/SMESHGUI.cxx | 15 +++++++------ src/StdMeshers/StdMeshers_Adaptive1D.cxx | 5 +++-- src/StdMeshers/StdMeshers_Penta_3D.cxx | 2 +- src/StdMeshers/StdMeshers_Quadrangle_2D.cxx | 6 ++++-- .../StdMeshers_RadialQuadrangle_1D2D.cxx | 3 +-- 12 files changed, 51 insertions(+), 50 deletions(-) mode change 100755 => 100644 doc/salome/gui/SMESH/images/free_borders1.png diff --git a/doc/salome/gui/SMESH/images/free_borders1.png b/doc/salome/gui/SMESH/images/free_borders1.png old mode 100755 new mode 100644 index 6e73c93291d6775cc2cb50940c55311723a46230..871beba86c569a21274533a7be32a08b11f848ef GIT binary patch literal 1830 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 of segments, +calculated by dividing the edge length by the specified \b length of +segment, to the higher integer if the \a remainder exceeds the \b precision +and to the lower integer otherwise.
+Use value 0.5 to provide rounding to the nearest integer, 1.0 for the lower integer, 0.0 for the higher integer. Default value is 1e-07. + +For example: if edge length is 10.0 and the segment \b length +is 3.0 then their division gives 10./3. = 3.33(3) and the \a remainder is 0.33(3). +If \b precision is less than 0.33(3) then the edge is divided into 3 segments. +If \b precision is more than 0.33(3) then the edge is divided into 4 segments. + \image html image41.gif diff --git a/doc/salome/gui/SMESH/input/about_quality_controls.doc b/doc/salome/gui/SMESH/input/about_quality_controls.doc index 1e170e440..9dbb5c992 100644 --- a/doc/salome/gui/SMESH/input/about_quality_controls.doc +++ b/doc/salome/gui/SMESH/input/about_quality_controls.doc @@ -24,7 +24,6 @@ Node quality controls: Edge quality controls:
    -
  • \subpage free_edges_page "Free edges"
  • \subpage free_borders_page "Free borders"
  • \subpage length_page "Length"
  • \subpage borders_at_multi_connection_page "Borders at multi-connection"
    • @@ -33,6 +32,7 @@ Edge quality controls: Face quality controls:
      +
    • \subpage free_edges_page "Free edges"
    • \subpage free_faces_page "Free faces"
    • \subpage bare_border_faces_page "Bare border faces"
    • \subpage over_constrained_faces_page "Over-constrained faces"
      • diff --git a/doc/salome/gui/SMESH/input/free_borders.doc b/doc/salome/gui/SMESH/input/free_borders.doc index 86e5e2a37..3a8497c30 100644 --- a/doc/salome/gui/SMESH/input/free_borders.doc +++ b/doc/salome/gui/SMESH/input/free_borders.doc @@ -2,14 +2,16 @@ \page free_borders_page Free borders -\n This mesh quality control highlights borders of faces consisting of -1D elements (segments) belonging to one face only. +\n This mesh quality control highlights 1D elements (segments) +belonging to one element (face or volume) only. \image html free_borders1.png -In this picture the free borders are displayed in white. +In this picture the free borders are displayed in red. (Faces are +explicitly shown via Display Entity menu as all elements but +segments are hidden upon this control activation).
      See Also a sample TUI Script of a \ref tui_free_borders "Free Borders quality control" operation. -*/ \ No newline at end of file +*/ diff --git a/doc/salome/gui/SMESH/input/free_edges.doc b/doc/salome/gui/SMESH/input/free_edges.doc index 1a5720ee2..2e9d4a6ec 100644 --- a/doc/salome/gui/SMESH/input/free_edges.doc +++ b/doc/salome/gui/SMESH/input/free_edges.doc @@ -3,7 +3,7 @@ \page free_edges_page Free edges \n This mesh quality control highlights borders of faces -consisting of node links belonging to one face only. +(links between nodes, not mesh segments) belonging to one face only. \image html free_edges.png
      In this picture some elements of mesh have been deleted and diff --git a/doc/salome/gui/SMESH/input/selection_filter_library.doc b/doc/salome/gui/SMESH/input/selection_filter_library.doc index ed93878cb..6acd7e751 100644 --- a/doc/salome/gui/SMESH/input/selection_filter_library.doc +++ b/doc/salome/gui/SMESH/input/selection_filter_library.doc @@ -2,9 +2,11 @@ \page selection_filter_library_page Selection filter library -\n Selection filter library is a powerful tool enabling to create -filters to be used on meshes. You can access to it from the Main Menu -via Tools / Selection filter library. +\n Selection filter library allows creating and storing in files +filters that can be later reused for operations on meshes. You can +access to it from the Main Menu via Tools / Selection filter library. +It is also possible to save any filter by invoking the filter library +from \a Filter dialog launched from any mesh operation. \image html selectionfilterlibrary.png @@ -20,7 +22,9 @@ filter. By default it is prefixed with the corresponding entity type. When we use filters during a group creation or another operation (by clicking Set Filter button in the corresponding dialog), the -menu for setting filters looks as shown below. +dialog for setting filters looks as shown below. + +\image html a-filteronfaces.png The \b Add button creates a new criterion at the end of the list of criteria. The \b Insert button creates a new criterion before the @@ -56,8 +60,6 @@ in the Library. is no selected mesh in the Object Browser and the filter can not be created. You have to select the mesh and the button will be enabled. -\image html a-filteronfaces.png - Some criteria are applicable to all Entity types:
      • Belong to Geom selects entities whose all nodes lie on the @@ -133,7 +135,7 @@ See also \ref tui_double_nodes_control "Double Nodes quality control". The following criteria allow selecting mesh Edges:
        • Free Borders selects free 1D mesh elements, i.e. edges belonging to -one face only. See also a +one element (face or volume) only. See also a \ref free_borders_page "Free Borders quality control".
        • Double edges selects 1D mesh elements basing on the same set of nodes. @@ -177,8 +179,8 @@ The following criteria allow selecting mesh Faces: \ref area_page "Area quality control"), which is more, less or equal (within a given Tolerance) to the predefined Threshold Value.
        • -Free edges selects 2D mesh elements consisting of edges belonging to -one element of mesh only. See also a +Free edges selects 2D mesh elements having at least one of its +edges not shared with other faces. See also a \ref free_edges_page "Free Edges quality control".
        • Free faces selects 2D mesh elements, which belong to less than two volumes. diff --git a/src/Controls/SMESH_Controls.cxx b/src/Controls/SMESH_Controls.cxx index c70528f27..65ff05b9b 100644 --- a/src/Controls/SMESH_Controls.cxx +++ b/src/Controls/SMESH_Controls.cxx @@ -135,8 +135,8 @@ namespace { int aResult0 = 0, aResult1 = 0; // last node, it is a medium one in a quadratic edge const SMDS_MeshNode* aLastNode = anEdge->GetNode( anEdge->NbNodes() - 1 ); - const SMDS_MeshNode* aNode0 = anEdge->GetNode( 0 ); - const SMDS_MeshNode* aNode1 = anEdge->GetNode( 1 ); + const SMDS_MeshNode* aNode0 = anEdge->GetNode( 0 ); + const SMDS_MeshNode* aNode1 = anEdge->GetNode( 1 ); if ( aNode1 == aLastNode ) aNode1 = 0; SMDS_ElemIteratorPtr anElemIter = aLastNode->GetInverseElementIterator(); @@ -2429,26 +2429,15 @@ bool FreeEdges::IsSatisfy( long theId ) if ( aFace == 0 || aFace->GetType() != SMDSAbs_Face || aFace->NbNodes() < 3 ) return false; - SMDS_ElemIteratorPtr anIter; - if ( aFace->IsQuadratic() ) { - anIter = dynamic_cast - (aFace)->interlacedNodesElemIterator(); - } - else { - anIter = aFace->nodesIterator(); - } + SMDS_NodeIteratorPtr anIter = aFace->interlacedNodesIterator(); if ( !anIter ) return false; int i = 0, nbNodes = aFace->NbNodes(); std::vector aNodes( nbNodes+1 ); while( anIter->more() ) - { - const SMDS_MeshNode* aNode = (SMDS_MeshNode*)anIter->next(); - if ( aNode == 0 ) + if ( ! ( aNodes[ i++ ] = anIter->next() )) return false; - aNodes[ i++ ] = aNode; - } aNodes[ nbNodes ] = aNodes[ 0 ]; for ( i = 0; i < nbNodes; i++ ) diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index 6271fe857..4b0c895ed 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -1677,7 +1677,7 @@ namespace if(!anIO.IsNull()){ _PTR(SObject) SO = aStudy->FindObjectID( It.Value()->getEntry() ); if ( SO ) { - CORBA::Object_var aObject = SMESH::SObjectToObject( SO ); + CORBA::Object_var aObject = SMESH::SObjectToObject( SO ); SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( aObject ); SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow( aObject ); SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow( aObject ); @@ -4366,7 +4366,8 @@ void SMESHGUI::initialize( CAM_Application* app ) hasElems0d("({'Elem0d'} in elemTypes)"), hasEdges("({'Edge'} in elemTypes)"), hasFaces("({'Face'} in elemTypes)"), - hasVolumes("({'Volume'} in elemTypes)"); + hasVolumes("({'Volume'} in elemTypes)"), + hasFacesOrVolumes("(({'Face'} in elemTypes) || ({'Volume'} in elemTypes)) "); createPopupItem( SMESHOp::OpFileInformation, OB, mesh, "&& selcount=1 && isImported" ); createPopupItem( SMESHOp::OpCreateSubMesh, OB, mesh, "&& isComputable"); @@ -4577,12 +4578,8 @@ void SMESHGUI::initialize( CAM_Application* app ) aSubId = popupMgr()->insert( tr( "MEN_EDGE_CTRL" ), anId, -1 ); // EDGE CONTROLS - popupMgr()->insert( action( SMESHOp::OpFreeEdge ), aSubId, -1 ); - popupMgr()->setRule( action( SMESHOp::OpFreeEdge ), aMeshInVtkHasEdges, QtxPopupMgr::VisibleRule ); - popupMgr()->setRule( action( SMESHOp::OpFreeEdge ), "controlMode = 'eFreeEdges'", QtxPopupMgr::ToggleRule ); - popupMgr()->insert( action( SMESHOp::OpFreeBorder ), aSubId, -1 ); - popupMgr()->setRule( action( SMESHOp::OpFreeBorder ), aMeshInVtkHasEdges, QtxPopupMgr::VisibleRule ); + popupMgr()->setRule( action( SMESHOp::OpFreeBorder ), aMeshInVTK + "&&" + hasEdges + "&&" + hasFacesOrVolumes, QtxPopupMgr::VisibleRule ); popupMgr()->setRule( action( SMESHOp::OpFreeBorder ), "controlMode = 'eFreeBorders'", QtxPopupMgr::ToggleRule ); popupMgr()->insert( action( SMESHOp::OpLength ), aSubId, -1 ); @@ -4598,6 +4595,10 @@ void SMESHGUI::initialize( CAM_Application* app ) aSubId = popupMgr()->insert( tr( "MEN_FACE_CTRL" ), anId, -1 ); // FACE CONTROLS + popupMgr()->insert( action( SMESHOp::OpFreeEdge ), aSubId, -1 ); + popupMgr()->setRule( action( SMESHOp::OpFreeEdge ), aMeshInVtkHasFaces, QtxPopupMgr::VisibleRule ); + popupMgr()->setRule( action( SMESHOp::OpFreeEdge ), "controlMode = 'eFreeEdges'", QtxPopupMgr::ToggleRule ); + popupMgr()->insert ( action( SMESHOp::OpFreeFace ), aSubId, -1 ); popupMgr()->setRule( action( SMESHOp::OpFreeFace ), aMeshInVtkHasFaces /*aMeshInVtkHasVolumes*/, QtxPopupMgr::VisibleRule ); diff --git a/src/StdMeshers/StdMeshers_Adaptive1D.cxx b/src/StdMeshers/StdMeshers_Adaptive1D.cxx index 45e22ebb3..946c200df 100644 --- a/src/StdMeshers/StdMeshers_Adaptive1D.cxx +++ b/src/StdMeshers/StdMeshers_Adaptive1D.cxx @@ -1260,7 +1260,7 @@ bool AdaptiveAlgo::Compute(SMESH_Mesh & theMesh, double maxSegSize = 0; // get points to check distance to the face - EdgeData::TPntIter pIt2 = eData.myPoints.begin(), pIt1 = pIt2++; + EdgeData::TPntIter pIt2 = eData.myPoints.begin(), pIt1 = pIt2++, pItLast; maxSegSize = pIt1->mySegSize = Min( pIt1->mySegSize, sizeTree.GetSize( pIt1->myP )); for ( ; pIt2 != eData.myPoints.end(); ) { @@ -1290,6 +1290,7 @@ bool AdaptiveAlgo::Compute(SMESH_Mesh & theMesh, //cout << "E " << theMesh.GetMeshDS()->ShapeToIndex( eData.Edge() ) << endl; sizeDecreased = false; const gp_Pnt* avoidPnt = & eData.First().myP; + pItLast = --eData.myPoints.end(); for ( pIt1 = eData.myPoints.begin(); pIt1 != eData.myPoints.end(); ) { double distToFace = @@ -1316,7 +1317,7 @@ bool AdaptiveAlgo::Compute(SMESH_Mesh & theMesh, pIt1->mySegSize = allowedSize; } ++pIt1; - if ( & (*pIt1) == & eData.Last() ) + if ( pIt1 == pItLast ) avoidPnt = & eData.Last().myP; else avoidPnt = NULL; diff --git a/src/StdMeshers/StdMeshers_Penta_3D.cxx b/src/StdMeshers/StdMeshers_Penta_3D.cxx index 20f1ff59d..6d99a44de 100644 --- a/src/StdMeshers/StdMeshers_Penta_3D.cxx +++ b/src/StdMeshers/StdMeshers_Penta_3D.cxx @@ -657,7 +657,7 @@ void StdMeshers_Penta_3D::MakeVolumeMesh() } // // 2. Make pentahedrons - int aID0, k , aJ[3]; + int aID0, k , aJ[4]; vector aN; // SMDS_ElemIteratorPtr itf, aItNodes; diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx index 4cd7ccf9a..1e35cb60b 100644 --- a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx +++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx @@ -5072,8 +5072,10 @@ int StdMeshers_Quadrangle_2D::splitQuad(FaceQuadStruct::Ptr quad, int I, int J) // << " L " << &quad->side[ QUAD_LEFT_SIDE ] << " "<< quad->side[ QUAD_LEFT_SIDE].NbPoints() // << " R " << &quad->side[ QUAD_RIGHT_SIDE ] << " "<< quad->side[ QUAD_RIGHT_SIDE].NbPoints()<< endl; - newQuad->side[ QUAD_RIGHT_SIDE ].to = iRgt+1; - newQuad->side[ QUAD_LEFT_SIDE ].to = iLft+1; + bool rRev = newQuad->side[ QUAD_RIGHT_SIDE ].IsReversed(); + bool lRev = newQuad->side[ QUAD_LEFT_SIDE ].IsReversed(); + newQuad->side[ QUAD_RIGHT_SIDE ].to = iRgt + ( rRev ? -1 : +1 ); + newQuad->side[ QUAD_LEFT_SIDE ].to = iLft + ( lRev ? -1 : +1 ); newQuad->name = ( TComm("Below J=") << J ); quad->side[ QUAD_RIGHT_SIDE ].from = iRgt; diff --git a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx index 204682ea9..03395bd10 100644 --- a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx +++ b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx @@ -930,8 +930,7 @@ bool StdMeshers_RadialQuadrangle_1D2D::Compute(SMESH_Mesh& aMesh, //cout<<"Angles.Length() = "<