-// Copyright (C) 2011-2014 CEA/DEN, EDF R&D
+// Copyright (C) 2011-2020 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
int NivMax = aHypothesis->GetNivMax();
double DiamMin = aHypothesis->GetDiamMin();
int AdapInit = aHypothesis->GetAdapInit();
- int LevelOutput = aHypothesis->GetLevelOutput();
- if ( NivMax > 0 || DiamMin > 0 || AdapInit != 0 || LevelOutput != 0 )
+ int ExtraOutput = aHypothesis->GetExtraOutput();
+ if ( NivMax > 0 || DiamMin > 0 || AdapInit != 0 || ExtraOutput != 1 )
{ GBAdvancedOptions->setVisible(1);
if ( NivMax > 0 )
{ SpinBoxNivMax->setValue(NivMax);
else
{ GBAdapInit->setVisible(0) ;
}
- if ( LevelOutput != 0 )
+ if ( ExtraOutput % 2 == 0 )
{
- CBLevelOutput->setChecked(true);
- CBLevelOutput->setEnabled(false);
+ CBOutputLevel->setChecked(true);
+ CBOutputLevel->setEnabled(false);
}
- else
- { CBLevelOutput->setVisible(0) ;
+ else { CBOutputLevel->setVisible(0) ; }
+ if ( ExtraOutput % 3 == 0 )
+ {
+ CBOutputQuality->setChecked(true);
+ CBOutputQuality->setEnabled(false);
+ }
+ else { CBOutputQuality->setVisible(0) ; }
+ if ( ExtraOutput % 5 == 0 )
+ {
+ CBOutputDiameter->setChecked(true);
+ CBOutputDiameter->setEnabled(false);
+ }
+ else { CBOutputDiameter->setVisible(0) ; }
+ if ( ExtraOutput % 7 == 0 )
+ {
+ CBOutputParent->setChecked(true);
+ CBOutputParent->setEnabled(false);
+ }
+ else { CBOutputParent->setVisible(0) ; }
+ if ( ExtraOutput % 11 == 0 )
+ {
+ CBOutputVoisins->setChecked(true);
+ CBOutputVoisins->setEnabled(false);
}
+ else { CBOutputVoisins->setVisible(0) ; }
}
else
{ GBAdvancedOptions->setVisible(0); }
{
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();
}
}