Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/smesh.git] / src / SMDS / SMDS_MeshGroup.cxx

diff --git a/src/SMDS/SMDS_MeshGroup.cxx b/src/SMDS/SMDS_MeshGroup.cxx
index 25e942abb32b7e0bc075d64988a6811a68034e3c..e003c9219d25d559edd4428937abfaaaa8785eb7 100644 (file)
--- a/src/SMDS/SMDS_MeshGroup.cxx
+++ b/src/SMDS/SMDS_MeshGroup.cxx
@@ -16,7 +16,7 @@
 //  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.opencascade.org or email : webmaster@opencascade.org 
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -24,16 +24,23 @@
 //  Author : Jean-Michel BOULCOURT
 //  Module : SMESH
 
-using namespace std;
+#ifdef _MSC_VER
+#pragma warning(disable:4786)
+#endif
+
 #include "SMDS_MeshGroup.hxx"
 #include "utilities.h"
+
+using namespace std;
+
 //=======================================================================
 //function : SMDS_MeshGroup
 //purpose  : 
 //=======================================================================
 
-SMDS_MeshGroup::SMDS_MeshGroup(const SMDS_Mesh * aMesh)
-       :myMesh(aMesh),myType(SMDSAbs_All), myParent(NULL)
+SMDS_MeshGroup::SMDS_MeshGroup(const SMDS_Mesh * theMesh,
+                               const SMDSAbs_ElementType theType)
+       :myMesh(theMesh),myType(theType), myParent(NULL)
 {
 }
 
@@ -42,8 +49,9 @@ SMDS_MeshGroup::SMDS_MeshGroup(const SMDS_Mesh * aMesh)
 //purpose  : 
 //=======================================================================
 
-SMDS_MeshGroup::SMDS_MeshGroup(SMDS_MeshGroup * parent)
-       :myMesh(parent->myMesh),myType(SMDSAbs_All), myParent(parent)
+SMDS_MeshGroup::SMDS_MeshGroup(SMDS_MeshGroup * theParent,
+                               const SMDSAbs_ElementType theType)
+       :myMesh(theParent->myMesh),myType(theType), myParent(theParent)
 {
 }
 
@@ -52,9 +60,10 @@ SMDS_MeshGroup::SMDS_MeshGroup(SMDS_MeshGroup * parent)
 //purpose  : 
 //=======================================================================
 
-const SMDS_MeshGroup *SMDS_MeshGroup::AddSubGroup()
+const SMDS_MeshGroup *SMDS_MeshGroup::AddSubGroup
+                (const SMDSAbs_ElementType theType)
 {
-       const SMDS_MeshGroup * subgroup = new SMDS_MeshGroup(this);
+       const SMDS_MeshGroup * subgroup = new SMDS_MeshGroup(this,theType);
        myChildren.insert(myChildren.end(),subgroup);
        return subgroup;
 }
@@ -64,14 +73,14 @@ const SMDS_MeshGroup *SMDS_MeshGroup::AddSubGroup()
 //purpose  : 
 //=======================================================================
 
-bool SMDS_MeshGroup::RemoveSubGroup(const SMDS_MeshGroup * aGroup)
+bool SMDS_MeshGroup::RemoveSubGroup(const SMDS_MeshGroup * theGroup)
 {
        bool found = false;     
        list<const SMDS_MeshGroup*>::iterator itgroup;
        for(itgroup=myChildren.begin(); itgroup!=myChildren.end(); itgroup++)
        {
                const SMDS_MeshGroup* subgroup=*itgroup;
-               if (subgroup == aGroup)
+               if (subgroup == theGroup)
                {
                        found = true;
                        myChildren.erase(itgroup);
@@ -106,39 +115,21 @@ void SMDS_MeshGroup::Clear()
        myType = SMDSAbs_All;
 }
 
-//=======================================================================
-//function : IsEmpty
-//purpose  : 
-//=======================================================================
-
-bool SMDS_MeshGroup::IsEmpty() const
-{
-       return myElements.empty();
-}
-
-//=======================================================================
-//function : Extent
-//purpose  : 
-//=======================================================================
-
-int SMDS_MeshGroup::Extent() const
-{
-       return myElements.size();
-}
-
 //=======================================================================
 //function : Add
 //purpose  : 
 //=======================================================================
 
-void SMDS_MeshGroup::Add(const SMDS_MeshElement * ME)
+void SMDS_MeshGroup::Add(const SMDS_MeshElement * theElem)
 {
        // the type of the group is determined by the first element added
-       if (myElements.empty()) myType = ME->GetType();
-       else if (ME->GetType() != myType)
-               MESSAGE("SMDS_MeshGroup::Add : Type Mismatch");
+       if (myElements.empty()) myType = theElem->GetType();
+       else if (theElem->GetType() != myType) {
+         MESSAGE("SMDS_MeshGroup::Add : Type Mismatch "<<theElem->GetType()<<"!="<<myType);
+         return;
+       }
        
-       myElements.insert(ME);
+       myElements.insert(theElem);
 }
 
 //=======================================================================
@@ -146,28 +137,29 @@ void SMDS_MeshGroup::Add(const SMDS_MeshElement * ME)
 //purpose  : 
 //=======================================================================
 
-void SMDS_MeshGroup::Remove(const SMDS_MeshElement * ME)
+void SMDS_MeshGroup::Remove(const SMDS_MeshElement * theElem)
 {
-       myElements.erase(ME);
+       myElements.erase(theElem);
        if (myElements.empty()) myType = SMDSAbs_All;
 }
 
 //=======================================================================
-//function : Type
+//function : Contains
 //purpose  : 
 //=======================================================================
 
-SMDSAbs_ElementType SMDS_MeshGroup::Type() const
+bool SMDS_MeshGroup::Contains(const SMDS_MeshElement * theElem) const
 {
-       return myType;
+       return myElements.find(theElem)!=myElements.end();
 }
 
 //=======================================================================
-//function : Contains
+//function : SetType
 //purpose  : 
 //=======================================================================
 
-bool SMDS_MeshGroup::Contains(const SMDS_MeshElement * ME) const
+void SMDS_MeshGroup::SetType(const SMDSAbs_ElementType theType)
 {
-       return myElements.find(ME)!=myElements.end();
+  if (IsEmpty())
+    myType = theType;
 }