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