From e41c23120a3a8506b400656fd82d8a28e4f29895 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Mon, 11 Dec 2023 10:59:10 +0100 Subject: [PATCH 1/3] HS: Minor fix add method. --- src/Model/HydraulicStructures/HydraulicStructures.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Model/HydraulicStructures/HydraulicStructures.py b/src/Model/HydraulicStructures/HydraulicStructures.py index 99dc2dc7..5799925b 100644 --- a/src/Model/HydraulicStructures/HydraulicStructures.py +++ b/src/Model/HydraulicStructures/HydraulicStructures.py @@ -24,6 +24,9 @@ from Model.Tools.PamhyrDB import SQLSubModel from Model.Except import NotImplementedMethodeError from Model.HydraulicStructures.Basic.HydraulicStructures import BasicHS +from Model.HydraulicStructures.Basic.Types import ( + NotDefined, +) logger = logging.getLogger() @@ -231,7 +234,7 @@ class HydraulicStructure(SQLSubModel): return self._data.copy() def add(self, index: int): - value = BasicHS(status=self._status) + value = NotDefined(status=self._status) self._data.insert(index, value) self._status.modified() return value From 6951b823392a24200fd50b8665b3116ba8571096 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Mon, 11 Dec 2023 11:12:41 +0100 Subject: [PATCH 2/3] Friction: Delete useless prints. --- src/Model/Friction/Friction.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Model/Friction/Friction.py b/src/Model/Friction/Friction.py index 2e6ec259..ecc4a559 100644 --- a/src/Model/Friction/Friction.py +++ b/src/Model/Friction/Friction.py @@ -64,8 +64,6 @@ class Friction(SQLSubModel): def _db_load(cls, execute, data=None): new = [] - logger.info(data) - reach = data["reach"] status = data["status"] stricklers = data["stricklers"].stricklers @@ -91,8 +89,6 @@ class Friction(SQLSubModel): new.append((ind, sec)) - logger.info(new) - return new def _db_save(self, execute, data=None): From ac2a2002b7766c3669c02482fdd32b5880494a7a Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Mon, 11 Dec 2023 11:12:57 +0100 Subject: [PATCH 3/3] HS: Fix checkbox state at undo add command. --- src/View/HydraulicStructures/Window.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/View/HydraulicStructures/Window.py b/src/View/HydraulicStructures/Window.py index 2b0d1f8d..292133f9 100644 --- a/src/View/HydraulicStructures/Window.py +++ b/src/View/HydraulicStructures/Window.py @@ -165,13 +165,9 @@ class HydraulicStructuresWindow(PamhyrWindow): table = self.find(QTableView, "tableView") table.selectionModel()\ - .selectionChanged\ - .connect(self._set_checkbox_state) - table.selectionModel()\ - .selectionChanged\ - .connect(self.update) - #self._delegate_kp.currentItemChanged.connect(lambda:x, print("toto")) - #self._delegate_reach.currentItemChanged.connect(lambda:x, print("titi")) + .selectionChanged\ + .connect(self.update) + self._table.dataChanged.connect(self.update) self._table.layoutChanged.connect(self.update) @@ -266,6 +262,8 @@ class HydraulicStructuresWindow(PamhyrWindow): self._hs_lst.get(row).enabled = self._checkbox.isChecked() def update(self): + self._set_checkbox_state() + rows = self.index_selected_rows() if len(rows) > 0 and len(self._hs_lst) > 0: