Merge from V6_main_20120808 08Aug12

[modules/smesh.git] / src / SMESH / SMESH_Group.cxx

diff --git a/src/SMESH/SMESH_Group.cxx b/src/SMESH/SMESH_Group.cxx
index a05204d31f333a490cf3ca1a0f9311b47b17689d..7ef568593a2f492f535a7fb6a1b0934fa444a11f 100644 (file)
--- a/src/SMESH/SMESH_Group.cxx
+++ b/src/SMESH/SMESH_Group.cxx
@@ -1,24 +1,25 @@
-//  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 SMESH : implementaion of SMESH idl descriptions
 //  File   : SMESH_Group.cxx
 //  Author : Michael Sazonov (OCC)
@@ -29,6 +30,7 @@
 #include "SMESH_Mesh.hxx"
 #include "SMESHDS_Group.hxx"
 #include "SMESHDS_GroupOnGeom.hxx"
+#include "SMESHDS_GroupOnFilter.hxx"
 
 //=============================================================================
 /*!
@@ -40,18 +42,36 @@ SMESH_Group::SMESH_Group (int                       theID,
                           const SMESH_Mesh*         theMesh,
                           const SMDSAbs_ElementType theType,
                           const char*               theName,
-                          const TopoDS_Shape&       theShape)
+                          const TopoDS_Shape&       theShape,
+                          const SMESH_PredicatePtr& thePredicate)
      : myName(theName)
 {
-  if ( theShape.IsNull() )
-    myGroupDS = new SMESHDS_Group (theID,
-                                   const_cast<SMESH_Mesh*>(theMesh)->GetMeshDS(),
-                                   theType);
-  else
+  if ( !theShape.IsNull() )
     myGroupDS = new SMESHDS_GroupOnGeom (theID,
                                          const_cast<SMESH_Mesh*>(theMesh)->GetMeshDS(),
                                          theType,
                                          theShape);
+  else if ( thePredicate )
+    myGroupDS = new SMESHDS_GroupOnFilter (theID,
+                                           const_cast<SMESH_Mesh*>(theMesh)->GetMeshDS(),
+                                           theType,
+                                           thePredicate);
+  else
+    myGroupDS = new SMESHDS_Group (theID,
+                                   const_cast<SMESH_Mesh*>(theMesh)->GetMeshDS(),
+                                   theType);
+}
+
+//================================================================================
+/*!
+ * \brief Constructor accesible to SMESH_Mesh only
+ */
+//================================================================================
+
+SMESH_Group::SMESH_Group (SMESHDS_GroupBase* groupDS): myGroupDS( groupDS )
+{
+  if ( myGroupDS )
+    myName = myGroupDS->GetStoreName();
 }
 
 //=============================================================================
@@ -62,5 +82,5 @@ SMESH_Group::SMESH_Group (int                       theID,
 
 SMESH_Group::~SMESH_Group ()
 {
-  delete myGroupDS;
+  delete myGroupDS; myGroupDS=0;
 }