Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From NewGEOM: activation of SMESH after any module without object browser crashes...
[modules/smesh.git]
/
src
/
SMESHDS
/
SMESHDS_Hypothesis.hxx
diff --git
a/src/SMESHDS/SMESHDS_Hypothesis.hxx
b/src/SMESHDS/SMESHDS_Hypothesis.hxx
index d819684af6a8e8b2d36f32a5a1cfc1b50b6de343..26a66c3a276b44af08e0f30b8e7d04bb696eba59 100644
(file)
--- a/
src/SMESHDS/SMESHDS_Hypothesis.hxx
+++ b/
src/SMESHDS/SMESHDS_Hypothesis.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
@@
-6,7
+6,7
@@
// 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
// 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.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-24,7
+24,6
@@
// File : SMESHDS_Hypothesis.hxx
// Author : Paul RASCLE, EDF
// Module : SMESH
// File : SMESHDS_Hypothesis.hxx
// Author : Paul RASCLE, EDF
// Module : SMESH
-// $Header$
//
#ifndef _SMESHDS_HYPOTHESIS_HXX_
#define _SMESHDS_HYPOTHESIS_HXX_
//
#ifndef _SMESHDS_HYPOTHESIS_HXX_
#define _SMESHDS_HYPOTHESIS_HXX_
@@
-36,26
+35,27
@@
class SMESHDS_EXPORT SMESHDS_Hypothesis
{
class SMESHDS_EXPORT SMESHDS_Hypothesis
{
-public:
+
public:
SMESHDS_Hypothesis(int hypId);
virtual ~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;
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;
virtual std::ostream & SaveTo(std::ostream & save)=0;
virtual std::istream & LoadFrom(std::istream & load)=0;
+ bool IsSameName( const SMESHDS_Hypothesis& other) const;
virtual bool operator==(const SMESHDS_Hypothesis& other) const;
bool operator!=(const SMESHDS_Hypothesis& other) const { return !(*this==other); }
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;
- int _hypId;
- int _type;
+ protected:
+ std::string _name; // identifier of hypothesis type
+ int _hypId; // ID unique within application session
+ hypothesis_type _type; // enum hypothesis_type
};
#endif
};
#endif