From cfd0064c663b81d07e085dc486c0446e5d4ec219 Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Thu, 17 Nov 2016 20:32:49 +0100 Subject: [PATCH] Report validation of ADAO Case using Eficas and documentation improvement --- doc/en/Makefile.am | 1 + doc/en/images/eficas_valid.png | Bin 0 -> 5809 bytes ...f_algorithm_DerivativeFreeOptimization.rst | 16 +++++++----- doc/fr/Makefile.am | 1 + doc/fr/images/eficas_valid.png | Bin 0 -> 5809 bytes ...f_algorithm_DerivativeFreeOptimization.rst | 20 +++++++++------ .../DerivativeFreeOptimization.py | 2 +- src/daSalome/daGUI/daGuiImpl/adaoCase.py | 14 +++++++--- src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py | 22 +++++++++++++--- .../daGUI/daGuiImpl/adaoGuiManager.py | 24 +++++++++++++++++- 10 files changed, 77 insertions(+), 23 deletions(-) create mode 100644 doc/en/images/eficas_valid.png create mode 100644 doc/fr/images/eficas_valid.png diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am index 8186fd0..db66f84 100644 --- a/doc/en/Makefile.am +++ b/doc/en/Makefile.am @@ -49,6 +49,7 @@ EXTRA_DIST = conf.py advanced.rst examples.rst index.rst intro.rst theory.rs images/eficas_close.png \ images/eficas_open.png \ images/eficas_saveas.png \ + images/eficas_valid.png \ images/yacs_containerlog.png install-data-local: diff --git a/doc/en/images/eficas_valid.png b/doc/en/images/eficas_valid.png new file mode 100644 index 0000000000000000000000000000000000000000..9790884a63bc9b377736e181147fa9e1d7204923 GIT binary patch literal 5809 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 v7|iv%0JxjGxtqJWo4dK2ySbaYIo appelle currentSelectionChanged() adaoGuiHelper.refreshObjectBrowser() +####### +# +# Gestion de la validation d'un cas +# 1: la fonction validateAdaoCase est appelee par le GUI SALOME +# +####### + + def validateAdaoCase(self): + adaoLogger.debug("Validation du cas par un rapport sur le JDC") + self.harmonizeSelectionFromEficas() + salomeStudyItem = adaoGuiHelper.getSelectedItem() + for case_name, adao_case in self.cases.iteritems(): + if adao_case.salome_study_item.GetID() == salomeStudyItem.GetID(): + msg = adao_case.validationReportforJDC() + adaoGuiHelper.gui_information(SalomePyQt.SalomePyQt().getDesktop(), msg) + break + ####### # # Gestion de la connexion avec YACS -# 1: la fonction exportCasToYACS exporte l'etude vers YACS +# 1: la fonction exportCaseToYACS exporte l'etude vers YACS # ####### def exportCaseToYACS(self): @@ -402,6 +421,9 @@ class AdaoGuiUiComponentBuilder: a = sgPyQt.createAction( UI_ELT_IDS.SAVE_AS_ADAOCASE_ID, "Save as case", "Save as case", "Save an ADAO case as", "eficas_saveas.png" ) sgPyQt.createMenu(a, mid) sgPyQt.createTool(a, tid) + a = sgPyQt.createAction( UI_ELT_IDS.VALIDATE_ADAOCASE_ID, "Validate case", "Validate case", "Validate an ADAO case", "eficas_valid.png" ) + sgPyQt.createMenu(a, mid) + sgPyQt.createTool(a, tid) a = sgPyQt.createAction( UI_ELT_IDS.CLOSE_ADAOCASE_ID, "Close case", "Close case", "Close an ADAO case", "eficas_close.png" ) sgPyQt.createMenu(a, mid) sgPyQt.createTool(a, tid) -- 2.39.2