Salome HOME
projects
/
plugins
/
ghs3dplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge multi-study removal branch.
[plugins/ghs3dplugin.git]
/
src
/
GHS3DPlugin
/
GHS3DPlugin_Hypothesis.hxx
diff --git
a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx
b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx
index fcec94ff65a52a05b81e9819ec19537ecbff95b9..47f8e91ac0e954bdd031246a5a952e3289214da9 100644
(file)
--- a/
src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx
+++ b/
src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx
@@
-134,14
+134,14
@@
public:
/*!
* Maximal size of memory to be used by the algorithm (in Megabytes)
*/
/*!
* Maximal size of memory to be used by the algorithm (in Megabytes)
*/
- void SetMaximumMemory(
long
MB);
-
long
GetMaximumMemory() const;
+ void SetMaximumMemory(
float
MB);
+
float
GetMaximumMemory() const;
/*!
* Initial size of memory to be used by the algorithm (in Megabytes) in
* automatic memory adjustment mode. Default is zero
*/
/*!
* Initial size of memory to be used by the algorithm (in Megabytes) in
* automatic memory adjustment mode. Default is zero
*/
- void SetInitialMemory(
long
MB);
-
long
GetInitialMemory() const;
+ void SetInitialMemory(
float
MB);
+
float
GetInitialMemory() const;
/*!
* Optimization level: 0-none, 1-light, 2-medium, 3-standard+, 4-strong. Default is medium
*/
/*!
* Optimization level: 0-none, 1-light, 2-medium, 3-standard+, 4-strong. Default is medium
*/
@@
-290,8
+290,8
@@
public:
static bool DefaultMeshHoles();
static bool DefaultToMakeGroupsOfDomains();
static bool DefaultMeshHoles();
static bool DefaultToMakeGroupsOfDomains();
- static
long
DefaultMaximumMemory();
- static
long
DefaultInitialMemory();
+ static
float
DefaultMaximumMemory();
+ static
float
DefaultInitialMemory();
static short DefaultOptimizationLevel();
static std::string DefaultWorkingDirectory();
static bool DefaultKeepFiles();
static short DefaultOptimizationLevel();
static std::string DefaultWorkingDirectory();
static bool DefaultKeepFiles();
@@
-323,8
+323,6
@@
public:
// Persistence
virtual std::ostream & SaveTo(std::ostream & save);
virtual std::istream & LoadFrom(std::istream & load);
// Persistence
virtual std::ostream & SaveTo(std::ostream & save);
virtual std::istream & LoadFrom(std::istream & load);
- friend GHS3DPLUGIN_EXPORT std::ostream & operator <<(std::ostream & save, GHS3DPlugin_Hypothesis & hyp);
- friend GHS3DPLUGIN_EXPORT std::istream & operator >>(std::istream & load, GHS3DPlugin_Hypothesis & hyp);
/*!
* \brief Does nothing
/*!
* \brief Does nothing
@@
-336,12
+334,12
@@
public:
*/
virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0);
*/
virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0);
-pr
ivate
:
+pr
otected
:
bool myToMeshHoles;
bool myToMakeGroupsOfDomains;
bool myToMeshHoles;
bool myToMakeGroupsOfDomains;
-
long
myMaximumMemory;
-
long
myInitialMemory;
+
float
myMaximumMemory;
+
float
myInitialMemory;
short myOptimizationLevel;
bool myKeepFiles;
std::string myWorkingDirectory;
short myOptimizationLevel;
bool myKeepFiles;
std::string myWorkingDirectory;