From: rnc Date: Mon, 2 Sep 2013 12:33:46 +0000 (+0000) Subject: Merge from V7_2_1_BR X-Git-Tag: V7_3_0a1~30 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=45ca620f328811d05b61ba36a699b0aeb1c1bde2;p=plugins%2Fhybridplugin.git Merge from V7_2_1_BR --- diff --git a/idl/GHS3DPlugin_Algorithm.idl b/idl/GHS3DPlugin_Algorithm.idl index 55af9a4..01be915 100644 --- a/idl/GHS3DPlugin_Algorithm.idl +++ b/idl/GHS3DPlugin_Algorithm.idl @@ -82,15 +82,15 @@ module GHS3DPlugin * Maximal size of memory to be used by the algorithm (in Megabytes). * Negative value means not to use this option */ - void SetMaximumMemory(in short MB) raises (SALOME::SALOME_Exception); - short GetMaximumMemory(); + void SetMaximumMemory(in long MB) raises (SALOME::SALOME_Exception); + long GetMaximumMemory(); /*! * Initial size of memory to be used by the algorithm (in Megabytes) in * automatic memory adjustment mode. Default is zero. * Negative value means not to use this option */ - void SetInitialMemory(in short MB) raises (SALOME::SALOME_Exception); - short GetInitialMemory(); + void SetInitialMemory(in long MB) raises (SALOME::SALOME_Exception); + long GetInitialMemory(); /*! * Optimization level: 0-none, 1-light, 2-medium, 3-strong. Default is medium */ diff --git a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx index 68ba246..3ec070f 100644 --- a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx +++ b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx @@ -135,7 +135,7 @@ bool GHS3DPlugin_Hypothesis::GetToMakeGroupsOfDomains(const GHS3DPlugin_Hypothes //function : SetMaximumMemory //======================================================================= -void GHS3DPlugin_Hypothesis::SetMaximumMemory(short MB) +void GHS3DPlugin_Hypothesis::SetMaximumMemory(int MB) { if ( myMaximumMemory != MB ) { myMaximumMemory = MB; @@ -148,7 +148,7 @@ void GHS3DPlugin_Hypothesis::SetMaximumMemory(short MB) // * automatic memory adjustment mode. Default is zero //======================================================================= -short GHS3DPlugin_Hypothesis::GetMaximumMemory() const +int GHS3DPlugin_Hypothesis::GetMaximumMemory() const { return myMaximumMemory; } @@ -157,7 +157,7 @@ short GHS3DPlugin_Hypothesis::GetMaximumMemory() const //function : SetInitialMemory //======================================================================= -void GHS3DPlugin_Hypothesis::SetInitialMemory(short MB) +void GHS3DPlugin_Hypothesis::SetInitialMemory(int MB) { if ( myInitialMemory != MB ) { myInitialMemory = MB; @@ -169,7 +169,7 @@ void GHS3DPlugin_Hypothesis::SetInitialMemory(short MB) //function : GetInitialMemory //======================================================================= -short GHS3DPlugin_Hypothesis::GetInitialMemory() const +int GHS3DPlugin_Hypothesis::GetInitialMemory() const { return myInitialMemory; } @@ -809,7 +809,7 @@ bool GHS3DPlugin_Hypothesis::DefaultToMakeGroupsOfDomains() #include #endif -short GHS3DPlugin_Hypothesis::DefaultMaximumMemory() +int GHS3DPlugin_Hypothesis::DefaultMaximumMemory() { #ifndef WIN32 struct sysinfo si; @@ -838,7 +838,7 @@ short GHS3DPlugin_Hypothesis::DefaultMaximumMemory() //function : DefaultInitialMemory //======================================================================= -short GHS3DPlugin_Hypothesis::DefaultInitialMemory() +int GHS3DPlugin_Hypothesis::DefaultInitialMemory() { return DefaultMaximumMemory(); } @@ -1418,7 +1418,7 @@ std::string GHS3DPlugin_Hypothesis::CommandToRun(const GHS3DPlugin_Hypothesis* h // Default memory is defined at ghs3d installation but it may be not enough, // so allow to use about all available memory if ( m ) { - short aMaximumMemory = hyp ? hyp->myMaximumMemory : -1; + int aMaximumMemory = hyp ? hyp->myMaximumMemory : -1; cmd += " -m "; if ( aMaximumMemory < 0 ) cmd += DefaultMaximumMemory(); @@ -1426,7 +1426,7 @@ std::string GHS3DPlugin_Hypothesis::CommandToRun(const GHS3DPlugin_Hypothesis* h cmd += aMaximumMemory; } if ( M && !useBndRecovery ) { - short aInitialMemory = hyp ? hyp->myInitialMemory : -1; + int aInitialMemory = hyp ? hyp->myInitialMemory : -1; cmd += " -M "; if ( aInitialMemory > 0 ) cmd += aInitialMemory; diff --git a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx index de11dc9..15ccbc2 100644 --- 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) */ - void SetMaximumMemory(short MB); - short GetMaximumMemory() const; + void SetMaximumMemory(int MB); + int GetMaximumMemory() const; /*! * Initial size of memory to be used by the algorithm (in Megabytes) in * automatic memory adjustment mode. Default is zero */ - void SetInitialMemory(short MB); - short GetInitialMemory() const; + void SetInitialMemory(int MB); + int GetInitialMemory() const; /*! * Optimization level: 0-none, 1-light, 2-medium, 3-standard+, 4-strong. Default is medium */ @@ -279,8 +279,8 @@ public: static bool DefaultMeshHoles(); static bool DefaultToMakeGroupsOfDomains(); - static short DefaultMaximumMemory(); - static short DefaultInitialMemory(); + static int DefaultMaximumMemory(); + static int DefaultInitialMemory(); static short DefaultOptimizationLevel(); static std::string DefaultWorkingDirectory(); static bool DefaultKeepFiles(); @@ -327,8 +327,8 @@ private: bool myToMeshHoles; bool myToMakeGroupsOfDomains; - short myMaximumMemory; - short myInitialMemory; + int myMaximumMemory; + int myInitialMemory; short myOptimizationLevel; bool myKeepFiles; std::string myWorkingDirectory; diff --git a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx index 6d7ed26..eb3eeb3 100644 --- a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx +++ b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx @@ -115,7 +115,7 @@ CORBA::Boolean GHS3DPlugin_Hypothesis_i::GetToMakeGroupsOfDomains() //function : SetMaximumMemory //======================================================================= -void GHS3DPlugin_Hypothesis_i::SetMaximumMemory(CORBA::Short MB) +void GHS3DPlugin_Hypothesis_i::SetMaximumMemory(CORBA::Long MB) throw ( SALOME::SALOME_Exception ) { if ( MB == 0 ) @@ -129,7 +129,7 @@ void GHS3DPlugin_Hypothesis_i::SetMaximumMemory(CORBA::Short MB) //function : GetMaximumMemory //======================================================================= -CORBA::Short GHS3DPlugin_Hypothesis_i::GetMaximumMemory() +CORBA::Long GHS3DPlugin_Hypothesis_i::GetMaximumMemory() { ASSERT(myBaseImpl); return this->GetImpl()->GetMaximumMemory(); @@ -139,7 +139,7 @@ CORBA::Short GHS3DPlugin_Hypothesis_i::GetMaximumMemory() //function : SetInitialMemory //======================================================================= -void GHS3DPlugin_Hypothesis_i::SetInitialMemory(CORBA::Short MB) +void GHS3DPlugin_Hypothesis_i::SetInitialMemory(CORBA::Long MB) throw ( SALOME::SALOME_Exception ) { if ( MB == 0 ) @@ -153,7 +153,7 @@ void GHS3DPlugin_Hypothesis_i::SetInitialMemory(CORBA::Short MB) //function : GetInitialMemory //======================================================================= -CORBA::Short GHS3DPlugin_Hypothesis_i::GetInitialMemory() +CORBA::Long GHS3DPlugin_Hypothesis_i::GetInitialMemory() { ASSERT(myBaseImpl); return this->GetImpl()->GetInitialMemory(); diff --git a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.hxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.hxx index 85f2844..81c12dd 100644 --- a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.hxx +++ b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.hxx @@ -65,14 +65,14 @@ class GHS3DPLUGIN_EXPORT GHS3DPlugin_Hypothesis_i: /*! * Maximal size of memory to be used by the algorithm (in Megabytes) */ - void SetMaximumMemory(CORBA::Short MB) throw ( SALOME::SALOME_Exception ); - CORBA::Short GetMaximumMemory(); + void SetMaximumMemory(CORBA::Long MB) throw ( SALOME::SALOME_Exception ); + CORBA::Long GetMaximumMemory(); /*! * Initial size of memory to be used by the algorithm (in Megabytes) in * automatic memory adjustment mode. Default is zero */ - void SetInitialMemory(CORBA::Short MB) throw ( SALOME::SALOME_Exception ); - CORBA::Short GetInitialMemory(); + void SetInitialMemory(CORBA::Long MB) throw ( SALOME::SALOME_Exception ); + CORBA::Long GetInitialMemory(); /*! * Optimization level: 0-none, 1-light, 2-medium, 3-strong. Default is medium */