X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_Group.cxx;h=6ffa1b19cba4e962fd5ea0db5ade44880a6afd7c;hb=bd7477efc255f965c479d88d1be1ee3dbf4aa760;hp=ecd6efb8ce998c2fc5c2048e21bb56e7bfd1a2d5;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f;p=modules%2Fsmesh.git

diff --git a/src/SMESHDS/SMESHDS_Group.cxx b/src/SMESHDS/SMESHDS_Group.cxx
index ecd6efb8c..6ffa1b19c 100644
--- a/src/SMESHDS/SMESHDS_Group.cxx
+++ b/src/SMESHDS/SMESHDS_Group.cxx
@@ -1,29 +1,30 @@
-//  SMESH SMESHDS : idl implementation based on 'SMESH' unit's classes
+// 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
+//
+// 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, or (at your option) any later version.
 //
-//  Copyright (C) 2004  CEA
-// 
-//  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. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.salome-platform.org or email : webmaster.salome@opencascade.org 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
+// 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"
 
@@ -48,7 +49,7 @@ SMESHDS_Group::SMESHDS_Group (const int                 theID,
 //purpose  : 
 //=======================================================================
 
-int SMESHDS_Group::Extent()
+int SMESHDS_Group::Extent() const
 {
   return myGroup.Extent();
 }
@@ -77,6 +78,18 @@ bool SMESHDS_Group::Contains (const int theID)
   return false;
 }
 
+//=======================================================================
+//function : Contains
+//purpose  : 
+//=======================================================================
+
+bool SMESHDS_Group::Contains (const SMDS_MeshElement* elem)
+{
+  if (elem)
+    return myGroup.Contains(elem);
+  return false;
+}
+
 //=============================================================================
 /*!
  *  
@@ -85,7 +98,17 @@ bool SMESHDS_Group::Contains (const int theID)
 
 bool SMESHDS_Group::Add (const int theID)
 {
-  const SMDS_MeshElement* aElem = findInMesh (theID);
+  return Add( findInMesh( theID ));
+}
+
+//=============================================================================
+/*!
+ *  
+ */
+//=============================================================================
+
+bool SMESHDS_Group::Add (const SMDS_MeshElement* aElem )
+{
   if (!aElem || myGroup.Contains(aElem))
     return false;
 
@@ -93,6 +116,7 @@ bool SMESHDS_Group::Add (const int theID)
     SetType( aElem->GetType() );
 
   myGroup.Add (aElem);
+  resetIterator();
   return true;
 }
 
@@ -108,10 +132,12 @@ bool SMESHDS_Group::Remove (const int theID)
   if (!aElem || !myGroup.Contains(aElem))
     return false;
   myGroup.Remove (aElem);
+  resetIterator();
   return true;
 }
 
-//=======================================================================
+
+//======================================================================
 //function : Clear
 //purpose  : 
 //=======================================================================
@@ -119,6 +145,7 @@ bool SMESHDS_Group::Remove (const int theID)
 void SMESHDS_Group::Clear()
 {
   myGroup.Clear();
+  resetIterator();
 }
 
 // =====================
@@ -139,11 +166,22 @@ class MyGroupIterator: public SMDS_ElemIterator
 //purpose  : 
 //=======================================================================
 
-SMDS_ElemIteratorPtr SMESHDS_Group::GetElements()
+SMDS_ElemIteratorPtr SMESHDS_Group::GetElements() const
 {
   return SMDS_ElemIteratorPtr( new MyGroupIterator ( myGroup ));
 }
 
+//================================================================================
+/*!
+ * \brief Return a value allowing to find out if a group has changed or not
+ */
+//================================================================================
+
+int SMESHDS_Group::GetTic() const
+{
+  return myGroup.Tic();
+}
+
 //=======================================================================
 //function : SetType
 //purpose  :