Merge from V6_main 13/12/2012

[modules/homard.git] / src / HOMARDGUI / MonEditHypothesis.cxx

diff --git a/src/HOMARDGUI/MonEditHypothesis.cxx b/src/HOMARDGUI/MonEditHypothesis.cxx
index 38a9d024931e0154629f0b71afc79f425c28d904..0192379f8744632adba5dfb1116d756938468ba9 100644 (file)
--- a/src/HOMARDGUI/MonEditHypothesis.cxx
+++ b/src/HOMARDGUI/MonEditHypothesis.cxx
@@ -101,7 +101,8 @@ void MonEditHypothesis::InitValEdit()
   int NivMax = _aHypothesis->GetNivMax();
   double DiamMin = _aHypothesis->GetDiamMin();
   int AdapInit = _aHypothesis->GetAdapInit();
-  if ( NivMax > 0 or DiamMin > 0 or AdapInit != 0 )
+  int LevelOutput = _aHypothesis->GetLevelOutput();
+  if ( NivMax > 0 or DiamMin > 0 or AdapInit != 0 or LevelOutput != 0 )
   { GBAdvancedOptions->setVisible(1);
     if ( NivMax > 0 )
     { spinBoxNivMax->setValue(NivMax);
@@ -128,6 +129,14 @@ void MonEditHypothesis::InitValEdit()
     else
     { GBAdapInit->setVisible(0) ;
     }
+    if ( LevelOutput != 0 )
+    {
+      CBLevelOutput->setChecked(true);
+      CBLevelOutput->setEnabled(false);
+    }
+    else
+    { CBLevelOutput->setVisible(0) ;
+    }
   }
   else
   { GBAdvancedOptions->setVisible(0); }