X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHOMARDGUI%2FMonCreateHypothesis.cxx;h=1e30fc359288bd0d7831d819b1d612174e6f47ac;hb=544c1b539d74424d9404eecc323dc0263800d0f9;hp=86b8d39b9816b2e588ba5c9828805ac1cd4928fb;hpb=72cfcf42c05e96962492eee5a628a020ce8b367b;p=modules%2Fhomard.git

diff --git a/src/HOMARDGUI/MonCreateHypothesis.cxx b/src/HOMARDGUI/MonCreateHypothesis.cxx
old mode 100755
new mode 100644
index 86b8d39b..1e30fc35
--- a/src/HOMARDGUI/MonCreateHypothesis.cxx
+++ b/src/HOMARDGUI/MonCreateHypothesis.cxx
@@ -1,4 +1,4 @@
-// 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
@@ -77,6 +77,8 @@ MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal,
       CBOutputLevel->setChecked(false);
       CBOutputQuality->setChecked(false);
       CBOutputDiameter->setChecked(false);
+      CBOutputParent->setChecked(false);
+      CBOutputVoisins->setChecked(false);
       _ExtraOutput = 1 ;
 //
       adjustSize();
@@ -114,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()));
@@ -196,9 +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 (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);
   }
 
@@ -314,7 +317,7 @@ void MonCreateHypothesis::PushZoneNew()
 // ------------------------------------------------------------------------
 {
   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();
 }
 
@@ -332,18 +335,9 @@ void MonCreateHypothesis::PushZoneEdit()
     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()
@@ -707,7 +701,7 @@ void MonCreateHypothesis::SetFiltrage()
 // ------------------------------------------------------------------------
 {
   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();
 }
 
@@ -911,6 +905,8 @@ void MonCreateHypothesis::SetAdvanced()
     CBOutputLevel->setChecked(false);
     CBOutputQuality->setChecked(false);
     CBOutputDiameter->setChecked(false);
+    CBOutputParent->setChecked(false);
+    CBOutputVoisins->setChecked(false);
     _ExtraOutput = 1 ;
   }
 //