Merge from V6_main_20120808 08Aug12

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

diff --git a/src/SMESHDS/SMESHDS_GroupOnGeom.cxx b/src/SMESHDS/SMESHDS_GroupOnGeom.cxx
index 73e1654db6e3b7441998f0d86742b504b62ba7ef..51d7620280c2163ea8aae6de809f8fc9dd8bab51 100644 (file)
--- a/src/SMESHDS/SMESHDS_GroupOnGeom.cxx
+++ b/src/SMESHDS/SMESHDS_GroupOnGeom.cxx
@@ -1,28 +1,28 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
+// 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.
+// 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.
+// 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
+// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com

 //
 //

+

 //  SMESH SMESHDS : idl implementation based on 'SMESH' unit's classes
 //  File   : SMESHDS_GroupOnGeom.cxx
 //  Module : SMESH
 //  SMESH SMESHDS : idl implementation based on 'SMESH' unit's classes
 //  File   : SMESHDS_GroupOnGeom.cxx
 //  Module : SMESH

-//  $Header$

 //
 #include "SMESHDS_GroupOnGeom.hxx"
 #include "SMESHDS_Mesh.hxx"
 //
 #include "SMESHDS_GroupOnGeom.hxx"
 #include "SMESHDS_Mesh.hxx"


@@ -40,10 +40,16 @@ SMESHDS_GroupOnGeom::SMESHDS_GroupOnGeom (const int                 theID,
                                           const SMESHDS_Mesh*       theMesh,
                                           const SMDSAbs_ElementType theType,
                                           const TopoDS_Shape&       theShape)
                                           const SMESHDS_Mesh*       theMesh,
                                           const SMDSAbs_ElementType theType,
                                           const TopoDS_Shape&       theShape)

-     : SMESHDS_GroupBase(theID,theMesh,theType), myShape(theShape)
+     : SMESHDS_GroupBase(theID,theMesh,theType)
+{
+  SetShape( theShape );
+}
+
+void SMESHDS_GroupOnGeom::SetShape( const TopoDS_Shape& theShape)

 {
 {

-  SMESHDS_Mesh* aMesh = const_cast<SMESHDS_Mesh*>(theMesh);
+  SMESHDS_Mesh* aMesh = const_cast<SMESHDS_Mesh*>( GetMesh() );

   mySubMesh = aMesh->MeshElements( aMesh->AddCompoundSubmesh( theShape ));
   mySubMesh = aMesh->MeshElements( aMesh->AddCompoundSubmesh( theShape ));

+  myShape   = theShape;

 }
 
 // =====================
 }
 
 // =====================


@@ -60,13 +66,14 @@ class MyIterator: public SMDS_ElemIterator
   MyIterator(SMDSAbs_ElementType type, const SMESHDS_SubMesh* subMesh)
     : myType(type), myElem(0)
   {
   MyIterator(SMDSAbs_ElementType type, const SMESHDS_SubMesh* subMesh)
     : myType(type), myElem(0)
   {

-    if ( subMesh ) 
+    if ( subMesh ) {

       if ( myType == SMDSAbs_Node )
         myNodeIt = subMesh->GetNodes();
       else {
         myElemIt = subMesh->GetElements();
         next();
       }
       if ( myType == SMDSAbs_Node )
         myNodeIt = subMesh->GetNodes();
       else {
         myElemIt = subMesh->GetElements();
         next();
       }

+    }

   }
   bool more()
   {
   }
   bool more()
   {


@@ -96,7 +103,7 @@ class MyIterator: public SMDS_ElemIterator
 //purpose  : 
 //=======================================================================
 
 //purpose  : 
 //=======================================================================
 

-SMDS_ElemIteratorPtr SMESHDS_GroupOnGeom::GetElements()
+SMDS_ElemIteratorPtr SMESHDS_GroupOnGeom::GetElements() const

 {
   return SMDS_ElemIteratorPtr( new MyIterator ( GetType(), mySubMesh ));
 }
 {
   return SMDS_ElemIteratorPtr( new MyIterator ( GetType(), mySubMesh ));
 }


@@ -121,3 +128,14 @@ bool SMESHDS_GroupOnGeom::Contains (const SMDS_MeshElement* elem)
   return mySubMesh->Contains( elem );
 }
 
   return mySubMesh->Contains( elem );
 }
 

+//================================================================================
+/*!
+ * \brief Return a value allowing to find out if a group has changed or not
+ */
+//================================================================================
+
+int SMESHDS_GroupOnGeom::GetTic() const
+{
+  return GetMesh()->GetMTime();
+}
+