0022364: EDF SMESH: Create Mesh dialog box improvement: hide inapplicable algorithms...

[modules/smesh.git] / src / StdMeshers / StdMeshers_Hexa_3D.cxx

diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.cxx b/src/StdMeshers/StdMeshers_Hexa_3D.cxx
index fd67131876cd7fd9ea1c58ff1375233379370f31..2ac7cafeb43d3559a90c68f8d76c21daad3de73e 100644 (file)
--- a/src/StdMeshers/StdMeshers_Hexa_3D.cxx
+++ b/src/StdMeshers/StdMeshers_Hexa_3D.cxx
@@ -760,18 +760,20 @@ bool StdMeshers_Hexa_3D::IsApplicable( const TopoDS_Shape & aShape, bool toCheck
   if ( !exp0.More() ) return false;
   for ( ; exp0.More(); exp0.Next() )
   {
-    nbFoundShells = 1;
+    nbFoundShells = 0;
     isCurShellApp = false;
-    for (TopExp_Explorer exp1( exp0.Current(), TopAbs_SHELL ); exp1.More(); exp1.Next(), ++nbFoundShells){
-      if ( nbFoundShells == 2 ) {
-        if ( toCheckAll ) return false;
-        break;
-      }
-      const TopoDS_Shell& shell = TopoDS::Shell(exp1.Current());
-      isCurShellApp = SMESH_Block::FindBlockShapes(shell, theVertex0, theVertex1, theShapeIDMap );
-      if ( toCheckAll && !isCurShellApp ) return false;
-    }
-    if( !toCheckAll && isCurShellApp ) return true;
+    TopExp_Explorer exp1( exp0.Current(), TopAbs_SHELL );
+    for ( ; exp1.More(); exp1.Next(), ++nbFoundShells)
+      if ( nbFoundShells == 2 ) break;
+    if ( nbFoundShells == 2){
+      if ( toCheckAll ) return false;
+      continue;
+    }   
+    exp1.Init( exp0.Current(), TopAbs_SHELL );
+    const TopoDS_Shell& shell = TopoDS::Shell(exp1.Current());
+    isCurShellApp = SMESH_Block::FindBlockShapes(shell, theVertex0, theVertex1, theShapeIDMap );
+    if ( toCheckAll && !isCurShellApp ) return false;
+    if ( !toCheckAll && isCurShellApp ) return true;
   }
   return toCheckAll;
 };