X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_GroupOnGeom.cxx;h=ba68de56754cf59b1f90a3f602c3b4a156ab9445;hp=51d7620280c2163ea8aae6de809f8fc9dd8bab51;hb=baf83bed4152b4ac101ebe43f442a4f8a1acd712;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6

diff --git a/src/SMESHDS/SMESHDS_GroupOnGeom.cxx b/src/SMESHDS/SMESHDS_GroupOnGeom.cxx
index 51d762028..ba68de567 100644
--- a/src/SMESHDS/SMESHDS_GroupOnGeom.cxx
+++ b/src/SMESHDS/SMESHDS_GroupOnGeom.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -66,13 +66,17 @@ class MyIterator: public SMDS_ElemIterator
   MyIterator(SMDSAbs_ElementType type, const SMESHDS_SubMesh* subMesh)
     : myType(type), myElem(0)
   {
-    if ( subMesh ) {
-      if ( myType == SMDSAbs_Node )
+    if ( subMesh )
+    {
+      if ( myType == SMDSAbs_Node ||
+           myType == SMDSAbs_0DElement ||
+           myType == SMDSAbs_Ball )
         myNodeIt = subMesh->GetNodes();
-      else {
+      else
         myElemIt = subMesh->GetElements();
+
+      if ( myType != SMDSAbs_Node )
         next();
-      }
     }
   }
   bool more()
@@ -85,15 +89,30 @@ class MyIterator: public SMDS_ElemIterator
   {
     if ( myType == SMDSAbs_Node && myNodeIt )
       return myNodeIt->next();
+
     const SMDS_MeshElement* res = myElem;
     myElem = 0;
-    while ( myElemIt && myElemIt->more() ) {
-      myElem = myElemIt->next();
-      if ( myElem && myElem->GetType() == myType )
-        break;
-      else
-        myElem = 0;
-    }
+
+    if ( myElemIt )
+      while ( myElemIt->more() ) {
+        myElem = myElemIt->next();
+        if ( myElem && myElem->GetType() == myType )
+          break;
+        else
+          myElem = 0;
+      }
+
+    if ( !myElem && myNodeIt ) // look for a 0D element
+      while ( myNodeIt->more() ) {
+        const SMDS_MeshNode* n = myNodeIt->next();
+        if (( myElemIt = n->GetInverseElementIterator( myType )) &&
+            ( myElemIt->more() ))
+        {
+          myElem = myElemIt->next();
+          break;
+        }
+      }
+
     return res;
   }
 };
@@ -125,6 +144,10 @@ bool SMESHDS_GroupOnGeom::Contains (const int theID)
 
 bool SMESHDS_GroupOnGeom::Contains (const SMDS_MeshElement* elem)
 {
+  if ( GetType() == SMDSAbs_0DElement ||
+       GetType() == SMDSAbs_Ball )
+    return elem ? mySubMesh->Contains( elem->GetNode(0) ) : false;
+
   return mySubMesh->Contains( elem );
 }