From 5fb6fecc24c950a479c38998d7e3baa71391c500 Mon Sep 17 00:00:00 2001 From: Dylan Jeannin Date: Fri, 22 May 2026 17:25:44 +0200 Subject: [PATCH 1/3] Scenarios: Set parent to EDIT when deleting current scenario --- src/Model/Study.py | 2 +- src/View/Scenarios/UndoCommand.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Model/Study.py b/src/Model/Study.py index e5ecdbbf..250efa8f 100644 --- a/src/Model/Study.py +++ b/src/Model/Study.py @@ -546,7 +546,7 @@ class Study(SQLModel): self.status.scenario = scenario if reduce( - lambda a, s: a or (s.parent is scenario), + lambda a, s: a or (s.parent is scenario and not s.is_deleted()), self.scenarios.lst, False ): diff --git a/src/View/Scenarios/UndoCommand.py b/src/View/Scenarios/UndoCommand.py index 22134470..ae3e0449 100644 --- a/src/View/Scenarios/UndoCommand.py +++ b/src/View/Scenarios/UndoCommand.py @@ -74,11 +74,10 @@ class DeleteScenariosCommand(QUndoCommand): self._study.reload_from_scenario(self._scenario) def redo(self): + self._scenario.set_as_deleted() if self._reload: self._study.reload_from_scenario(self._scenario.parent) - self._scenario.set_as_deleted() - class DuplicateScenariosCommand(QUndoCommand): def __init__(self, study): From 445c1ac7ba44ea6c28ed98f2fd251519d6f63330 Mon Sep 17 00:00:00 2001 From: Dylan Jeannin Date: Tue, 26 May 2026 07:39:49 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Scenario:=20Add=20=E2=9B=94=20symbol=20on?= =?UTF-8?q?=20missing=20windows=20when=20we=20are=20not=20in=20a=20leaf=20?= =?UTF-8?q?scenario?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/View/BoundaryConditionsAdisTS/Window.py | 2 -- src/View/D90AdisTS/Window.py | 2 -- src/View/DIFAdisTS/Window.py | 2 -- src/View/InitialConditions/Window.py | 2 -- src/View/InitialConditionsAdisTS/Window.py | 2 -- 5 files changed, 10 deletions(-) diff --git a/src/View/BoundaryConditionsAdisTS/Window.py b/src/View/BoundaryConditionsAdisTS/Window.py index b1b4a411..202c2367 100644 --- a/src/View/BoundaryConditionsAdisTS/Window.py +++ b/src/View/BoundaryConditionsAdisTS/Window.py @@ -90,8 +90,6 @@ class BoundaryConditionAdisTSWindow(PamhyrWindow): self.setup_table() self.setup_connections() - self.ui.setWindowTitle(self._title) - def setup_table(self): self._delegate_type = ComboBoxDelegate( trad=self._trad, diff --git a/src/View/D90AdisTS/Window.py b/src/View/D90AdisTS/Window.py index b24f99b6..0f659cf9 100644 --- a/src/View/D90AdisTS/Window.py +++ b/src/View/D90AdisTS/Window.py @@ -93,8 +93,6 @@ class D90AdisTSWindow(PamhyrWindow): self.setup_table() - self.ui.setWindowTitle(self._title) - def setup_table(self): path_icons = os.path.join(self._get_ui_directory(), f"ressources") diff --git a/src/View/DIFAdisTS/Window.py b/src/View/DIFAdisTS/Window.py index d2b637e8..1af13eb3 100644 --- a/src/View/DIFAdisTS/Window.py +++ b/src/View/DIFAdisTS/Window.py @@ -91,8 +91,6 @@ class DIFAdisTSWindow(PamhyrWindow): self.setup_table() - self.ui.setWindowTitle(self._title) - def setup_table(self): path_icons = os.path.join(self._get_ui_directory(), f"ressources") diff --git a/src/View/InitialConditions/Window.py b/src/View/InitialConditions/Window.py index c3ff5394..92941909 100644 --- a/src/View/InitialConditions/Window.py +++ b/src/View/InitialConditions/Window.py @@ -107,8 +107,6 @@ class InitialConditionsWindow(PamhyrWindow): self.setup_connections() self.setub_dialogs() - self.ui.setWindowTitle(self._title) - def setup_table(self): table = self.find(QTableView, f"tableView") self._delegate_rk = ComboBoxDelegate( diff --git a/src/View/InitialConditionsAdisTS/Window.py b/src/View/InitialConditionsAdisTS/Window.py index 46b84d55..f25a942f 100644 --- a/src/View/InitialConditionsAdisTS/Window.py +++ b/src/View/InitialConditionsAdisTS/Window.py @@ -100,8 +100,6 @@ class InitialConditionsAdisTSWindow(PamhyrWindow): self.setup_table() - self.ui.setWindowTitle(self._title) - def setup_table(self): path_icons = os.path.join(self._get_ui_directory(), f"ressources") From 0c7ede5f431f78d849a4d8cdb4d3e1ecfdc0b0cc Mon Sep 17 00:00:00 2001 From: Dylan Jeannin Date: Tue, 26 May 2026 08:06:07 +0200 Subject: [PATCH 3/3] Network: Add missing () on method to check if study is editable --- src/View/Network/Window.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/View/Network/Window.py b/src/View/Network/Window.py index a2b6e2bd..1346e0c8 100644 --- a/src/View/Network/Window.py +++ b/src/View/Network/Window.py @@ -147,7 +147,7 @@ class NetworkWindow(PamhyrWindow): self._graph_widget.changeEdge.connect(self.update) self._graph_widget.changeNode.connect(self.update) - if self._study.is_editable: + if self._study.is_editable(): self._nodes_model\ .dataChanged\ .connect(self._graph_widget.rename_nodes)