From 6874f8a3f747637b6e57511266267f12a9fcb0e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=A9rald=20NICOLAS?= Date: Fri, 20 Nov 2015 09:32:54 +0100 Subject: [PATCH] Option de production d'un champ contenant le parent de la maille --- doc/en/tui_create_hypothese.rst | 3 ++- doc/fr/tui_create_hypothese.rst | 3 ++- src/HOMARD/HomardDriver.cxx | 5 +++++ src/HOMARDGUI/MonCreateHypothesis.cxx | 3 +++ src/HOMARDGUI/MonEditHypothesis.cxx | 6 ++++++ tests/test_11.py | 0 tests/test_12.py | 0 tests/test_13.py | 0 tests/test_14.py | 0 tests/test_15.py | 0 tests/test_2.py | 0 tests/test_3.py | 0 12 files changed, 18 insertions(+), 2 deletions(-) mode change 100644 => 100755 tests/test_11.py mode change 100644 => 100755 tests/test_12.py mode change 100644 => 100755 tests/test_13.py mode change 100644 => 100755 tests/test_14.py mode change 100644 => 100755 tests/test_15.py mode change 100644 => 100755 tests/test_2.py mode change 100644 => 100755 tests/test_3.py diff --git a/doc/en/tui_create_hypothese.rst b/doc/en/tui_create_hypothese.rst index 63fb554b..d0d6e2bc 100644 --- a/doc/en/tui_create_hypothese.rst +++ b/doc/en/tui_create_hypothese.rst @@ -414,7 +414,7 @@ Advanced options | | | **SetExtraOutput(option)** | | Acts if some extra information are required into the | -| output MED file. The option is a product of 2, 3, 5. | +| output MED file. The option is a product of 2, 3, 5, 7. | | | | - ``option``: integer as follows: | | | @@ -422,6 +422,7 @@ Advanced options | * 2x : the refinement level of every mesh is produced| | * 3x : the quality of every mesh | | * 5x : the diameter of every mesh | +| * 7x : common parent of every mesh | +---------------------------------------------------------------+ | .. module:: GetExtraOutput | | | diff --git a/doc/fr/tui_create_hypothese.rst b/doc/fr/tui_create_hypothese.rst index 2b32dce3..1af58314 100644 --- a/doc/fr/tui_create_hypothese.rst +++ b/doc/fr/tui_create_hypothese.rst @@ -418,7 +418,7 @@ Les options avancées | **SetExtraOutput(option)** | | Précise quelles sorties supplémentaires sur les mailles on| | veut récupérer dans le fichier MED de sortie. C'est un | -| entier multiple ou non de 2, 3, 5. | +| entier multiple ou non de 2, 3, 5, 7. | | | | - ``option`` : entier précisant le choix retenu | | | @@ -426,6 +426,7 @@ Les options avancées | * 2x : le niveau de raffinement de chaque maille | | * 3x : la qualité de chaque maille | | * 5x : le diamètre de chaque maille | +| * 7x : les fratries des mailles | +---------------------------------------------------------------+ | .. module:: GetExtraOutput | | | diff --git a/src/HOMARD/HomardDriver.cxx b/src/HOMARD/HomardDriver.cxx index 4fdaed04..af627343 100644 --- a/src/HOMARD/HomardDriver.cxx +++ b/src/HOMARD/HomardDriver.cxx @@ -992,6 +992,11 @@ void HomardDriver::TexteAdvanced( int Pyram, int NivMax, double DiamMin, int Ada _Texte += "# Sortie des diamètres des mailles\n" ; _Texte += "NCDiamet DIAM\n" ; } + if ( ExtraOutput % 7 == 0 ) + { + _Texte += "# Sortie des parents des mailles\n" ; + _Texte += "NCParent PARENT\n" ; + } } //=============================================================================== // G. Les messages diff --git a/src/HOMARDGUI/MonCreateHypothesis.cxx b/src/HOMARDGUI/MonCreateHypothesis.cxx index 26b9bfd0..7ec1a47a 100644 --- a/src/HOMARDGUI/MonCreateHypothesis.cxx +++ b/src/HOMARDGUI/MonCreateHypothesis.cxx @@ -77,6 +77,7 @@ MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal, CBOutputLevel->setChecked(false); CBOutputQuality->setChecked(false); CBOutputDiameter->setChecked(false); +// CBOutputParent->setChecked(false); _ExtraOutput = 1 ; // adjustSize(); @@ -199,6 +200,7 @@ bool MonCreateHypothesis::PushOnApply() if (CBOutputLevel->isChecked()) { _ExtraOutput = 2 ; } if (CBOutputQuality->isChecked()) { _ExtraOutput = 3*_ExtraOutput ; } if (CBOutputDiameter->isChecked()) { _ExtraOutput = 5*_ExtraOutput ; } +// if (CBOutputParent->isChecked()) { _ExtraOutput = 7*_ExtraOutput ; } aHypothesis->SetExtraOutput(_ExtraOutput); } @@ -911,6 +913,7 @@ void MonCreateHypothesis::SetAdvanced() CBOutputLevel->setChecked(false); CBOutputQuality->setChecked(false); CBOutputDiameter->setChecked(false); +// CBOutputParent->setChecked(false); _ExtraOutput = 1 ; } // diff --git a/src/HOMARDGUI/MonEditHypothesis.cxx b/src/HOMARDGUI/MonEditHypothesis.cxx index 8327d623..08bc91c1 100644 --- 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); } diff --git a/tests/test_11.py b/tests/test_11.py old mode 100644 new mode 100755 diff --git a/tests/test_12.py b/tests/test_12.py old mode 100644 new mode 100755 diff --git a/tests/test_13.py b/tests/test_13.py old mode 100644 new mode 100755 diff --git a/tests/test_14.py b/tests/test_14.py old mode 100644 new mode 100755 diff --git a/tests/test_15.py b/tests/test_15.py old mode 100644 new mode 100755 diff --git a/tests/test_2.py b/tests/test_2.py old mode 100644 new mode 100755 diff --git a/tests/test_3.py b/tests/test_3.py old mode 100644 new mode 100755 -- 2.39.2