Merge from V6_main 13/12/2012

[modules/homard.git] / src / HOMARD / HOMARD_Hypothesis.cxx

diff --git a/src/HOMARD/HOMARD_Hypothesis.cxx b/src/HOMARD/HOMARD_Hypothesis.cxx
index 40874c5350f3002cc234c297210ecdc1702c9ae6..a1845b10bf176ce2ff65fd2fc8fe011536e5e45f 100644 (file)
--- a/src/HOMARD/HOMARD_Hypothesis.cxx
+++ b/src/HOMARD/HOMARD_Hypothesis.cxx
@@ -119,13 +119,11 @@ std::string HOMARD_Hypothesis::GetDumpPython() const
     }
     if ( _TypeRaff == 1 )
     {
-      aScript << "\t" << _NomHypo << ".SetRefinThr(" << _TypeThR;
-      aScript << ", " << _ThreshR << ")\n";
+      aScript << "\t" << _NomHypo << ".SetRefinThr(" << _TypeThR << ", " << _ThreshR << ")\n";
     }
     if ( _TypeDera == 1 )
     {
-      aScript << "\t" << _NomHypo << ".SetUnRefThr(" << _TypeThC;
-      aScript << ", " << _ThreshC << ")\n";
+      aScript << "\t" << _NomHypo << ".SetUnRefThr(" << _TypeThC << ", " << _ThreshC << ")\n";
     }
   }
 
@@ -146,18 +144,19 @@ std::string HOMARD_Hypothesis::GetDumpPython() const
   }
   if ( _NivMax > 0 )
   {
-    aScript << "\tNivMax = " << _NivMax << "\n";
-    aScript << "\t" <<_NomHypo << ".SetNivMax(NivMax)\n";
+    aScript << "\t" <<_NomHypo << ".SetNivMax(" << _NivMax << ")\n";
   }
   if ( _DiamMin > 0 )
   {
-    aScript << "\tDiamMin = " << _DiamMin << "\n";
-    aScript << "\t" <<_NomHypo << ".SetDiamMin(DiamMin)\n";
+    aScript << "\t" <<_NomHypo << ".SetDiamMin(" << _DiamMin << ")\n";
   }
   if ( _AdapInit != 0 )
   {
-    aScript << "\tAdapInit = " << _AdapInit << "\n";
-    aScript << "\t" <<_NomHypo << ".SetAdapInit(AdapInit)\n";
+    aScript << "\t" <<_NomHypo << ".SetAdapInit(" << _AdapInit << ")\n";
+  }
+  if ( _LevelOutput != 0 )
+  {
+    aScript << "\t" <<_NomHypo << ".SetLevelOutput(" << _LevelOutput << ")\n";
   }
 
   return aScript.str();
@@ -450,3 +449,15 @@ const double HOMARD_Hypothesis::GetDiamMin() const
 {
   return _DiamMin;
 }
+//=============================================================================
+void HOMARD_Hypothesis::SetLevelOutput( int LevelOutput )
+//=============================================================================
+{
+  _LevelOutput = LevelOutput;
+}
+//=============================================================================
+const int HOMARD_Hypothesis::GetLevelOutput() const
+//=============================================================================
+{
+  return _LevelOutput;
+}