Merge branch 'master' into refactoring.

src/Model/Stricklers/Stricklers.py

@@ -38,7 +38,7 @@ class Stricklers(SQLSubModel):
         else:
             self.id = id
 
-        Stricklers._id_cnt = max(Stricklers._id_cnt + 1, self.id)
+        Stricklers._id_cnt = max(Stricklers._id_cnt + 1, id + 1)
 
         self._name = name
         self._comment = comment

src/View/BoundaryCondition/translate.py

@@ -29,9 +29,9 @@ _translate = QCoreApplication.translate
 long_types = {
     "ND": _translate("BoundaryCondition", "Not defined"),
     "PC": _translate("BoundaryCondition", "Ponctual contribution"),
-    "TZ": _translate("BoundaryCondition", "Time over Z"),
-    "TD": _translate("BoundaryCondition", "Time over Discharge"),
-    "ZD": _translate("BoundaryCondition", "Z over Discharge"),
+    "TZ": _translate("BoundaryCondition", "TimeZ"),
+    "TD": _translate("BoundaryCondition", "TimeDischarge"),
+    "ZD": _translate("BoundaryCondition", "ZDischarge"),
     "SL": _translate("BoundaryCondition", "Solid"),
 }
 

src/View/Geometry/PlotAC.py

@@ -67,18 +67,18 @@ class PlotAC(APlot):
         gl = self.data.profile(selected_profile).names()
 
         self.canvas.axes.set_xlabel(
-            _translate("MainWindow_reach", "Abscisse en travers (m)"),
+            _translate("MainWindow_reach", "Transverse abscissa (m)"),
             color='green', fontsize=12
         )
         self.canvas.axes.set_ylabel(
-            _translate("MainWindow_reach", "Cote (m)"),
+            _translate("MainWindow_reach", "Height (m)"),
             color='green', fontsize=12
         )
         self.canvas.figure.tight_layout()
 
-        label_before_plot_selected = _translate("MainWindow_reach", "Profil précédent")
-        label_plot_selected = _translate("MainWindow_reach", "Profil sélectionné")
-        label_after_plot_selected = _translate("MainWindow_reach", "Profil suivant")
+        label_before_plot_selected = _translate("MainWindow_reach", "Previous cross-section")
+        label_plot_selected = _translate("MainWindow_reach", "Cross-section")
+        label_after_plot_selected = _translate("MainWindow_reach", "Next cross-section")
         color_before_plot_selected = "k"  # 'grey'
         color_plot_selected = 'b'
         color_after_plot_selected = 'm'

src/View/Geometry/Window.py

@@ -111,7 +111,7 @@ class GeometryWindow(ASubMainWindow, ListedSubWindow):
         self.ui.btn_sort_desc.triggered.connect(self.sort_descending)
         self.ui.btn_move_up.triggered.connect(self.move_row_up)
         self.ui.btn_move_down.triggered.connect(self.move_row_down)
-        self.ui.btn_end_editing.triggered.connect(self.handleSave)
+        # self.ui.btn_end_editing.triggered.connect(self.handleSave)
         self.ui.btn_add.triggered.connect(self.insert_row)
         self.ui.btn_delete.triggered.connect(self.delete_rows)
         self.ui.btn_edit.triggered.connect(self.edit_profile)