mirror of https://gitlab.com/pamhyr/pamhyr2
paper: Add patch for simhydro paper
Pierre-Antoine Rouby
parent
9799e225a4
commit
4b82234e98
|
|
@ -0,0 +1,635 @@
|
|||
diff --git a/packages/linux.sh b/packages/linux.sh
|
||||
index 215047e..a19bfb6 100755
|
||||
--- a/packages/linux.sh
|
||||
+++ b/packages/linux.sh
|
||||
@@ -76,11 +76,11 @@ mv ../pamhyr-src.tar.gz ./
|
||||
|
||||
echo " *** MAKE BIN PACKAGE"
|
||||
|
||||
-OLD_PWD=$PWD
|
||||
-cd dist/
|
||||
-tar --xz -cf pamhyr-gnulinux-amd64.tar.xz pamhyr --checkpoint=.100
|
||||
-cd $OLD_PWD
|
||||
+# OLD_PWD=$PWD
|
||||
+# cd dist/
|
||||
+# tar --xz -cf pamhyr-gnulinux-amd64.tar.xz pamhyr --checkpoint=.100
|
||||
+# cd $OLD_PWD
|
||||
|
||||
-mv dist/pamhyr-gnulinux-amd64.tar.xz ./
|
||||
+# mv dist/pamhyr-gnulinux-amd64.tar.xz ./
|
||||
|
||||
echo " *** DONE"
|
||||
diff --git a/src/Model/Friction/Friction.py b/src/Model/Friction/Friction.py
|
||||
index 18167a8..5bf2302 100644
|
||||
--- a/src/Model/Friction/Friction.py
|
||||
+++ b/src/Model/Friction/Friction.py
|
||||
@@ -170,6 +170,7 @@ class Friction(SQLSubModel):
|
||||
@begin_strickler.setter
|
||||
def begin_strickler(self, strickler):
|
||||
self._begin_strickler = strickler
|
||||
+ self._end_strickler = strickler # HACK: Only one Strickler
|
||||
self._status.modified()
|
||||
|
||||
@property
|
||||
diff --git a/src/Model/Stricklers/Stricklers.py b/src/Model/Stricklers/Stricklers.py
|
||||
index baa484f..a5670d2 100644
|
||||
--- a/src/Model/Stricklers/Stricklers.py
|
||||
+++ b/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
|
||||
diff --git a/src/View/BoundaryCondition/translate.py b/src/View/BoundaryCondition/translate.py
|
||||
index c4ff8f8..172999a 100644
|
||||
--- a/src/View/BoundaryCondition/translate.py
|
||||
+++ b/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"),
|
||||
}
|
||||
|
||||
diff --git a/src/View/Frictions/PlotStricklers.py b/src/View/Frictions/PlotStricklers.py
|
||||
index 71ff6e6..b9060bc 100644
|
||||
--- a/src/View/Frictions/PlotStricklers.py
|
||||
+++ b/src/View/Frictions/PlotStricklers.py
|
||||
@@ -106,6 +106,8 @@ class PlotStricklers(APlot):
|
||||
)
|
||||
self.draw_frictions(lst, color="b")
|
||||
|
||||
+ self.canvas.axes.invert_xaxis()
|
||||
+
|
||||
self.canvas.figure.tight_layout()
|
||||
self.canvas.figure.canvas.draw_idle()
|
||||
if self.toolbar is not None:
|
||||
diff --git a/src/View/Frictions/Window.py b/src/View/Frictions/Window.py
|
||||
index 4af3b66..f46fae3 100644
|
||||
--- a/src/View/Frictions/Window.py
|
||||
+++ b/src/View/Frictions/Window.py
|
||||
@@ -112,10 +112,10 @@ class FrictionsWindow(ASubMainWindow, ListedSubWindow):
|
||||
)
|
||||
|
||||
table.setItemDelegateForColumn(
|
||||
- 3, self._delegate_stricklers
|
||||
+ 2, self._delegate_stricklers
|
||||
)
|
||||
table.setItemDelegateForColumn(
|
||||
- 4, self._delegate_stricklers
|
||||
+ 3, self._delegate_stricklers
|
||||
)
|
||||
|
||||
table.setSelectionBehavior(QAbstractItemView.SelectRows)
|
||||
diff --git a/src/View/Frictions/translate.py b/src/View/Frictions/translate.py
|
||||
index 21981ab..82071e9 100644
|
||||
--- a/src/View/Frictions/translate.py
|
||||
+++ b/src/View/Frictions/translate.py
|
||||
@@ -21,10 +21,10 @@ from PyQt5.QtCore import QCoreApplication
|
||||
_translate = QCoreApplication.translate
|
||||
|
||||
table_headers = {
|
||||
- "name": _translate("Frictions", "Name"),
|
||||
+ # "name": _translate("Frictions", "Name"),
|
||||
# "edge": _translate("Frictions", "Reach"),
|
||||
"begin_kp": _translate("Frictions", "Begin kp (m)"),
|
||||
"end_kp": _translate("Frictions", "End kp (m)"),
|
||||
- "begin_strickler": _translate("Frictions", "Begin strickler"),
|
||||
- "end_strickler": _translate("Frictions", "End strickler"),
|
||||
+ "begin_strickler": _translate("Frictions", "Strickler"),
|
||||
+ # "end_strickler": _translate("Frictions", "End strickler"),
|
||||
}
|
||||
diff --git a/src/View/Geometry/PlotKPZ.py b/src/View/Geometry/PlotKPZ.py
|
||||
index eb7d5e2..64057aa 100644
|
||||
--- a/src/View/Geometry/PlotKPZ.py
|
||||
+++ b/src/View/Geometry/PlotKPZ.py
|
||||
@@ -158,6 +158,8 @@ class PlotKPZ(APlot):
|
||||
color='lightgrey'
|
||||
)
|
||||
|
||||
+ self.canvas.axes.invert_xaxis()
|
||||
+
|
||||
self.canvas.figure.tight_layout()
|
||||
self.canvas.figure.canvas.draw_idle()
|
||||
if self.toolbar is not None:
|
||||
diff --git a/src/View/Geometry/Window.py b/src/View/Geometry/Window.py
|
||||
index 7776d73..1c8cb5d 100644
|
||||
--- a/src/View/Geometry/Window.py
|
||||
+++ b/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)
|
||||
diff --git a/src/View/Geometry/mainwindow_ui_reach.py b/src/View/Geometry/mainwindow_ui_reach.py
|
||||
index 897b698..60bcfa6 100644
|
||||
--- a/src/View/Geometry/mainwindow_ui_reach.py
|
||||
+++ b/src/View/Geometry/mainwindow_ui_reach.py
|
||||
@@ -95,29 +95,29 @@ class Ui_MainWindow(object):
|
||||
self.btn_edit.setIcon(icon_btn_edit)
|
||||
self.toolBar.addAction(self.btn_edit)
|
||||
|
||||
- self.btn_copy_selected_profile = QtWidgets.QAction(self.widget)
|
||||
- self.btn_copy_selected_profile.setObjectName("btn_copy_selected_profile")
|
||||
- icon_btn_copy_selected_profile = QtGui.QIcon()
|
||||
- icon_btn_copy_selected_profile.addPixmap(
|
||||
- QtGui.QPixmap(f"{icon_path}gtk-copy.png"))
|
||||
- self.btn_copy_selected_profile.setIcon(icon_btn_copy_selected_profile)
|
||||
- self.toolBar.addAction(self.btn_copy_selected_profile)
|
||||
-
|
||||
- self.btn_paste_selected_profile = QtWidgets.QAction(self.widget)
|
||||
- self.btn_paste_selected_profile.setObjectName("btn_paste_selected_profile")
|
||||
- icon_btn_paste_selected_profile = QtGui.QIcon()
|
||||
- icon_btn_paste_selected_profile.addPixmap(
|
||||
- QtGui.QPixmap(f"{icon_path}gtk-paste.png"))
|
||||
- self.btn_paste_selected_profile.setIcon(icon_btn_paste_selected_profile)
|
||||
- self.toolBar.addAction(self.btn_paste_selected_profile)
|
||||
-
|
||||
- self.btn_duplicate_selected_profile = QtWidgets.QAction(self.widget)
|
||||
- self.btn_duplicate_selected_profile.setObjectName("btn_duplicate_selected_profile")
|
||||
- icon_btn_duplicate_selected_profile = QtGui.QIcon()
|
||||
- icon_btn_duplicate_selected_profile.addPixmap(
|
||||
- QtGui.QPixmap(f"{icon_path}gtk-dnd-multiple.png"))
|
||||
- self.btn_duplicate_selected_profile.setIcon(icon_btn_duplicate_selected_profile)
|
||||
- self.toolBar.addAction(self.btn_duplicate_selected_profile)
|
||||
+ # self.btn_copy_selected_profile = QtWidgets.QAction(self.widget)
|
||||
+ # self.btn_copy_selected_profile.setObjectName("btn_copy_selected_profile")
|
||||
+ # icon_btn_copy_selected_profile = QtGui.QIcon()
|
||||
+ # icon_btn_copy_selected_profile.addPixmap(
|
||||
+ # QtGui.QPixmap(f"{icon_path}gtk-copy.png"))
|
||||
+ # self.btn_copy_selected_profile.setIcon(icon_btn_copy_selected_profile)
|
||||
+ # self.toolBar.addAction(self.btn_copy_selected_profile)
|
||||
+
|
||||
+ # self.btn_paste_selected_profile = QtWidgets.QAction(self.widget)
|
||||
+ # self.btn_paste_selected_profile.setObjectName("btn_paste_selected_profile")
|
||||
+ # icon_btn_paste_selected_profile = QtGui.QIcon()
|
||||
+ # icon_btn_paste_selected_profile.addPixmap(
|
||||
+ # QtGui.QPixmap(f"{icon_path}gtk-paste.png"))
|
||||
+ # self.btn_paste_selected_profile.setIcon(icon_btn_paste_selected_profile)
|
||||
+ # self.toolBar.addAction(self.btn_paste_selected_profile)
|
||||
+
|
||||
+ # self.btn_duplicate_selected_profile = QtWidgets.QAction(self.widget)
|
||||
+ # self.btn_duplicate_selected_profile.setObjectName("btn_duplicate_selected_profile")
|
||||
+ # icon_btn_duplicate_selected_profile = QtGui.QIcon()
|
||||
+ # icon_btn_duplicate_selected_profile.addPixmap(
|
||||
+ # QtGui.QPixmap(f"{icon_path}gtk-dnd-multiple.png"))
|
||||
+ # self.btn_duplicate_selected_profile.setIcon(icon_btn_duplicate_selected_profile)
|
||||
+ # self.toolBar.addAction(self.btn_duplicate_selected_profile)
|
||||
|
||||
self.btn_sort_asc = QtWidgets.QAction(self.widget)
|
||||
self.btn_sort_asc.setObjectName("btn_sort_asc")
|
||||
@@ -151,13 +151,13 @@ class Ui_MainWindow(object):
|
||||
self.btn_move_down.setIcon(icon_btn_move_down)
|
||||
self.toolBar.addAction(self.btn_move_down)
|
||||
|
||||
- self.btn_end_editing = QtWidgets.QAction(self.widget)
|
||||
- self.btn_end_editing.setObjectName("btn_end_editing")
|
||||
- icon_btn_save = QtGui.QIcon()
|
||||
- icon_btn_save.addPixmap(
|
||||
- QtGui.QPixmap(f"{icon_path}gtk-apply.png"))
|
||||
- self.btn_end_editing.setIcon(icon_btn_save)
|
||||
- self.toolBar.addAction(self.btn_end_editing)
|
||||
+ # self.btn_end_editing = QtWidgets.QAction(self.widget)
|
||||
+ # self.btn_end_editing.setObjectName("btn_end_editing")
|
||||
+ # icon_btn_save = QtGui.QIcon()
|
||||
+ # icon_btn_save.addPixmap(
|
||||
+ # QtGui.QPixmap(f"{icon_path}gtk-apply.png"))
|
||||
+ # self.btn_end_editing.setIcon(icon_btn_save)
|
||||
+ # self.toolBar.addAction(self.btn_end_editing)
|
||||
|
||||
self.verticalLayout.addLayout(self.horizontalLayout)
|
||||
self.tableView = QtWidgets.QTableView(self.widget)
|
||||
@@ -314,30 +314,23 @@ class Ui_MainWindow(object):
|
||||
def retranslateUi(self, MainWindow_reach):
|
||||
_translate = QtCore.QCoreApplication.translate
|
||||
self.name_reach = ""
|
||||
- self.mainwindow_title = _translate("MainWindow_reach", "Jeu de sections du Bief")
|
||||
+ self.mainwindow_title = _translate("MainWindow_reach", "Geometry reach edit")
|
||||
MainWindow_reach.setWindowTitle(self.mainwindow_title + f"{self.name_reach}")
|
||||
- self.text_section_order = _translate("MainWindow_reach", "\nOrdre des sections : "
|
||||
- "Amont --> Aval")
|
||||
# self.label_section_order.setText(f"{self.text_section_order}")
|
||||
self.vertical_slider_value = ""
|
||||
- self.vertical_slider_label.setText(_translate("MainWindow_reach", "Pk = ") + f"{self.vertical_slider_value}")
|
||||
- self.btn_open.setToolTip(_translate("MainWindow_reach", " Importer une géométrie"))
|
||||
- self.btn_add.setToolTip(_translate("MainWindow_reach", " Nouveau profil"))
|
||||
- self.btn_delete.setToolTip(_translate("MainWindow_reach", " Supprimer le profil sélectionné"))
|
||||
- self.btn_edit.setToolTip(_translate("MainWindow_reach", " Éditer le profil sélectionné"))
|
||||
- self.btn_copy_selected_profile.setToolTip(_translate("MainWindow_reach", " Copier le profil sélectionné"))
|
||||
- self.btn_paste_selected_profile.setToolTip(_translate("MainWindow_reach", "Coller le profil en fin de liste ("
|
||||
- "penser à modifier le Pk avant de "
|
||||
- "trier)"))
|
||||
- self.btn_duplicate_selected_profile.setToolTip(
|
||||
- _translate("MainWindow_reach", " Dupliquer la section sélectionnée"))
|
||||
+ self.vertical_slider_label.setText(_translate("MainWindow_reach", "Kp = ") + f"{self.vertical_slider_value}")
|
||||
+ self.btn_open.setToolTip(_translate("MainWindow_reach", " Import geometry"))
|
||||
+ self.btn_add.setToolTip(_translate("MainWindow_reach", " New profile"))
|
||||
+ self.btn_delete.setToolTip(_translate("MainWindow_reach", " Delete selected profile"))
|
||||
+ self.btn_edit.setToolTip(_translate("MainWindow_reach", " Editer selected profile"))
|
||||
+
|
||||
self.btn_sort_asc.setToolTip(_translate("MainWindow_reach", " Trier les profils par ordre croissant des Pk"))
|
||||
self.btn_sort_desc.setToolTip(_translate("MainWindow_reach", " Trier les profils par ordre décroissant des Pk"))
|
||||
self.btn_move_up.setToolTip(_translate("MainWindow_reach", " Changer l'ordre des profils (en décalant le "
|
||||
"profil sélectionné vers le haut)"))
|
||||
self.btn_move_down.setToolTip(_translate("MainWindow_reach", " Changer l'ordre des profils (en décalant le "
|
||||
"profil sélectionné vers le bas)"))
|
||||
- self.btn_end_editing.setToolTip(_translate("MainWindow_reach", " Terminer l'édition"))
|
||||
+ # self.btn_end_editing.setToolTip(_translate("MainWindow_reach", " Terminer l'édition"))
|
||||
self.tableView_header = [_translate("MainWindow_reach", "Name"),
|
||||
_translate("MainWindow_reach", "Kp (m)"),
|
||||
_translate("MainWindow_reach", "Type")]
|
||||
diff --git a/src/View/InitialConditions/PlotDKP.py b/src/View/InitialConditions/PlotDKP.py
|
||||
index 58a8321..445cc08 100644
|
||||
--- a/src/View/InitialConditions/PlotDKP.py
|
||||
+++ b/src/View/InitialConditions/PlotDKP.py
|
||||
@@ -71,6 +71,8 @@ class PlotDKP(APlot):
|
||||
color='b', marker='+', lw=1.
|
||||
)
|
||||
|
||||
+ self.canvas.axes.invert_xaxis()
|
||||
+
|
||||
self.canvas.figure.tight_layout()
|
||||
self.canvas.figure.canvas.draw_idle()
|
||||
if self.toolbar is not None:
|
||||
diff --git a/src/View/InitialConditions/PlotDischarge.py b/src/View/InitialConditions/PlotDischarge.py
|
||||
index 1fe05de..0703c59 100644
|
||||
--- a/src/View/InitialConditions/PlotDischarge.py
|
||||
+++ b/src/View/InitialConditions/PlotDischarge.py
|
||||
@@ -65,6 +65,8 @@ class PlotDischarge(APlot):
|
||||
color='r', lw=1.
|
||||
)
|
||||
|
||||
+ self.canvas.axes.invert_xaxis()
|
||||
+
|
||||
self.canvas.figure.tight_layout()
|
||||
self.canvas.figure.canvas.draw_idle()
|
||||
if self.toolbar is not None:
|
||||
diff --git a/src/View/InitialConditions/translate.py b/src/View/InitialConditions/translate.py
|
||||
index 370d4a2..3fe45f7 100644
|
||||
--- a/src/View/InitialConditions/translate.py
|
||||
+++ b/src/View/InitialConditions/translate.py
|
||||
@@ -21,11 +21,11 @@ from PyQt5.QtCore import QCoreApplication
|
||||
_translate = QCoreApplication.translate
|
||||
|
||||
table_headers = {
|
||||
- "name": _translate("LateralContribution", "Name"),
|
||||
+ # "name": _translate("LateralContribution", "Name"),
|
||||
"kp": _translate("LateralContribution", "KP (m)"),
|
||||
# "speed": _translate("LateralContribution", "Speed (m/s)"),
|
||||
"discharge": _translate("LateralContribution", "Discharge (m³/s)"),
|
||||
"elevation": _translate("LateralContribution", "Elevation (m)"),
|
||||
"height": _translate("LateralContribution", "Height (m)"),
|
||||
- "comment": _translate("LateralContribution", "Comment"),
|
||||
+ # "comment": _translate("LateralContribution", "Comment"),
|
||||
}
|
||||
diff --git a/src/View/SedimentLayers/Edit/translate.py b/src/View/SedimentLayers/Edit/translate.py
|
||||
index fe9e44a..f9f02cb 100644
|
||||
--- a/src/View/SedimentLayers/Edit/translate.py
|
||||
+++ b/src/View/SedimentLayers/Edit/translate.py
|
||||
@@ -6,7 +6,7 @@ _translate = QCoreApplication.translate
|
||||
|
||||
table_headers = {
|
||||
"name": _translate("SedimentLayers", "Name"),
|
||||
- "type": _translate("SedimentLayers", "Type"),
|
||||
+ # "type": _translate("SedimentLayers", "Type"),
|
||||
"height": _translate("Sedimentlayers", "Height"),
|
||||
"d50": _translate("Sedimentlayers", "D50"),
|
||||
"sigma": _translate("Sedimentlayers", "Sigma"),
|
||||
diff --git a/src/View/SedimentLayers/Reach/Plot.py b/src/View/SedimentLayers/Reach/Plot.py
|
||||
index a312a8c..5764abf 100644
|
||||
--- a/src/View/SedimentLayers/Reach/Plot.py
|
||||
+++ b/src/View/SedimentLayers/Reach/Plot.py
|
||||
@@ -78,6 +78,8 @@ class Plot(APlot):
|
||||
color='grey' if i == len(z_sl) - 1 else None
|
||||
)
|
||||
|
||||
+ self.canvas.axes.invert_xaxis()
|
||||
+
|
||||
self.canvas.figure.tight_layout()
|
||||
self.canvas.figure.canvas.draw_idle()
|
||||
if self.toolbar is not None:
|
||||
diff --git a/src/lang/fr.ts b/src/lang/fr.ts
|
||||
index 8034809..35d3439 100644
|
||||
--- a/src/lang/fr.ts
|
||||
+++ b/src/lang/fr.ts
|
||||
@@ -60,21 +60,6 @@
|
||||
<source>Ponctual contribution</source>
|
||||
<translation>Contributions ponctuelles</translation>
|
||||
</message>
|
||||
- <message>
|
||||
- <location filename="../View/BoundaryCondition/translate.py" line="32"/>
|
||||
- <source>Time over Z</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message>
|
||||
- <location filename="../View/BoundaryCondition/translate.py" line="33"/>
|
||||
- <source>Time over Discharge</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message>
|
||||
- <location filename="../View/BoundaryCondition/translate.py" line="34"/>
|
||||
- <source>Z over Discharge</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
<message>
|
||||
<location filename="../View/BoundaryCondition/translate.py" line="39"/>
|
||||
<source>Name</source>
|
||||
@@ -110,6 +95,21 @@
|
||||
<source>Solid</source>
|
||||
<translation type="unfinished">Solide</translation>
|
||||
</message>
|
||||
+ <message>
|
||||
+ <location filename="../View/BoundaryCondition/translate.py" line="32"/>
|
||||
+ <source>TimeZ</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/BoundaryCondition/translate.py" line="33"/>
|
||||
+ <source>TimeDischarge</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/BoundaryCondition/translate.py" line="34"/>
|
||||
+ <source>ZDischarge</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Checker</name>
|
||||
@@ -533,7 +533,7 @@
|
||||
<message>
|
||||
<location filename="../View/Frictions/translate.py" line="24"/>
|
||||
<source>Name</source>
|
||||
- <translation>Nom</translation>
|
||||
+ <translation type="obsolete">Nom</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../View/Frictions/translate.py" line="26"/>
|
||||
@@ -548,12 +548,17 @@
|
||||
<message>
|
||||
<location filename="../View/Frictions/translate.py" line="28"/>
|
||||
<source>Begin strickler</source>
|
||||
- <translation>strickler de départ</translation>
|
||||
+ <translation type="obsolete">strickler de départ</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../View/Frictions/translate.py" line="29"/>
|
||||
<source>End strickler</source>
|
||||
- <translation>Strickler de fin</translation>
|
||||
+ <translation type="obsolete">Strickler de fin</translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Frictions/translate.py" line="28"/>
|
||||
+ <source>Strickler</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -587,7 +592,7 @@
|
||||
<context>
|
||||
<name>LateralContribution</name>
|
||||
<message>
|
||||
- <location filename="../View/InitialConditions/translate.py" line="24"/>
|
||||
+ <location filename="../View/LateralContribution/translate.py" line="35"/>
|
||||
<source>Name</source>
|
||||
<translation>Nom</translation>
|
||||
</message>
|
||||
@@ -602,7 +607,7 @@
|
||||
<translation>Lit moyen</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/InitialConditions/translate.py" line="30"/>
|
||||
+ <location filename="../View/Stricklers/translate.py" line="31"/>
|
||||
<source>Comment</source>
|
||||
<translation>Commentaire</translation>
|
||||
</message>
|
||||
@@ -1715,7 +1720,7 @@ sur le plan défini par les deux points nommés extrêmes </source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
-<context>
|
||||
+<context encoding="UTF-8">
|
||||
<name>MainWindow_reach</name>
|
||||
<message>
|
||||
<location filename="../View/Frictions/PlotStricklers.py" line="76"/>
|
||||
@@ -1723,7 +1728,7 @@ sur le plan défini par les deux points nommés extrêmes </source>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="342"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="335"/>
|
||||
<source>Kp (m)</source>
|
||||
<translation>Pk (m)</translation>
|
||||
</message>
|
||||
@@ -1778,68 +1783,47 @@ sur le plan défini par les deux points nommés extrêmes </source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="317"/>
|
||||
- <source>Jeu de sections du Bief</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="319"/>
|
||||
- <source>
|
||||
-Ordre des sections : Amont --> Aval</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="323"/>
|
||||
- <source>Pk = </source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="325"/>
|
||||
- <source> Nouveau profil</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="334"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="327"/>
|
||||
<source> Trier les profils par ordre croissant des Pk</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="341"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="334"/>
|
||||
<source>Name</source>
|
||||
<translation>Nom</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="343"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="336"/>
|
||||
<source>Type</source>
|
||||
<translation>Type</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="345"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="338"/>
|
||||
<source>Alt+Z</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="348"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="341"/>
|
||||
<source>Alt+E</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="351"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="344"/>
|
||||
<source>Alt+R</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="355"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="348"/>
|
||||
<source>Vue globale automatique (Alt+S)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="359"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="352"/>
|
||||
<source>Vue globale automatique (Alt+D)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="363"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="356"/>
|
||||
<source>Vue globale automatique (Alt+F)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
@@ -1889,68 +1873,33 @@ Seuls les 5 premiers seront édités.</source>
|
||||
<source>Profil sélectionné</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
- <message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="324"/>
|
||||
- <source> Importer une géométrie</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="326"/>
|
||||
- <source> Supprimer le profil sélectionné</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="327"/>
|
||||
- <source> Éditer le profil sélectionné</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
<message encoding="UTF-8">
|
||||
<location filename="../View/Geometry/mainwindow_ui_reach.py" line="328"/>
|
||||
- <source> Copier le profil sélectionné</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="329"/>
|
||||
- <source>Coller le profil en fin de liste (penser à modifier le Pk avant de trier)</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="332"/>
|
||||
- <source> Dupliquer la section sélectionnée</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="335"/>
|
||||
<source> Trier les profils par ordre décroissant des Pk</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="336"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="329"/>
|
||||
<source> Changer l'ordre des profils (en décalant le profil sélectionné vers le haut)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="338"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="331"/>
|
||||
<source> Changer l'ordre des profils (en décalant le profil sélectionné vers le bas)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="340"/>
|
||||
- <source> Terminer l'édition</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="346"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="339"/>
|
||||
<source>Vue isométrique (Alt+Z)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="349"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="342"/>
|
||||
<source>Vue isométrique (Alt+E)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="352"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="345"/>
|
||||
<source>Vue isométrique (Alt+R)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
@@ -1969,6 +1918,36 @@ Seuls les 5 premiers seront édités.</source>
|
||||
<source>Select destination file</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="317"/>
|
||||
+ <source>Geometry reach edit</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="321"/>
|
||||
+ <source>Kp = </source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="322"/>
|
||||
+ <source> Import geometry</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="323"/>
|
||||
+ <source> New profile</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="324"/>
|
||||
+ <source> Delete selected profile</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="325"/>
|
||||
+ <source> Editer selected profile</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Network</name>
|
||||
@@ -2071,7 +2050,7 @@ Seuls les 5 premiers seront édités.</source>
|
||||
<message>
|
||||
<location filename="../View/SedimentLayers/Edit/translate.py" line="9"/>
|
||||
<source>Type</source>
|
||||
- <translation type="unfinished">Type</translation>
|
||||
+ <translation type="obsolete">Type</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../View/SedimentLayers/Reach/Profile/Window.py" line="68"/>
|
||||
Loading…
Reference in New Issue