diff --git a/src/Model/Geometry/ProfileXYZ.py b/src/Model/Geometry/ProfileXYZ.py index 7936342aee3b547e13ea36c927edfd5e5a2877bf..bb3faa0b7eba7908f72b5eb4d004e94ec24cbab0 100644 --- a/src/Model/Geometry/ProfileXYZ.py +++ b/src/Model/Geometry/ProfileXYZ.py @@ -253,6 +253,15 @@ class ProfileXYZ(Profile, SQLSubModel): return point + def display_name(self): + name = "" + if self.name != "": + name += f"{self.name} " + + name += f"({self.rk})" + + return name + def x(self): return [point.x for point in self.points] diff --git a/src/Model/Stricklers/Stricklers.py b/src/Model/Stricklers/Stricklers.py index 45272f7d5810a3e3787a2f1244348147ac5d1baa..c3192d005af3e11294bf127b5e70a077f8fd8382 100644 --- a/src/Model/Stricklers/Stricklers.py +++ b/src/Model/Stricklers/Stricklers.py @@ -113,10 +113,7 @@ class Stricklers(SQLSubModel): return True def __str__(self): - if self._name != "": - return f"{self._name} ({self._minor}, {self._medium})" - - return f"({self._minor}, {self._medium})" + return f"{self.name} ({self._minor}, {self._medium})" @property def name(self): diff --git a/src/View/Frictions/translate.py b/src/View/Frictions/translate.py index 5c62ba6c0ccf7fbca6c74b9a6329625643fb2cbd..9f2d329bcd64abb18b05db34fa22f273fff18c06 100644 --- a/src/View/Frictions/translate.py +++ b/src/View/Frictions/translate.py @@ -44,6 +44,6 @@ class FrictionsTranslate(MainTranslate): # "edge": self._dict["reach"], "begin_rk": _translate("Frictions", "Start (m)"), "end_rk": _translate("Frictions", "End (m)"), - "begin_strickler": _translate("Frictions", "Start coefficient"), - "end_strickler": _translate("Frictions", "End coefficient"), + "begin_strickler": _translate("Frictions", "Coefficient"), + # "end_strickler": _translate("Frictions", "End coefficient"), } diff --git a/src/View/HydraulicStructures/Table.py b/src/View/HydraulicStructures/Table.py index e8530b1a24faac926b642aeb9b53ac567811e4c8..cf547875e1afedce0d448f1f45655ff5e5f85858 100644 --- a/src/View/HydraulicStructures/Table.py +++ b/src/View/HydraulicStructures/Table.py @@ -65,7 +65,8 @@ class ComboBoxDelegate(QItemDelegate): if reach is not None: val = list( map( - lambda rk: str(rk), reach.reach.get_rk() + lambda p: p.display_name(), + reach.reach.profiles ) ) else: @@ -89,7 +90,23 @@ class ComboBoxDelegate(QItemDelegate): def setModelData(self, editor, model, index): text = str(editor.currentText()) - model.setData(index, text) + + if self._mode == "rk": + reach = self._data.hydraulic_structures\ + .get(index.row())\ + .input_reach + profiles = list( + filter( + lambda p: p.display_name() == text, + reach.reach.profiles + ) + ) + + value = profiles[0].rk if len(profiles) > 0 else None + else: + value = text + + model.setData(index, value) editor.close() editor.deleteLater()