Merge relevant changes from V8_0_0_BR branch

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

diff --git a/src/HOMARDGUI/MonEditHypothesis.cxx b/src/HOMARDGUI/MonEditHypothesis.cxx
index 8327d62316989e237fd3f51b5c4d6e381ef8351c..e018777456dbdc7bc5978aed7f5144358cf44c36 100644 (file)
--- a/src/HOMARDGUI/MonEditHypothesis.cxx
+++ b/src/HOMARDGUI/MonEditHypothesis.cxx
@@ -149,6 +149,12 @@ void MonEditHypothesis::InitValEdit()
       CBOutputDiameter->setEnabled(false);
     }
     else { CBOutputDiameter->setVisible(0) ; }
+/*    if ( ExtraOutput % 7 == 0 )
+    {
+      CBOutputParent->setChecked(true);
+      CBOutputParent->setEnabled(false);
+    }
+    else { CBOutputParent->setVisible(0) ; }*/
   }
   else
   { GBAdvancedOptions->setVisible(0); }
@@ -444,7 +450,7 @@ void MonEditHypothesis::SetFiltrage()
 {
   if (CBGroupe->isChecked())
   {
-    MonEditListGroup *aDlg = new MonEditListGroup(this, NULL, TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ;
+    MonEditListGroup *aDlg = new MonEditListGroup(this, NULL, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ;
     aDlg->show();
   }
 }