parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pamhyr: Apply some change from paper simhydro 2023 patch.

mesh
Pierre-Antoine Rouby 2023-09-15 10:56:41 +02:00
parent 6f5a361338
commit 58daf689bd
7 changed files with 49 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Stricklers/Stricklers.py
View File

@ -38,7 +38,7 @@ class Stricklers(SQLSubModel):
else: else:
self.id = id 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._name = name
self._comment = comment self._comment = comment

6
src/View/BoundaryCondition/translate.py
View File

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

10
src/View/Geometry/PlotAC.py
View File

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

2
src/View/Geometry/Window.py
View File

@ -111,7 +111,7 @@ class GeometryWindow(ASubMainWindow, ListedSubWindow):
self.ui.btn_sort_desc.triggered.connect(self.sort_descending) 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_up.triggered.connect(self.move_row_up)
self.ui.btn_move_down.triggered.connect(self.move_row_down) 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_add.triggered.connect(self.insert_row)
self.ui.btn_delete.triggered.connect(self.delete_rows) self.ui.btn_delete.triggered.connect(self.delete_rows)
self.ui.btn_edit.triggered.connect(self.edit_profile) self.ui.btn_edit.triggered.connect(self.edit_profile)

79
src/View/Geometry/mainwindow_ui_reach.py
View File

@ -95,29 +95,29 @@ class Ui_MainWindow(object):
self.btn_edit.setIcon(icon_btn_edit) self.btn_edit.setIcon(icon_btn_edit)
self.toolBar.addAction(self.btn_edit) self.toolBar.addAction(self.btn_edit)
self.btn_copy_selected_profile = QtWidgets.QAction(self.widget) # self.btn_copy_selected_profile = QtWidgets.QAction(self.widget)
self.btn_copy_selected_profile.setObjectName("btn_copy_selected_profile") # self.btn_copy_selected_profile.setObjectName("btn_copy_selected_profile")
icon_btn_copy_selected_profile = QtGui.QIcon() # icon_btn_copy_selected_profile = QtGui.QIcon()
icon_btn_copy_selected_profile.addPixmap( # icon_btn_copy_selected_profile.addPixmap(
QtGui.QPixmap(f"{icon_path}gtk-copy.png")) # QtGui.QPixmap(f"{icon_path}gtk-copy.png"))
self.btn_copy_selected_profile.setIcon(icon_btn_copy_selected_profile) # self.btn_copy_selected_profile.setIcon(icon_btn_copy_selected_profile)
self.toolBar.addAction(self.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 = QtWidgets.QAction(self.widget)
self.btn_paste_selected_profile.setObjectName("btn_paste_selected_profile") # self.btn_paste_selected_profile.setObjectName("btn_paste_selected_profile")
icon_btn_paste_selected_profile = QtGui.QIcon() # icon_btn_paste_selected_profile = QtGui.QIcon()
icon_btn_paste_selected_profile.addPixmap( # icon_btn_paste_selected_profile.addPixmap(
QtGui.QPixmap(f"{icon_path}gtk-paste.png")) # QtGui.QPixmap(f"{icon_path}gtk-paste.png"))
self.btn_paste_selected_profile.setIcon(icon_btn_paste_selected_profile) # self.btn_paste_selected_profile.setIcon(icon_btn_paste_selected_profile)
self.toolBar.addAction(self.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 = QtWidgets.QAction(self.widget)
self.btn_duplicate_selected_profile.setObjectName("btn_duplicate_selected_profile") # self.btn_duplicate_selected_profile.setObjectName("btn_duplicate_selected_profile")
icon_btn_duplicate_selected_profile = QtGui.QIcon() # icon_btn_duplicate_selected_profile = QtGui.QIcon()
icon_btn_duplicate_selected_profile.addPixmap( # icon_btn_duplicate_selected_profile.addPixmap(
QtGui.QPixmap(f"{icon_path}gtk-dnd-multiple.png")) # QtGui.QPixmap(f"{icon_path}gtk-dnd-multiple.png"))
self.btn_duplicate_selected_profile.setIcon(icon_btn_duplicate_selected_profile) # self.btn_duplicate_selected_profile.setIcon(icon_btn_duplicate_selected_profile)
self.toolBar.addAction(self.btn_duplicate_selected_profile) # self.toolBar.addAction(self.btn_duplicate_selected_profile)
self.btn_sort_asc = QtWidgets.QAction(self.widget) self.btn_sort_asc = QtWidgets.QAction(self.widget)
self.btn_sort_asc.setObjectName("btn_sort_asc") 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.btn_move_down.setIcon(icon_btn_move_down)
self.toolBar.addAction(self.btn_move_down) self.toolBar.addAction(self.btn_move_down)
self.btn_end_editing = QtWidgets.QAction(self.widget) # self.btn_end_editing = QtWidgets.QAction(self.widget)
self.btn_end_editing.setObjectName("btn_end_editing") # self.btn_end_editing.setObjectName("btn_end_editing")
icon_btn_save = QtGui.QIcon() # icon_btn_save = QtGui.QIcon()
icon_btn_save.addPixmap( # icon_btn_save.addPixmap(
QtGui.QPixmap(f"{icon_path}gtk-apply.png")) # QtGui.QPixmap(f"{icon_path}gtk-apply.png"))
self.btn_end_editing.setIcon(icon_btn_save) # self.btn_end_editing.setIcon(icon_btn_save)
self.toolBar.addAction(self.btn_end_editing) # self.toolBar.addAction(self.btn_end_editing)
self.verticalLayout.addLayout(self.horizontalLayout) self.verticalLayout.addLayout(self.horizontalLayout)
self.tableView = QtWidgets.QTableView(self.widget) self.tableView = QtWidgets.QTableView(self.widget)
@ -314,30 +314,23 @@ class Ui_MainWindow(object):
def retranslateUi(self, MainWindow_reach): def retranslateUi(self, MainWindow_reach):
_translate = QtCore.QCoreApplication.translate _translate = QtCore.QCoreApplication.translate
self.name_reach = "" 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}") 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.label_section_order.setText(f"{self.text_section_order}")
self.vertical_slider_value = "" self.vertical_slider_value = ""
self.vertical_slider_label.setText(_translate("MainWindow_reach", "Pk = ") + f"{self.vertical_slider_value}") self.vertical_slider_label.setText(_translate("MainWindow_reach", "Kp = ") + f"{self.vertical_slider_value}")
self.btn_open.setToolTip(_translate("MainWindow_reach", " Importer une géométrie")) self.btn_open.setToolTip(_translate("MainWindow_reach", " Import geometry"))
self.btn_add.setToolTip(_translate("MainWindow_reach", " Nouveau profil")) self.btn_add.setToolTip(_translate("MainWindow_reach", " New profile"))
self.btn_delete.setToolTip(_translate("MainWindow_reach", " Supprimer le profil sélectionné")) self.btn_delete.setToolTip(_translate("MainWindow_reach", " Delete selected profile"))
self.btn_edit.setToolTip(_translate("MainWindow_reach", " Éditer le profil sélectionné")) self.btn_edit.setToolTip(_translate("MainWindow_reach", " Editer selected profile"))
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.btn_sort_asc.setToolTip(_translate("MainWindow_reach", " Trier les profils par ordre croissant des Pk")) 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_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 " self.btn_move_up.setToolTip(_translate("MainWindow_reach", " Changer l'ordre des profils (en décalant le "
"profil sélectionné vers le haut)")) "profil sélectionné vers le haut)"))
self.btn_move_down.setToolTip(_translate("MainWindow_reach", " Changer l'ordre des profils (en décalant le " self.btn_move_down.setToolTip(_translate("MainWindow_reach", " Changer l'ordre des profils (en décalant le "
"profil sélectionné vers le bas)")) "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"), self.tableView_header = [_translate("MainWindow_reach", "Name"),
_translate("MainWindow_reach", "Kp (m)"), _translate("MainWindow_reach", "Kp (m)"),
_translate("MainWindow_reach", "Type")] _translate("MainWindow_reach", "Type")]

4
src/View/InitialConditions/translate.py
View File

@ -21,11 +21,11 @@ from PyQt5.QtCore import QCoreApplication
_translate = QCoreApplication.translate _translate = QCoreApplication.translate
table_headers = { table_headers = {
"name": _translate("LateralContribution", "Name"), # "name": _translate("LateralContribution", "Name"),
"kp": _translate("LateralContribution", "KP (m)"), "kp": _translate("LateralContribution", "KP (m)"),
# "speed": _translate("LateralContribution", "Speed (m/s)"), # "speed": _translate("LateralContribution", "Speed (m/s)"),
"discharge": _translate("LateralContribution", "Discharge (m³/s)"), "discharge": _translate("LateralContribution", "Discharge (m³/s)"),
"elevation": _translate("LateralContribution", "Elevation (m)"), "elevation": _translate("LateralContribution", "Elevation (m)"),
"height": _translate("LateralContribution", "Height (m)"), "height": _translate("LateralContribution", "Height (m)"),
"comment": _translate("LateralContribution", "Comment"), # "comment": _translate("LateralContribution", "Comment"),
} }

2
src/View/SedimentLayers/Edit/translate.py
View File

@ -6,7 +6,7 @@ _translate = QCoreApplication.translate
table_headers = { table_headers = {
"name": _translate("SedimentLayers", "Name"), "name": _translate("SedimentLayers", "Name"),
"type": _translate("SedimentLayers", "Type"), # "type": _translate("SedimentLayers", "Type"),
"height": _translate("Sedimentlayers", "Height"), "height": _translate("Sedimentlayers", "Height"),
"d50": _translate("Sedimentlayers", "D50"), "d50": _translate("Sedimentlayers", "D50"),
"sigma": _translate("Sedimentlayers", "Sigma"), "sigma": _translate("Sedimentlayers", "Sigma"),