Merge branch 'dev_dylan' into temperature_test

src/View/Frictions/Table.py

@@ -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):

src/View/Frictions/Window.py

@@ -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,