parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure

setup.py
Theophile Terraz 2023-12-11 11:20:51 +01:00
parent 062743d748 ac2a2002b7
commit be19a11387
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/Friction/Friction.py
View File

@ -64,8 +64,6 @@ class Friction(SQLSubModel):
def _db_load(cls, execute, data=None): def _db_load(cls, execute, data=None):
new = [] new = []
logger.info(data)
reach = data["reach"] reach = data["reach"]
status = data["status"] status = data["status"]
stricklers = data["stricklers"].stricklers stricklers = data["stricklers"].stricklers
@ -91,8 +89,6 @@ class Friction(SQLSubModel):
new.append((ind, sec)) new.append((ind, sec))
logger.info(new)
return new return new
def _db_save(self, execute, data=None): def _db_save(self, execute, data=None):

5
src/Model/HydraulicStructures/HydraulicStructures.py
View File

@ -24,6 +24,9 @@ from Model.Tools.PamhyrDB import SQLSubModel
from Model.Except import NotImplementedMethodeError from Model.Except import NotImplementedMethodeError
from Model.HydraulicStructures.Basic.HydraulicStructures import BasicHS from Model.HydraulicStructures.Basic.HydraulicStructures import BasicHS
from Model.HydraulicStructures.Basic.Types import (
NotDefined,
)
logger = logging.getLogger() logger = logging.getLogger()
@ -231,7 +234,7 @@ class HydraulicStructure(SQLSubModel):
return self._data.copy() return self._data.copy()
def add(self, index: int): def add(self, index: int):
value = BasicHS(status=self._status) value = NotDefined(status=self._status)
self._data.insert(index, value) self._data.insert(index, value)
self._status.modified() self._status.modified()
return value return value

12
src/View/HydraulicStructures/Window.py
View File

@ -167,13 +167,9 @@ class HydraulicStructuresWindow(PamhyrWindow):
table = self.find(QTableView, "tableView") table = self.find(QTableView, "tableView")
table.selectionModel()\ table.selectionModel()\
.selectionChanged\ .selectionChanged\
.connect(self._set_checkbox_state) .connect(self.update)
table.selectionModel()\
.selectionChanged\
.connect(self.update)
#self._delegate_kp.currentItemChanged.connect(lambda:x, print("toto"))
#self._delegate_reach.currentItemChanged.connect(lambda:x, print("titi"))
self._table.dataChanged.connect(self.update) self._table.dataChanged.connect(self.update)
self._table.layoutChanged.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() self._hs_lst.get(row).enabled = self._checkbox.isChecked()
def update(self): def update(self):
self._set_checkbox_state()
rows = self.index_selected_rows() rows = self.index_selected_rows()
if len(rows) > 0 and len(self._hs_lst) > 0: if len(rows) > 0 and len(self._hs_lst) > 0: