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

Merge branch 'dev_dylan' into temperature_test

dev_dylan
Dylan Jeannin 2026-07-20 15:16:41 +02:00
parent c9bb222bff 600f86aeb4
commit 0d0c4f913e
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/View/Frictions/Table.py
View File

@ -73,8 +73,12 @@ class ComboBoxDelegate(QItemDelegate):
)
)
)
elif self._mode == "rk":
self.editor.addItems(
list(map(str, self._data.reach.get_rk()))
)
self.editor.setCurrentText(index.data(Qt.DisplayRole))
self.editor.setCurrentText(str(index.data(Qt.DisplayRole)))
return self.editor
def setEditorData(self, editor, index):

11
src/View/Frictions/Window.py
View File

@ -105,6 +105,13 @@ class FrictionsWindow(PamhyrWindow):
trad=self._trad,
parent=self
)
self._delegate_rk = ComboBoxDelegate(
data=self._reach,
study=self._study,
mode="rk",
trad=self._trad,
parent=self
)
if self._study.is_editable():
editable_headers = [
@ -120,8 +127,10 @@ class FrictionsWindow(PamhyrWindow):
table_headers=self._trad.get_dict("table_headers"),
editable_headers=editable_headers,
delegates={
"begin_rk": self._delegate_rk,
"end_rk": self._delegate_rk,
"begin_strickler": self._delegate_stricklers,
"end_strickler": self._delegate_stricklers,
# "end_strickler": self._delegate_stricklers,
},
data=self._reach,
trad=self._trad,