X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_Hypothesis.hxx;h=e23f29b92480fd1ee9a44f674c2e1c1a73973f1c;hb=e57d64d3910c1a5f0eca72ee7244d32873495517;hp=85e115c05d149150d026b3b0f07fb479cddd4e32;hpb=f5016d85b7b4b88623723027a1585c6414c4dc66;p=modules%2Fsmesh.git diff --git a/src/SMESHDS/SMESHDS_Hypothesis.hxx b/src/SMESHDS/SMESHDS_Hypothesis.hxx index 85e115c05..e23f29b92 100644 --- a/src/SMESHDS/SMESHDS_Hypothesis.hxx +++ b/src/SMESHDS/SMESHDS_Hypothesis.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// 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 @@ -39,9 +39,11 @@ class SMESHDS_EXPORT SMESHDS_Hypothesis SMESHDS_Hypothesis(int hypId); virtual ~SMESHDS_Hypothesis(); + enum hypothesis_type { PARAM_ALGO, ALGO_0D, ALGO_1D, ALGO_2D, ALGO_3D }; + const char* GetName() const; - int GetID() const; - int GetType() const; + int GetID() const; + int GetType() const; virtual std::ostream & SaveTo(std::ostream & save)=0; virtual std::istream & LoadFrom(std::istream & load)=0; @@ -49,12 +51,10 @@ class SMESHDS_EXPORT SMESHDS_Hypothesis virtual bool operator==(const SMESHDS_Hypothesis& other) const; bool operator!=(const SMESHDS_Hypothesis& other) const { return !(*this==other); } - enum hypothesis_type { PARAM_ALGO, ALGO_0D, ALGO_1D, ALGO_2D, ALGO_3D }; - protected: - std::string _name; // identifier if hypothesis type - int _hypId; // ID unique within application session - int _type; // enum hypothesis_type + std::string _name; // identifier of hypothesis type + int _hypId; // ID unique within application session + hypothesis_type _type; // enum hypothesis_type }; #endif