From d2a4069e321f2e2c319477f5332c95740c2384e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Ribes?= Date: Fri, 1 Apr 2011 15:53:23 +0200 Subject: [PATCH] Ajout information manquante ordre --- src/daEficas/generator_adao.py | 2 ++ src/daSalome/daGUI/daGuiImpl/adaoCase.py | 12 +++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/daEficas/generator_adao.py b/src/daEficas/generator_adao.py index 6146f62..91b63ec 100644 --- a/src/daEficas/generator_adao.py +++ b/src/daEficas/generator_adao.py @@ -206,6 +206,7 @@ class AdaoGenerator(PythonGenerator): sizes = self.dictMCVal["__ASSIMILATION_STUDY__InputVariables__SIZES"] self.text_da += "inputvariables_config = {} \n" + self.text_da += "inputvariables_config[\"Order\"] = %s \n" % list(names) for name, size in zip(names, sizes): self.text_da += "inputvariables_config[\"%s\"] = %s \n" % (name,size) self.text_da += "study_config[\"InputVariables\"] = inputvariables_config \n" @@ -228,6 +229,7 @@ class AdaoGenerator(PythonGenerator): sizes = self.dictMCVal["__ASSIMILATION_STUDY__OutputVariables__SIZES"] self.text_da += "outputvariables_config = {} \n" + self.text_da += "outputvariables_config[\"Order\"] = %s \n" % list(names) for name, size in zip(names, sizes): self.text_da += "outputvariables_config[\"%s\"] = %s \n" % (name,size) self.text_da += "study_config[\"OutputVariables\"] = outputvariables_config \n" diff --git a/src/daSalome/daGUI/daGuiImpl/adaoCase.py b/src/daSalome/daGUI/daGuiImpl/adaoCase.py index 602ec91..8ad01a5 100644 --- a/src/daSalome/daGUI/daGuiImpl/adaoCase.py +++ b/src/daSalome/daGUI/daGuiImpl/adaoCase.py @@ -66,15 +66,13 @@ class AdaoCase: if (self.filename == ""): return "You need to save your case to export it" + self.eficas_editor.modified = True + self.eficas_editor.saveFile() filename = self.filename[:self.filename.rfind(".")] + '.py' if not os.path.exists(filename): - # On essaye de le créer une fois - self.eficas_editor.modified = True - self.eficas_editor.saveFile() - if not os.path.exists(filename): - msg = "Cannot find the py file for YACS generation \n" - msg += "Is your case correct ? \n" - return msg + msg = "Cannot find the py file for YACS generation \n" + msg += "Is your case correct ? \n" + return msg if not os.environ.has_key("ADAO_ROOT_DIR"): return "Please add ADAO_ROOT_DIR to your environnement" -- 2.39.2