From 019701422269a91c6a538ef6820c9bb6b218beb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Eide?= Date: Thu, 23 May 2024 13:35:51 +0200 Subject: [PATCH] Review comment --- .../jobs/internal-gui/scripts/csv_export.py | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/ert/shared/share/ert/workflows/jobs/internal-gui/scripts/csv_export.py b/src/ert/shared/share/ert/workflows/jobs/internal-gui/scripts/csv_export.py index eea3d8883c3..35f176e0f94 100644 --- a/src/ert/shared/share/ert/workflows/jobs/internal-gui/scripts/csv_export.py +++ b/src/ert/shared/share/ert/workflows/jobs/internal-gui/scripts/csv_export.py @@ -94,7 +94,7 @@ def run( if ensemble_list is not None: if ensemble_list.strip() == "*": - ensembles = self.getAllEnsembleList() + ensembles = self.getAllEnsembleList(storage) else: ensembles = ensemble_list.split(",") @@ -168,21 +168,18 @@ def getArguments(self, parent, ert_config, storage): description = "The CSV export requires some information before it starts:" dialog = CustomDialog("CSV Export", description, parent) - default_csv_output_path = self.get_context_value( - "", default="output.csv" - ) + subs_list = ert_config.substitution_list + default_csv_output_path = subs_list.get("", "output.csv") output_path_model = PathModel(default_csv_output_path) output_path_chooser = PathChooser(output_path_model) - design_matrix_default = self.get_context_value( - "", default="" - ) + design_matrix_default = subs_list.get("", "") design_matrix_path_model = PathModel( design_matrix_default, is_required=False, must_exist=True ) design_matrix_path_chooser = PathChooser(design_matrix_path_model) - list_edit = ListEditBox(self.getAllEnsembleList()) + list_edit = ListEditBox(self.getAllEnsembleList(storage)) infer_iteration_check = QCheckBox() infer_iteration_check.setChecked(True) @@ -221,14 +218,9 @@ def getArguments(self, parent, ert_config, storage): raise CancelPluginException("User cancelled!") - def get_context_value(self, name, default): - context = self.ert().substitution_list - if name in context: - return context[name] - return default - - def getAllEnsembleList(self): + @staticmethod + def getAllEnsembleList(storage): all_ensemble_list = [ - ensemble.name for ensemble in self.storage.ensembles if ensemble.has_data() + ensemble.name for ensemble in storage.ensembles if ensemble.has_data() ] return all_ensemble_list