Merge from V6_main 01/04/2013

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

diff --git a/src/SMESHDS/SMESHDS_Hypothesis.cxx b/src/SMESHDS/SMESHDS_Hypothesis.cxx
index ac186cb10a1f90bc8f8be3e3d3feeb459f730ba5..fb2ea91cf211ea27872f9f8a9deaae29a2c58bb9 100644 (file)
--- a/src/SMESHDS/SMESHDS_Hypothesis.cxx
+++ b/src/SMESHDS/SMESHDS_Hypothesis.cxx
@@ -1,16 +1,35 @@
-using namespace std;
-//=============================================================================
-// File      : SMESHDS_Hypothesis.cxx
-// Created   : sam mai 18 08:08:50 CEST 2002
-// Author    : Paul RASCLE, EDF
-// Project   : SALOME
-// Copyright : EDF 2002
-// $Header$
-//=============================================================================
-using namespace std;
+// Copyright (C) 2007-2013  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.
+//
+// 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 : management of mesh data and SMESH document
+//  File   : SMESHDS_Hypothesis.cxx
+//  Author : Paul RASCLE, EDF
+//  Module : SMESH
+//
 #include "SMESHDS_Hypothesis.hxx"
 
+#include <sstream>
+
+using namespace std;
 
 //=============================================================================
 /*!
@@ -20,11 +39,8 @@ using namespace std;
 
 SMESHDS_Hypothesis::SMESHDS_Hypothesis(int hypId)
 {
-//   MESSAGE("SMESHDS_Hypothesis::SMESHDS_Hypothesis");
   _hypId = hypId;
   _name = "generic";
-//   SCRUTE(_name);
-//   SCRUTE(_hypId);
 }
 
 //=============================================================================
@@ -35,7 +51,6 @@ SMESHDS_Hypothesis::SMESHDS_Hypothesis(int hypId)
 
 SMESHDS_Hypothesis::~SMESHDS_Hypothesis()
 {
-//   MESSAGE("SMESHDS_Hypothesis::~SMESHDS_Hypothesis");
 }
 
 //=============================================================================
@@ -44,11 +59,8 @@ SMESHDS_Hypothesis::~SMESHDS_Hypothesis()
  */
 //=============================================================================
 
-const char* SMESHDS_Hypothesis::GetName()
+const char* SMESHDS_Hypothesis::GetName() const
 {
-//   MESSAGE("SMESHDS_Hypothesis::GetName");
-//   SCRUTE(_name);
-//   SCRUTE(&_name);
   return _name.c_str();
 }
 
@@ -58,10 +70,8 @@ const char* SMESHDS_Hypothesis::GetName()
  */
 //=============================================================================
 
-int SMESHDS_Hypothesis::GetID()
+int SMESHDS_Hypothesis::GetID() const
 {
-//   MESSAGE("SMESHDS_Hypothesis::GetId");
-//   SCRUTE(_hypId);
   return _hypId;
 }
 
@@ -71,10 +81,25 @@ int SMESHDS_Hypothesis::GetID()
  */
 //=============================================================================
 
-int SMESHDS_Hypothesis::GetType()
+int SMESHDS_Hypothesis::GetType() const
 {
-//   MESSAGE("SMESHDS_Hypothesis::GetType");
-//   SCRUTE(_type);
   return _type;
 }
 
+//=============================================================================
+/*!
+ * Equality
+ */
+//=============================================================================
+
+bool SMESHDS_Hypothesis::operator==(const SMESHDS_Hypothesis& other) const
+{
+  if ( this == &other )
+    return true;
+  if ( _name != other._name )
+    return false;
+  ostringstream mySave, otherSave;
+  ((SMESHDS_Hypothesis*)this  )->SaveTo(mySave);
+  ((SMESHDS_Hypothesis*)&other)->SaveTo(otherSave);
+  return mySave.str() == otherSave.str();
+}