Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr

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]
 

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._name} ({self._minor}, {self._medium})"
-
-        return f"({self._minor}, {self._medium})"
 
     @property
     def name(self):

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"),
+            "begin_strickler": _translate("Frictions", "Coefficient"),
-            "end_strickler": _translate("Frictions", "End coefficient"),
+            # "end_strickler": _translate("Frictions", "End coefficient"),
         }

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()