diff --git a/src/Model/Friction/Friction.py b/src/Model/Friction/Friction.py index 2e6ec259bf4b3c09e218d30aa987a9cdfeac18c0..ecc4a559f9c3a2a5ca8d04850f849c4a2b9e2e58 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): diff --git a/src/Model/HydraulicStructures/HydraulicStructures.py b/src/Model/HydraulicStructures/HydraulicStructures.py index 99dc2dc718e8a13efbeae856f4b26018fadd373b..5799925b8094206466f33792337b7a542c8e4e9a 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 diff --git a/src/View/HydraulicStructures/Window.py b/src/View/HydraulicStructures/Window.py index 17ece401ab591b71b73514fb3e9749a723837c76..0b322844bb1ac3b70398f2f02b80a4b86a5eb626 100644 --- a/src/View/HydraulicStructures/Window.py +++ b/src/View/HydraulicStructures/Window.py @@ -167,13 +167,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) @@ -268,6 +264,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: