23636: EDF 18217 - Problem when suppressing CAD

[modules/smesh.git] / src / SMESHDS / SMESHDS_Group.cxx

diff --git a/src/SMESHDS/SMESHDS_Group.cxx b/src/SMESHDS/SMESHDS_Group.cxx
index 21a2ebbe236969fe7be43c32f7f0d23617d17ee0..ebcf125d3888e8cad550e0c202d869790fa66db6 100644 (file)
--- a/src/SMESHDS/SMESHDS_Group.cxx
+++ b/src/SMESHDS/SMESHDS_Group.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  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
@@ -19,17 +19,13 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-//  SMESH SMESHDS : idl implementation based on 'SMESH' unit's classes
 //  File   : SMESHDS_Group.cxx
 //  Module : SMESH
-//  $Header$
 //
+
 #include "SMESHDS_Group.hxx"
 #include "SMESHDS_Mesh.hxx"
 
-using namespace std;
-
 //=============================================================================
 /*!
  *  
@@ -39,8 +35,8 @@ using namespace std;
 SMESHDS_Group::SMESHDS_Group (const int                 theID,
                               const SMESHDS_Mesh*       theMesh,
                               const SMDSAbs_ElementType theType)
-     : SMESHDS_GroupBase(theID,theMesh,theType),
-       myGroup(theMesh,theType)
+  : SMESHDS_GroupBase(theID,theMesh,theType),
+    myGroup(theMesh,theType)
 {
 }
 
@@ -98,16 +94,25 @@ bool SMESHDS_Group::Contains (const SMDS_MeshElement* elem)
 
 bool SMESHDS_Group::Add (const int theID)
 {
-  const SMDS_MeshElement* aElem = findInMesh (theID);
-  if (!aElem || myGroup.Contains(aElem))
-    return false;
+  return Add( findInMesh( theID ));
+}
 
-  if (myGroup.IsEmpty())
-    SetType( aElem->GetType() );
+//=============================================================================
+/*!
+ *  
+ */
+//=============================================================================
 
-  myGroup.Add (aElem);
-  resetIterator();
-  return true;
+bool SMESHDS_Group::Add (const SMDS_MeshElement* aElem )
+{
+  bool added = false;
+  if ( aElem )
+  {
+    added = myGroup.Add (aElem);
+    if ( added )
+      resetIterator();
+  }
+  return added;
 }
 
 //=============================================================================
@@ -118,12 +123,14 @@ bool SMESHDS_Group::Add (const int theID)
 
 bool SMESHDS_Group::Remove (const int theID)
 {
-  const SMDS_MeshElement* aElem = findInMesh (theID);
-  if (!aElem || !myGroup.Contains(aElem))
-    return false;
-  myGroup.Remove (aElem);
-  resetIterator();
-  return true;
+  bool removed = false;
+  if ( const SMDS_MeshElement* aElem = findInMesh( theID ))
+  {
+    removed = myGroup.Remove (aElem);
+    if ( removed )
+      resetIterator();
+  }
+  return removed;
 }
 
 
@@ -137,20 +144,7 @@ void SMESHDS_Group::Clear()
   myGroup.Clear();
   resetIterator();
 }
-
-// =====================
-// class MyGroupIterator
-// =====================
-
-class MyGroupIterator: public SMDS_ElemIterator
-{
-  const SMDS_MeshGroup& myGroup;
- public:
-  MyGroupIterator(const SMDS_MeshGroup& group): myGroup(group) { myGroup.InitIterator(); }
-  bool more() { return myGroup.More(); }
-  const SMDS_MeshElement* next() { return myGroup.Next(); }
-};
-   
+  
 //=======================================================================
 //function : GetElements
 //purpose  : 
@@ -158,7 +152,7 @@ class MyGroupIterator: public SMDS_ElemIterator
 
 SMDS_ElemIteratorPtr SMESHDS_Group::GetElements() const
 {
-  return SMDS_ElemIteratorPtr( new MyGroupIterator ( myGroup ));
+  return myGroup.GetElements();
 }
 
 //================================================================================
@@ -179,11 +173,14 @@ int SMESHDS_Group::GetTic() const
 
 void SMESHDS_Group::SetType(SMDSAbs_ElementType theType)
 {
-  if ( myGroup.IsEmpty() || GetType() == SMDSAbs_All ) {
+  if ( myGroup.IsEmpty() || GetType() == SMDSAbs_All )
+  {
     SMESHDS_GroupBase::SetType( theType );
     myGroup.SetType ( theType );
   }
   else
+  {
     SMESHDS_GroupBase::SetType( myGroup.GetType() );
+  }
 }