-// Copyright (C) 2011-2014 CEA/DEN, EDF R&D
+// Copyright (C) 2011-2022 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
_NivMax(-1),
_DiamMin(-1.),
_AdapInit(0),
- _LevelOutput(0)
+ _ExtraOutput(1)
{
MESSAGE("Constructeur") ;
}
SetFieldNo();
GBAdvancedOptions->setVisible(0);
- CBLevelOutput->setChecked(false);
+ CBOutputLevel->setChecked(false);
+ CBOutputQuality->setChecked(false);
+ CBOutputDiameter->setChecked(false);
+ CBOutputParent->setChecked(false);
+ CBOutputVoisins->setChecked(false);
+ _ExtraOutput = 1 ;
//
adjustSize();
}
connect( CBJump, SIGNAL(stateChanged(int)), this, SLOT(SetUseField()));
connect( PBZoneNew, SIGNAL(pressed()), this, SLOT(PushZoneNew()));
connect( PBZoneEdit, SIGNAL(pressed()), this, SLOT(PushZoneEdit()) );
- connect( PBZoneDelete, SIGNAL(pressed()), this, SLOT(PushZoneDelete()) );
connect( CBGroupe, SIGNAL(stateChanged(int)), this, SLOT(SetFiltrage()));
connect( RBFieldNo, SIGNAL(clicked()), this, SLOT(SetFieldNo()));
aHypothesis->SetDiamMin(_DiamMin);
// Enregistrement de l'intialisation de l'adaptation
aHypothesis->SetAdapInit(_AdapInit);
-// Sortie des niveaux de raffinement
- if (CBLevelOutput->isChecked()) { _LevelOutput = 1 ; }
- aHypothesis->SetLevelOutput(_LevelOutput);
+// Sortie optionnelle des niveaux de raffinement, des diametres, des qualites
+ _ExtraOutput = 1 ;
+ if (CBOutputLevel->isChecked()) { _ExtraOutput = 2 ; }
+ if (CBOutputQuality->isChecked()) { _ExtraOutput = 3*_ExtraOutput ; }
+ if (CBOutputDiameter->isChecked()) { _ExtraOutput = 5*_ExtraOutput ; }
+ if (CBOutputParent->isChecked()) { _ExtraOutput = 7*_ExtraOutput ; }
+ if (CBOutputVoisins->isChecked()) { _ExtraOutput = 11*_ExtraOutput ; }
+ aHypothesis->SetExtraOutput(_ExtraOutput);
}
HOMARD_UTILS::updateObjBrowser() ;
// ------------------------------------------------------------------------
{
MESSAGE("Debut de MonCreateHypothesis::PushZoneNew")
- MonCreateZone *aDlg = new MonCreateZone(this, TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName) ;
+ MonCreateZone *aDlg = new MonCreateZone(this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName) ;
aDlg->show();
}
return;
}
QString zoneName = monItem->text().trimmed();
- MonEditZone *aDlg = new MonEditZone(this, TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, zoneName) ;
+ MonEditZone *aDlg = new MonEditZone(this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, zoneName) ;
aDlg->show();
}
-// ------------------------------------------------------------------------
-void MonCreateHypothesis::PushZoneDelete()
-// ------------------------------------------------------------------------
-{
- MESSAGE("Debut de MonCreateHypothesis::PushZoneDelete")
- QMessageBox::warning( 0, QObject::tr("HOM_WARNING"),
- QObject::tr("HOM_INACTIVE_BUTTON") );
- return;
-}
// ------------------------------------------------------------------------
void MonCreateHypothesis::GetAllZones()
void MonCreateHypothesis::SetUCInf()
// ------------------------------------------------------------------------
{
- _UsCmpI = 1 ;
+ if ( TWCMP->rowCount() == 1 ) { _UsCmpI = 2 ; }
+ else { _UsCmpI = 1 ; }
RBInf->setChecked(true);
}
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
{
if (!CBGroupe->isChecked()) return;
- MonCreateListGroup *aDlg = new MonCreateListGroup(this, NULL, TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ;
+ MonCreateListGroup *aDlg = new MonCreateListGroup(this, NULL, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ;
aDlg->show();
}
MESSAGE("Debut de SetAdvanced ");
if (CBAdvanced->isChecked())
{ GBAdvancedOptions->setVisible(1);
- if (_aFieldFile != QString(""))
- { GBAdapInit->setVisible(1) ;
- }
- else
- { GBAdapInit->setVisible(0) ;
- }
+ if (_aFieldFile != QString("")) { GBAdapInit->setVisible(1) ; }
+ else { GBAdapInit->setVisible(0) ; }
}
else
{ GBAdvancedOptions->setVisible(0);
_NivMax = -1 ;
_DiamMin = -1. ;
_AdapInit = 0 ;
- CBLevelOutput->setChecked(false);
- _LevelOutput = 0 ;
+ CBOutputLevel->setChecked(false);
+ CBOutputQuality->setChecked(false);
+ CBOutputDiameter->setChecked(false);
+ CBOutputParent->setChecked(false);
+ CBOutputVoisins->setChecked(false);
+ _ExtraOutput = 1 ;
}
//
adjustSize();