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

src/Model/InitialConditions/InitialConditions.py

@@ -395,6 +395,7 @@ class InitialConditions(SQLSubModel):
             self._data.append(new)
             previous_elevation = elevation
 
+        self._generate_resort_data(profiles)
 
     def generate_discharge(self, discharge: float):
         self._data = []
@@ -438,3 +439,15 @@ class InitialConditions(SQLSubModel):
 
             previous_elevation = elevation
             self._data.append(new)
+
+        self._generate_resort_data(profiles)
+
+    def _generate_resort_data(self, profiles):
+        is_reverse = False
+        if profiles[0].kp > profiles[-1].kp:
+            is_reverse = True
+
+        self._data.sort(
+            reverse=not is_reverse,
+            key=lambda d: d['kp']
+        )

src/View/Reservoir/Table.py

@@ -56,9 +56,22 @@ class ComboBoxDelegate(QItemDelegate):
     def createEditor(self, parent, option, index):
         self.editor = QComboBox(parent)
 
+        nodes = list(
+            map(
+                lambda n: n.name,
+                filter(
+                    lambda n: not (
+                        self._data.is_upstream_node(n)
+                        or self._data.is_downstream_node(n)
+                    ),
+                    self._data.nodes()
+                )
+            )
+        )
+
         self.editor.addItems(
             [_translate("Reservoir", "Not associated")] +
-            self._data.nodes_names()
+            nodes
         )
 
         self.editor.setCurrentText(index.data(Qt.DisplayRole))