mirror of https://gitlab.com/pamhyr/pamhyr2
Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure
commit
be19a11387
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -166,14 +166,10 @@ class HydraulicStructuresWindow(PamhyrWindow):
|
|||
self._checkbox.stateChanged.connect(self._set_structure_state)
|
||||
|
||||
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"))
|
||||
|
||||
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:
|
||||
|
|
|
|||
Loading…
Reference in New Issue