From: eap Date: Mon, 3 Mar 2014 11:00:39 +0000 (+0400) Subject: 22364: EDF SMESH: Create Mesh dialog box improvement: hide inapplicable algorithms... X-Git-Tag: V7_4_0a1~48 X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=457be093383be01f6f44d4762e64490e483b7322 22364: EDF SMESH: Create Mesh dialog box improvement: hide inapplicable algorithms/hypotheses Minor fixes --- diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.cxx b/src/StdMeshers/StdMeshers_Hexa_3D.cxx index 2ac7cafeb..d63ed2641 100644 --- a/src/StdMeshers/StdMeshers_Hexa_3D.cxx +++ b/src/StdMeshers/StdMeshers_Hexa_3D.cxx @@ -746,7 +746,7 @@ bool StdMeshers_Hexa_3D::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHelper * \brief Return true if the algorithm can mesh this shape * \param [in] aShape - shape to check * \param [in] toCheckAll - if true, this check returns OK if all shapes are OK, - * else, returns OK if all at least one shape is OK + * else, returns OK if at least one shape is OK */ //================================================================================ @@ -765,7 +765,7 @@ bool StdMeshers_Hexa_3D::IsApplicable( const TopoDS_Shape & aShape, bool toCheck TopExp_Explorer exp1( exp0.Current(), TopAbs_SHELL ); for ( ; exp1.More(); exp1.Next(), ++nbFoundShells) if ( nbFoundShells == 2 ) break; - if ( nbFoundShells == 2){ + if ( nbFoundShells != 1 ) { if ( toCheckAll ) return false; continue; } diff --git a/src/StdMeshers/StdMeshers_Prism_3D.cxx b/src/StdMeshers/StdMeshers_Prism_3D.cxx index 5a1be1b5f..71412270d 100644 --- a/src/StdMeshers/StdMeshers_Prism_3D.cxx +++ b/src/StdMeshers/StdMeshers_Prism_3D.cxx @@ -2134,7 +2134,7 @@ namespace // utils used by StdMeshers_Prism_3D::IsApplicable() * \brief Return true if the algorithm can mesh this shape * \param [in] aShape - shape to check * \param [in] toCheckAll - if true, this check returns OK if all shapes are OK, - * else, returns OK if all at least one shape is OK + * else, returns OK if at least one shape is OK */ //================================================================================ diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx index 7b37553fd..52bdb0aa5 100644 --- a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx +++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx @@ -909,7 +909,7 @@ bool StdMeshers_Quadrangle_2D::Evaluate(SMESH_Mesh& aMesh, * \brief Return true if the algorithm can mesh this shape * \param [in] aShape - shape to check * \param [in] toCheckAll - if true, this check returns OK if all shapes are OK, - * else, returns OK if all at least one shape is OK + * else, returns OK if at least one shape is OK */ //================================================================================ @@ -939,7 +939,7 @@ bool StdMeshers_Quadrangle_2D::IsApplicable( const TopoDS_Shape & aShape, bool t if ( !toCheckAll && nbNoDegenEdges >= 3 ) return true; } return ( toCheckAll && nbFoundFaces != 0 ); -}; +} //================================================================================ /*! diff --git a/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx b/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx index ab9594c0e..17411417e 100644 --- a/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx +++ b/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx @@ -604,7 +604,7 @@ bool StdMeshers_RadialPrism_3D::Evaluate(SMESH_Mesh& aMesh, * \brief Return true if the algorithm can mesh this shape * \param [in] aShape - shape to check * \param [in] toCheckAll - if true, this check returns OK if all shapes are OK, - * else, returns OK if all at least one shape is OK + * else, returns OK if at least one shape is OK */ //================================================================================