X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHOMARDGUI%2FMonCreateHypothesis.cxx;h=46a09ead0ba6d9bf7e658076be150c96c5658fd8;hb=refs%2Ftags%2FV9_13_0b1;hp=77441cf79e39c323ed0f78e740cae6bf4d2cfc98;hpb=2c82da385bf3d7b6a045dfe7620d4b9bdc154fe6;p=modules%2Fhomard.git

diff --git a/src/HOMARDGUI/MonCreateHypothesis.cxx b/src/HOMARDGUI/MonCreateHypothesis.cxx
index 77441cf7..46a09ead 100644
--- a/src/HOMARDGUI/MonCreateHypothesis.cxx
+++ b/src/HOMARDGUI/MonCreateHypothesis.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2011-2024  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -77,7 +77,8 @@ MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal,
       CBOutputLevel->setChecked(false);
       CBOutputQuality->setChecked(false);
       CBOutputDiameter->setChecked(false);
-//       CBOutputParent->setChecked(false);
+      CBOutputParent->setChecked(false);
+      CBOutputVoisins->setChecked(false);
       _ExtraOutput = 1 ;
 //
       adjustSize();
@@ -115,7 +116,6 @@ void MonCreateHypothesis::InitConnect()
     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()));
@@ -197,10 +197,11 @@ bool MonCreateHypothesis::PushOnApply()
     aHypothesis->SetAdapInit(_AdapInit);
 // 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 (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);
   }
 
@@ -315,7 +316,7 @@ void MonCreateHypothesis::SetZone()
 void MonCreateHypothesis::PushZoneNew()
 // ------------------------------------------------------------------------
 {
-  MESSAGE("Debut de MonCreateHypothesis::PushZoneNew")
+  MESSAGE("Debut de MonCreateHypothesis::PushZoneNew");
   MonCreateZone *aDlg = new MonCreateZone(this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName) ;
   aDlg->show();
 }
@@ -324,7 +325,7 @@ void MonCreateHypothesis::PushZoneNew()
 void MonCreateHypothesis::PushZoneEdit()
 // ------------------------------------------------------------------------
 {
-  MESSAGE("Debut de MonCreateHypothesis::PushZoneEdit")
+  MESSAGE("Debut de MonCreateHypothesis::PushZoneEdit");
   int colonne = TWZone->currentColumn();
   QTableWidgetItem * monItem = TWZone->currentItem();
   if (colonne !=2  || monItem == NULL)
@@ -337,15 +338,6 @@ void MonCreateHypothesis::PushZoneEdit()
   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()
@@ -354,7 +346,7 @@ void MonCreateHypothesis::GetAllZones()
 // et affichage dans le tableau
 // Par defaut, aucune n'est selectionnee
 {
-  MESSAGE("Debut de GetAllZones") ;
+  MESSAGE("Debut de GetAllZones");
   HOMARD::listeZones_var mesZones = myHomardGen->GetAllZonesName();
   int nbrow=TWZone->rowCount();
   for ( int row=0; row< nbrow; row++)
@@ -913,7 +905,8 @@ void MonCreateHypothesis::SetAdvanced()
     CBOutputLevel->setChecked(false);
     CBOutputQuality->setChecked(false);
     CBOutputDiameter->setChecked(false);
-//     CBOutputParent->setChecked(false);
+    CBOutputParent->setChecked(false);
+    CBOutputVoisins->setChecked(false);
     _ExtraOutput = 1 ;
   }
 //