Compare commits

..

15 Commits

Author SHA1 Message Date
Theophile Terraz c07a863018 change Mage repo 2025-07-28 16:46:14 +02:00
Theophile Terraz 243941db51 pep8 2025-06-24 14:19:10 +02:00
Theophile Terraz d6c1316178 undo command for reach selection in geometry 2025-06-24 11:22:00 +02:00
Theophile Terraz f35048b89f add reach selection in geometry 2025-06-23 18:07:46 +02:00
Theophile Terraz 24d92b2ac0 debug 2025-06-16 11:49:54 +02:00
Theophile Terraz c702862bc4 pep8 2025-06-10 09:10:58 +02:00
Theophile Terraz 400f6be9e3 add image icon 2025-06-06 17:53:24 +02:00
Theophile Terraz 5fc6951060 more work on import geo image 2025-06-06 17:32:02 +02:00
Theophile Terraz 5ba38d5cd6 test background img import 2025-06-06 10:16:44 +02:00
Theophile Terraz 3e8132646d debug 2025-06-05 11:01:46 +02:00
Theophile Terraz 5aef0bbf3c work on auto bondary and init cond 2025-05-26 14:53:47 +02:00
Theophile Terraz bb3dadc0c7 debug 2025-05-05 11:50:07 +02:00
Theophile Terraz 7bb176e7c7 debug 2025-05-05 11:32:51 +02:00
Theophile Terraz 8c16e4ed58 add guidelines in res view 2025-04-11 13:58:28 +02:00
Theophile Terraz e9315d9be7 improve previous commit 2025-03-20 11:14:43 +01:00
28 changed files with 803 additions and 94 deletions

View File

@ -41,7 +41,7 @@ dl-mage8-doc:
script: script:
- mkdir -p doc - mkdir -p doc
- cd doc - cd doc
- curl -L -o mage8.pdf https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/$MAGE_8_VERSION/downloads/documents/Mage-8_Documentation.pdf - curl -L -o mage8.pdf https://forge.inrae.fr/river-hydraulics/mage/-/releases/$MAGE_8_VERSION/downloads/documents/Mage-8_Documentation.pdf
artifacts: artifacts:
paths: paths:
- doc/mage8.pdf - doc/mage8.pdf
@ -53,7 +53,7 @@ dl-mage8-linux:
rules: rules:
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
script: script:
- curl -L -o mage8.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/$MAGE_8_VERSION/downloads/packages/mage_linux.tgz - curl -L -o mage8.tgz https://forge.inrae.fr/river-hydraulics/mage/-/releases/$MAGE_8_VERSION/downloads/packages/mage_linux.tgz
- mkdir -p mage8-linux - mkdir -p mage8-linux
- cd mage8-linux - cd mage8-linux
- tar xvf ../mage8.tgz - tar xvf ../mage8.tgz
@ -72,7 +72,7 @@ dl-mage8-windows:
rules: rules:
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
script: script:
- curl -L -o mage8.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/$MAGE_8_VERSION/downloads/packages/mage_windows.tgz - curl -L -o mage8.tgz https://forge.inrae.fr/river-hydraulics/mage/-/releases/$MAGE_8_VERSION/downloads/packages/mage_windows.tgz
- mkdir -p mage8-windows - mkdir -p mage8-windows
- cd mage8-windows - cd mage8-windows
- tar xvf ../mage8.tgz - tar xvf ../mage8.tgz
@ -93,7 +93,7 @@ dl-adists-linux:
script: script:
- mkdir -p adists-linux - mkdir -p adists-linux
- cd adists-linux - cd adists-linux
- curl -L -o adists https://gitlab.irstea.fr/jean-baptiste.faure/adists/-/releases/$ADISTS_VERSION/downloads/executables/adists - curl -L -o adists https://forge.inrae.fr/river-hydraulics/adists/-/releases/$ADISTS_VERSION/downloads/executables/adists
artifacts: artifacts:
paths: paths:
- adists-linux/adists - adists-linux/adists
@ -107,7 +107,7 @@ dl-adists-windows:
script: script:
- mkdir -p adists-windows - mkdir -p adists-windows
- cd adists-windows - cd adists-windows
- curl -L -o adists.exe https://gitlab.irstea.fr/jean-baptiste.faure/adists/-/releases/$ADISTS_VERSION/downloads/executables/adists_win64.exe - curl -L -o adists.exe https://forge.inrae.fr/river-hydraulics/adists/-/releases/$ADISTS_VERSION/downloads/executables/adists_win64.exe
artifacts: artifacts:
paths: paths:
- adists-windows/adists.exe - adists-windows/adists.exe

View File

@ -12,3 +12,5 @@ shapely>=2.0.1
lxml>=4.9.3 lxml>=4.9.3
platformdirs>=4.2.0 platformdirs>=4.2.0
pyshp>=2.3.1 pyshp>=2.3.1
rasterio==1.3.11
#fortranformat==2.0.3

View File

@ -12,3 +12,5 @@ shapely>=2.0.1
lxml>=4.9.3 lxml>=4.9.3
platformdirs>=4.2.0 platformdirs>=4.2.0
pyshp>=2.3.1 pyshp>=2.3.1
rasterio==1.3.11
#fortranformat==2.0.3

View File

@ -83,8 +83,8 @@ class TriangularWeir(BasicHS):
self._data = [ self._data = [
BHSValue("elevation", float, 1.0, status=status), BHSValue("elevation", float, 1.0, status=status),
BHSValue("loading_elevation", float, 9999.999, status=status), BHSValue("loading_elevation", float, 9999.999, status=status),
BHSValue("discharge_coefficient", float, 0.4, status=status), BHSValue("discharge_coefficient", float, 0.31, status=status),
BHSValue("half-angle_tangent", float, 0.0, status=status), BHSValue("half-angle_tangent", float, 1.0, status=status),
] ]

View File

@ -382,6 +382,8 @@ class InitialConditions(SQLSubModel):
self._data = [] self._data = []
for profile in profiles: for profile in profiles:
width = profile.wet_width(profile.z_min() + height) width = profile.wet_width(profile.z_min() + height)
area = profile.wet_area(profile.z_min() + height)
radius = profile.wet_radius(profile.z_min() + height)
frictions = self._reach.frictions.frictions frictions = self._reach.frictions.frictions
strickler = None strickler = None
if frictions is not None: if frictions is not None:
@ -396,9 +398,12 @@ class InitialConditions(SQLSubModel):
discharge = data_discharge[profile.rk] discharge = data_discharge[profile.rk]
else: else:
discharge = ( discharge = (
((width * 0.8) # ((width * 0.8)
* strickler # * strickler
* (height ** (5/3)) # * (height ** (5/3))
# * (abs(incline) ** (0.5)))
(area * strickler
* (radius ** (2/3))
* (abs(incline) ** (0.5))) * (abs(incline) ** (0.5)))
) )
@ -457,6 +462,9 @@ class InitialConditions(SQLSubModel):
if not compute_height: if not compute_height:
height = data_height[profile.rk] height = data_height[profile.rk]
else:
if abs(incline) <= 0:
height = 0.0
else: else:
height = ( height = (
discharge discharge

View File

@ -276,6 +276,7 @@ class Study(SQLModel):
version = new.execute( version = new.execute(
"SELECT value FROM info WHERE key='study_release'" "SELECT value FROM info WHERE key='study_release'"
) )
if version is not None:
new.status.version = int(version[0]) new.status.version = int(version[0])
# TODO: Load metadata # TODO: Load metadata

View File

@ -372,8 +372,12 @@ class EditBoundaryConditionWindow(PamhyrWindow):
if strickler is None: if strickler is None:
strickler = 25.0 strickler = 25.0
height = [(i)*(z_max-z_min)/50 for i in range(51)] height = [(i)*(z_max-z_min)/50 for i in range(51)]
q = [((profile.wet_width(z_min + h) * 0.8) * strickler # q = [((profile.wet_width(z_min + h) * 0.8) * strickler
* (h ** (5/3)) * (abs(self.slope_value) ** (0.5))) # * (h ** (5/3)) * (abs(self.slope_value) ** (0.5)))
# for h in height]
q = [profile.wet_area(z_min + h) * strickler
* (profile.wet_radius(z_min + h) ** (2/3))
* (abs(self.slope_value) ** (0.5))
for h in height] for h in height]
for i in range(len(height)): for i in range(len(height)):
height[i] += z_min height[i] += z_min

View File

@ -51,6 +51,11 @@ class PlotAC(PamhyrPlot):
self.plot_selected = None self.plot_selected = None
self.next_plot_selected = None self.next_plot_selected = None
@timer
def redraw(self, data):
self._data = data
self.draw()
@timer @timer
def draw(self): def draw(self):
self.init_axes() self.init_axes()

View File

@ -163,6 +163,11 @@ class PlotRKZ(PamhyrPlot):
) )
self._table.scrollTo(self._table.model().index(ind2, 0)) self._table.scrollTo(self._table.model().index(ind2, 0))
@timer
def redraw(self, data):
self._data = data
self.draw()
@timer @timer
def draw(self): def draw(self):
self.init_axes() self.init_axes()

View File

@ -162,6 +162,11 @@ class PlotXY(PamhyrPlot):
) )
self._table.scrollTo(self._table.model().index(ind2, 0)) self._table.scrollTo(self._table.model().index(ind2, 0))
@timer
def redraw(self, data):
self._data = data
self.draw()
@timer @timer
def draw(self): def draw(self):
self.init_axes() self.init_axes()

View File

@ -169,7 +169,7 @@ class GeometryReachTableModel(PamhyrTableModel):
self.layoutChanged.emit() self.layoutChanged.emit()
def move_down(self, row, parent=QModelIndex()): def move_down(self, row, parent=QModelIndex()):
if row > self._data.number_profiles: if row >= self._data.number_profiles-1:
return return
target = row target = row
@ -276,3 +276,12 @@ class GeometryReachTableModel(PamhyrTableModel):
) )
) )
self.layoutChanged.emit() self.layoutChanged.emit()
def change_reach(self, new_reach, parent):
self._undo.push(
ChangeReachCommand(
new_reach,
parent
)
)

View File

@ -22,7 +22,7 @@ from copy import deepcopy
from tools import trace, timer, logger_exception from tools import trace, timer, logger_exception
from PyQt5.QtWidgets import ( from PyQt5.QtWidgets import (
QMessageBox, QUndoCommand, QUndoStack, QMessageBox, QUndoCommand, QUndoStack, QTableView
) )
from Model.Geometry import Reach from Model.Geometry import Reach
@ -293,6 +293,35 @@ class PurgeCommand(QUndoCommand):
profile.purge(self._np_purge) profile.purge(self._np_purge)
class ChangeReachCommand(QUndoCommand):
def __init__(self, new_reach, parent):
QUndoCommand.__init__(self)
self._old_reach = parent._study.river.current_reach()
self._new_reach = new_reach
self._parent = parent
def undo(self):
p = self._parent
p._reach = self._old_reach.reach
p._study.river.set_current_reach(self._old_reach)
p.setup_table()
p.update_redraw()
p.find(QTableView, "tableView").selectionModel()\
.selectionChanged\
.connect(p.select_current_profile)
def redo(self):
p = self._parent
p._reach = self._new_reach.reach
p._study.river.set_current_reach(self._new_reach)
p.setup_table()
p.update_redraw()
p.find(QTableView, "tableView").selectionModel()\
.selectionChanged\
.connect(p.select_current_profile)
class ShiftCommand(QUndoCommand): class ShiftCommand(QUndoCommand):
def __init__(self, reach, rows, dx, dy, dz): def __init__(self, reach, rows, dx, dy, dz):
QUndoCommand.__init__(self) QUndoCommand.__init__(self)

View File

@ -47,6 +47,8 @@ from View.Tools.PamhyrWindow import PamhyrWindow
from View.Tools.Plot.PamhyrToolbar import PamhyrPlotToolbar from View.Tools.Plot.PamhyrToolbar import PamhyrPlotToolbar
from View.Tools.Plot.PamhyrCanvas import MplCanvas from View.Tools.Plot.PamhyrCanvas import MplCanvas
from View.SelectReach.Window import SelectReachWindow
from Meshing.Mage import ( from Meshing.Mage import (
MeshingWithMage, MeshingWithMageMailleurTT MeshingWithMage, MeshingWithMageMailleurTT
) )
@ -196,6 +198,7 @@ class GeometryWindow(PamhyrWindow):
"action_update_rk": self.update_rk, "action_update_rk": self.update_rk,
"action_purge": self.purge, "action_purge": self.purge,
"action_shift": self.shift, "action_shift": self.shift,
"action_select_reach": self.select_reach,
} }
for action in actions: for action in actions:
@ -217,9 +220,9 @@ class GeometryWindow(PamhyrWindow):
def _update(self, redraw=False, propagate=True): def _update(self, redraw=False, propagate=True):
if redraw: if redraw:
self._plot_xy.draw() self._plot_xy.redraw(data=self._reach)
self._plot_rkc.draw() self._plot_rkc.redraw(data=self._reach)
self._plot_ac.draw() self._plot_ac.redraw(data=self._reach)
self.select_current_profile() self.select_current_profile()
@ -535,6 +538,20 @@ class GeometryWindow(PamhyrWindow):
logger_exception(e) logger_exception(e)
return return
def select_reach(self):
try:
dlg = SelectReachWindow(
study=self._study,
trad=self._trad,
parent=self
)
if dlg.exec():
self._table.change_reach(dlg.reach, self)
except Exception as e:
logger_exception(e)
return
def duplicate(self): def duplicate(self):
rows = [ rows = [
row.row() for row in row.row() for row in

View File

@ -1650,8 +1650,8 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
result3.set("nb_profile", result1.get("nb_profile")) result3.set("nb_profile", result1.get("nb_profile"))
result4.set("nb_profile", result1.get("nb_profile")) result4.set("nb_profile", result1.get("nb_profile"))
result5.set("nb_profile", result1.get("nb_profile")) result5.set("nb_profile", result1.get("nb_profile"))
ts = list(result1.get("timestamps").intersection( ts = sorted(list(result1.get("timestamps").intersection(
result2.get("timestamps"))) result2.get("timestamps"))))
result3.set("timestamps", ts) result3.set("timestamps", ts)
result4.set("timestamps", ts) result4.set("timestamps", ts)
result5.set("timestamps", ts) result5.set("timestamps", ts)

View File

@ -0,0 +1,78 @@
# ShiftDialog.py -- Pamhyr
# Copyright (C) 2023-2024 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# -*- coding: utf-8 -*-
from View.Tools.PamhyrWindow import PamhyrDialog
from PyQt5.QtWidgets import QDoubleSpinBox, QPushButton
class CoordinatesDialog(PamhyrDialog):
_pamhyr_ui = "GeotiffCoordinates"
_pamhyr_name = "ImageCoordinates"
def __init__(self, x, y, trad=None, parent=None):
super(CoordinatesDialog, self).__init__(
title=trad[self._pamhyr_name],
trad=trad,
options=[],
parent=parent
)
self.spinbox = {}
self._init_default_values(x, y)
self.setup_connections()
def _init_default_values(self, x, y):
self._x = x
self._y = y
self._values = {"bottom": x[0],
"top": x[1],
"left": y[0],
"right": y[1]}
self.spinbox = {}
for t in self._values:
self.spinbox[t] = self.find(QDoubleSpinBox, f"doubleSpinBox_{t}")
self.reset(t)
def setup_connections(self):
for t in self._values:
self.find(QPushButton,
f"pushButton_{t}").clicked.connect(
lambda state, x=t: self.reset(x))
def reset(self, t):
self.spinbox[t].setValue(self._values[t])
@property
def x(self):
return [self._values["bottom"], self._values["top"]]
@property
def y(self):
return [self._values["left"], self._values["right"]]
@property
def values(self):
return [self._values[t] for t in self._values]
def accept(self):
for t in self._values:
self._values[t] = self.get_double_spin_box(f"doubleSpinBox_{t}")
super().accept()
def reject(self):
self.close()

View File

@ -1388,7 +1388,7 @@ class CustomPlot(PamhyrPlot):
self._reach = reach_id self._reach = reach_id
self._profile = 0 self._profile = 0
self.update() self.draw()
def set_profile(self, profile_id): def set_profile(self, profile_id):
self._profile = profile_id self._profile = profile_id

View File

@ -83,6 +83,7 @@ class PlotAC(PamhyrPlot):
self.draw_profile(reach, profile) self.draw_profile(reach, profile)
self.draw_water_elevation(reach, profile) self.draw_water_elevation(reach, profile)
self.draw_water_elevation_max(reach, profile) self.draw_water_elevation_max(reach, profile)
self.draw_gl()
self.enable_legend() self.enable_legend()
@ -134,6 +135,63 @@ class PlotAC(PamhyrPlot):
lw=1., color=self.color_plot_river_water, lw=1., color=self.color_plot_river_water,
) )
def draw_gl(self):
results = self.results[self._current_res_id]
reach = results.river.reach(self._current_reach_id)
profile = reach.profile(self._current_profile_id)
if profile is None:
return
station = profile.geometry.get_station()
elevation = profile.geometry.z()
gl = profile.geometry.names()
self.annotation = []
self.cgl, self.igl = reach.geometry.compute_guidelines()
lcomplete = list(self.cgl)
lincomplete = list(self.igl)
self.color_complete_gl = self.colors
self.color_incomplete_gl = 2 * ["grey"]
x_gl_complete = []
y_gl_complete = []
x_gl_incomplete = []
y_gl_incomplete = []
for i, txt in enumerate(gl):
if txt == "":
continue
if txt.strip() in self.cgl:
color = self.color_complete_gl[
lcomplete.index(txt) % len(self.color_complete_gl)
]
else:
color = self.color_incomplete_gl[
lincomplete.index(txt)
]
annotation = self.canvas.axes.annotate(
txt, (station[i], elevation[i]),
horizontalalignment='left',
verticalalignment='top',
annotation_clip=True,
fontsize=11, color=color
)
annotation.set_position((station[i] + 0., elevation[i] + 0.))
self.annotation.append(annotation)
if txt.strip() in self.cgl:
x_gl_complete.append(station[i])
y_gl_complete.append(elevation[i])
else:
x_gl_incomplete.append(station[i])
y_gl_incomplete.append(elevation[i])
def set_reach(self, reach_id): def set_reach(self, reach_id):
self._current_reach_id = reach_id self._current_reach_id = reach_id
self._current_profile_id = 0 self._current_profile_id = 0
@ -172,9 +230,17 @@ class PlotAC(PamhyrPlot):
self.update_river_bottom(reach, profile, x, z) self.update_river_bottom(reach, profile, x, z)
self.update_water(reach, profile, x, z) self.update_water(reach, profile, x, z)
self.update_water_max(reach, profile, x, z) self.update_water_max(reach, profile, x, z)
self.update_gl()
self.update_idle() self.update_idle()
def update_gl(self):
for a in self.annotation:
a.remove()
self.annotation[:] = []
self.draw_gl()
def update_river_bottom(self, reach, profile, x, z): def update_river_bottom(self, reach, profile, x, z):
self.line_rk.set_data(x, z) self.line_rk.set_data(x, z)

View File

@ -134,9 +134,9 @@ class PlotH(PamhyrPlot):
y = profile.get_key("Q") y = profile.get_key("Q")
if res_id == 2: if res_id == 2:
label = "Δ " + self.label_discharge label = "Δ " + self.label_discharge + f" {profile.name}"
else: else:
label = self.label_discharge label = self.label_discharge + f" {profile.name}"
if len(self._current_res_id) > 1: if len(self._current_res_id) > 1:
if res_id != 2: if res_id != 2:

View File

@ -19,6 +19,7 @@
import os import os
import csv import csv
import logging import logging
import rasterio
from numpy import sqrt from numpy import sqrt
@ -35,6 +36,7 @@ from PyQt5.QtCore import (
Qt, QVariant, QAbstractTableModel, Qt, QVariant, QAbstractTableModel,
QCoreApplication, QModelIndex, pyqtSlot, QCoreApplication, QModelIndex, pyqtSlot,
QItemSelectionModel, QTimer, QItemSelectionModel, QTimer,
QSettings
) )
from PyQt5.QtWidgets import ( from PyQt5.QtWidgets import (
@ -66,7 +68,7 @@ from View.Results.translate import (
ResultsTranslate, ResultsTranslate,
CompareResultsTranslate CompareResultsTranslate
) )
from View.Stricklers.Window import StricklersWindow from View.Results.CoordinatesDialog import CoordinatesDialog
_translate = QCoreApplication.translate _translate = QCoreApplication.translate
@ -334,6 +336,7 @@ class ResultsWindow(PamhyrWindow):
"action_add": self._add_custom_plot, "action_add": self._add_custom_plot,
"action_export": self._export, "action_export": self._export,
# "action_export": self.export_current, # "action_export": self.export_current,
"action_Geo_tiff": self.import_geotiff
} }
if len(self._results) > 1: if len(self._results) > 1:
@ -370,6 +373,10 @@ class ResultsWindow(PamhyrWindow):
self._button_last.clicked.connect(self._last) self._button_last.clicked.connect(self._last)
self._timer.timeout.connect(self._update_slider) self._timer.timeout.connect(self._update_slider)
# tabs
tab_widget = self.find(QTabWidget, f"tabWidget")
tab_widget.currentChanged.connect(self.tab_changed)
def update_table_selection_reach(self, ind): def update_table_selection_reach(self, ind):
table = self.find(QTableView, f"tableView_reach") table = self.find(QTableView, f"tableView_reach")
selectionModel = table.selectionModel() selectionModel = table.selectionModel()
@ -440,7 +447,9 @@ class ResultsWindow(PamhyrWindow):
for plot in self._additional_plot: for plot in self._additional_plot:
self._additional_plot[plot].set_profile(profile_id[0]) self._additional_plot[plot].set_profile(profile_id[0])
# self.update_table_selection_profile(profile_id[0]) tab_widget = self.find(QTabWidget, f"tabWidget")
if tab_widget.currentIndex() != 2:
self.update_table_selection_profile(profile_id[0])
if solver_id is not None: if solver_id is not None:
self._current_results = solver_id self._current_results = solver_id
@ -1148,3 +1157,56 @@ class ResultsWindow(PamhyrWindow):
def get_timestamps(self): def get_timestamps(self):
self._timestamps = sorted(list(self._results[0].get("timestamps"))) self._timestamps = sorted(list(self._results[0].get("timestamps")))
def tab_changed(self, i):
if i != 2:
if len(self._get_current_profiles_list()) > 1:
# unselect all profiles but the first one
profile_id = self._get_current_profile()
self.update_table_selection_profile(profile_id)
def import_geotiff(self):
options = QFileDialog.Options()
settings = QSettings(QSettings.IniFormat,
QSettings.UserScope, 'MyOrg', )
options |= QFileDialog.DontUseNativeDialog
file_types = [
self._trad["file_geotiff"],
self._trad["file_all"],
]
filename, _ = QFileDialog.getOpenFileName(
self,
self._trad["open_file"],
"",
";; ".join(file_types),
options=options
)
if filename != "":
with rasterio.open(filename) as data:
img = data.read()
b = data.bounds[:]
# b[0] left
# b[1] bottom
# b[2] right
# b[3] top
xlim = self.canvas.axes.get_xlim()
ylim = self.canvas.axes.get_ylim()
if b[2] > b[0] and b[1] < b[3]:
self.canvas.axes.imshow(img.transpose((1, 2, 0)),
extent=[b[0], b[2], b[1], b[3]])
else:
dlg = CoordinatesDialog(
xlim,
ylim,
trad=self._trad,
parent=self
)
if dlg.exec():
self.canvas.axes.imshow(img.transpose((1, 2, 0)),
extent=dlg.values)
self.plot_xy.idle()
self.canvas.axes.set_xlim(xlim)
self.canvas.axes.set_ylim(ylim)

View File

@ -53,6 +53,12 @@ class ResultsTranslate(MainTranslate):
"Results", "Results",
"Max water elevation" "Max water elevation"
) )
self._dict["file_all"] = _translate("Results", "All files (*)")
self._dict["file_geotiff"] = _translate(
"Results", "GeoTIFF file (*.tiff *.tif)")
self._dict["ImageCoordinates"] = _translate(
"Results", "Image coordinates"
)
self._sub_dict["table_headers_reach"] = { self._sub_dict["table_headers_reach"] = {
"name": _translate("Results", "Reach name"), "name": _translate("Results", "Reach name"),

View File

@ -0,0 +1,68 @@
# Window.py -- Pamhyr
# Copyright (C) 2023-2025 INRAE
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# -*- coding: utf-8 -*-
from View.Tools.PamhyrWindow import PamhyrDialog
class SelectReachWindow(PamhyrDialog):
_pamhyr_ui = "SelectReach"
_pamhyr_name = "Select reach"
def __init__(self, study=None, config=None, trad=None, parent=None):
super(SelectReachWindow, self).__init__(
title=trad[self._pamhyr_name],
study=study,
config=config,
options=[],
parent=parent
)
self.setup_combobox()
self.select_current_reach()
def setup_combobox(self):
reaches = list(self._study.river.enable_edges())
reaches_name = [r.name for r in reaches]
self.combobox_add_items("comboBox", reaches_name)
def select_current_reach(self):
if self._study.river.has_current_reach():
reach = self._study.river.current_reach()
self.set_combobox_text(
"comboBox",
reach.name
)
def accept(self):
reach_name = self.get_combobox_text("comboBox")
reach = next(
filter(
lambda s: s.name == reach_name,
self._study.river.enable_edges()
)
)
self.reach = reach
super().accept()
def reject(self):
self.close()

View File

@ -39,6 +39,7 @@ class CommonWordTranslate(PamhyrTranslate):
self._dict["reach"] = _translate("CommonWord", "Reach") self._dict["reach"] = _translate("CommonWord", "Reach")
self._dict["reaches"] = _translate("CommonWord", "Reaches") self._dict["reaches"] = _translate("CommonWord", "Reaches")
self._dict["Select reach"] = _translate("CommonWord", "Select reach")
self._dict["cross_section"] = _translate("CommonWord", "Cross-section") self._dict["cross_section"] = _translate("CommonWord", "Cross-section")
self._dict["main_channel"] = _translate("CommonWord", "Main channel") self._dict["main_channel"] = _translate("CommonWord", "Main channel")
self._dict["floodway"] = _translate("CommonWord", "Floodway") self._dict["floodway"] = _translate("CommonWord", "Floodway")

View File

@ -93,6 +93,7 @@
<addaction name="action_update_rk"/> <addaction name="action_update_rk"/>
<addaction name="action_purge"/> <addaction name="action_purge"/>
<addaction name="action_shift"/> <addaction name="action_shift"/>
<addaction name="action_select_reach"/>
</widget> </widget>
<action name="action_import"> <action name="action_import">
<property name="icon"> <property name="icon">
@ -235,6 +236,14 @@
<string>Shift selected sections coordinates</string> <string>Shift selected sections coordinates</string>
</property> </property>
</action> </action>
<action name="action_select_reach">
<property name="text">
<string>Select reach</string>
</property>
<property name="toolTip">
<string>Change current reach</string>
</property>
</action>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>

View File

@ -0,0 +1,188 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Dialog</class>
<widget class="QDialog" name="Dialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>451</width>
<height>206</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBox_bottom">
<property name="decimals">
<number>4</number>
</property>
<property name="minimum">
<double>-99999999.000000000000000</double>
</property>
<property name="maximum">
<double>99999999.000000000000000</double>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBox_right">
<property name="decimals">
<number>4</number>
</property>
<property name="minimum">
<double>-99999999.000000000000000</double>
</property>
<property name="maximum">
<double>99999999.000000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_bottom">
<property name="text">
<string>Bottom coordinate</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_left">
<property name="text">
<string>Left coordinate</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBox_left">
<property name="decimals">
<number>4</number>
</property>
<property name="minimum">
<double>-99999999.000000000000000</double>
</property>
<property name="maximum">
<double>99999999.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBox_top">
<property name="decimals">
<number>4</number>
</property>
<property name="minimum">
<double>-99999999.000000000000000</double>
</property>
<property name="maximum">
<double>99999999.000000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_top">
<property name="text">
<string>Top coordinate</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_right">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Right coordinate</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pushButton_bottom">
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="pushButton_top">
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="pushButton_left">
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QPushButton" name="pushButton_right">
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Dialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Dialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

View File

@ -238,6 +238,7 @@
<addaction name="action_add"/> <addaction name="action_add"/>
<addaction name="action_export"/> <addaction name="action_export"/>
<addaction name="action_reload"/> <addaction name="action_reload"/>
<addaction name="action_Geo_tiff"/>
</widget> </widget>
<action name="action_add"> <action name="action_add">
<property name="icon"> <property name="icon">
@ -275,6 +276,18 @@
<string>Ctrl+E</string> <string>Ctrl+E</string>
</property> </property>
</action> </action>
<action name="action_Geo_tiff">
<property name="icon">
<iconset>
<normaloff>ressources/picture.png</normaloff>ressources/picture.png</iconset>
</property>
<property name="text">
<string>Geo tiff</string>
</property>
<property name="toolTip">
<string>Import background image</string>
</property>
</action>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>

View File

@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Dialog</class>
<widget class="QDialog" name="Dialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>76</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QComboBox" name="comboBox"/>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Dialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Dialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS><TS version="2.0" language="fr_FR" sourcelanguage="en_150"> <!DOCTYPE TS>
<TS version="2.1" language="fr_FR" sourcelanguage="en_150">
<context> <context>
<name>About</name> <name>About</name>
<message> <message>
@ -944,6 +945,36 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<source>OK</source> <source>OK</source>
<translation>Ok</translation> <translation>Ok</translation>
</message> </message>
<message>
<location filename="../View/ui/GeotiffCoordinates.ui" line="54"/>
<source>Bottom coordinate</source>
<translation>Coordonnée bas</translation>
</message>
<message>
<location filename="../View/ui/GeotiffCoordinates.ui" line="61"/>
<source>Left coordinate</source>
<translation>Coordonnée gauche</translation>
</message>
<message>
<location filename="../View/ui/GeotiffCoordinates.ui" line="97"/>
<source>Top coordinate</source>
<translation>Coordonnée haut</translation>
</message>
<message>
<location filename="../View/ui/GeotiffCoordinates.ui" line="107"/>
<source>Right coordinate</source>
<translation>Coordonnée droite</translation>
</message>
<message>
<location filename="../View/ui/GeotiffCoordinates.ui" line="135"/>
<source>Reset</source>
<translation>Rétablir</translation>
</message>
<message>
<location filename="../View/ui/GeotiffCoordinates.ui" line="154"/>
<source>Image coordinates</source>
<translation type="obsolete">Coordonnées de l&apos;image</translation>
</message>
</context> </context>
<context> <context>
<name>Documentation</name> <name>Documentation</name>
@ -1235,14 +1266,9 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Version : @version @codename</translation> <translation>Version : @version @codename</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/about.ui" line="94"/>
<source>Copyright &#xa9; 2022-2025 INRAE</source>
<translation type="obsolete">Copyright © 2022-2025 INRAE</translation>
</message>
<message encoding="UTF-8">
<location filename="../View/ui/about.ui" line="94"/> <location filename="../View/ui/about.ui" line="94"/>
<source>Copyright © 2022-2025 INRAE</source> <source>Copyright © 2022-2025 INRAE</source>
<translation type="unfinished"></translation> <translation type="obsolete">Copyright © 2022-2025 INRAE</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1278,6 +1304,14 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Coefficient</translation> <translation>Coefficient</translation>
</message> </message>
</context> </context>
<context>
<name>GeoTIFF</name>
<message>
<location filename="../View/Results/translate.py" line="56"/>
<source>All files (*)</source>
<translation type="obsolete">Tous les fichiers (*)</translation>
</message>
</context>
<context> <context>
<name>Geometry</name> <name>Geometry</name>
<message> <message>
@ -1539,17 +1573,17 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<context> <context>
<name>MainWindow</name> <name>MainWindow</name>
<message> <message>
<location filename="../View/Translate.py" line="160"/> <location filename="../View/Translate.py" line="161"/>
<source>Open debug window</source> <source>Open debug window</source>
<translation>Ouvrir la fenêtre de débogage</translation> <translation>Ouvrir la fenêtre de débogage</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="163"/> <location filename="../View/Translate.py" line="164"/>
<source>Open SQLite debuging tool (&apos;sqlitebrowser&apos;)</source> <source>Open SQLite debuging tool (&apos;sqlitebrowser&apos;)</source>
<translation>Ouvrir l&apos;outil de débogage SQLite (&apos;sqlitebrowser&apos;)</translation> <translation>Ouvrir l&apos;outil de débogage SQLite (&apos;sqlitebrowser&apos;)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="166"/> <location filename="../View/Translate.py" line="167"/>
<source>Enable this window</source> <source>Enable this window</source>
<translation>Activer cette fenêtre</translation> <translation>Activer cette fenêtre</translation>
</message> </message>
@ -1614,7 +1648,7 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Éditer la couche sédimentaire</translation> <translation>Éditer la couche sédimentaire</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/Results.ui" line="275"/> <location filename="../View/ui/Results.ui" line="276"/>
<source>Ctrl+E</source> <source>Ctrl+E</source>
<translation>Ctrl+E</translation> <translation>Ctrl+E</translation>
</message> </message>
@ -2104,17 +2138,17 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Hydrogramme</translation> <translation>Hydrogramme</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/Results.ui" line="251"/> <location filename="../View/ui/Results.ui" line="252"/>
<source>Add customized visualization</source> <source>Add customized visualization</source>
<translation>Ajouter une visualisation personnalisée</translation> <translation>Ajouter une visualisation personnalisée</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/Results.ui" line="260"/> <location filename="../View/ui/Results.ui" line="261"/>
<source>Reload</source> <source>Reload</source>
<translation>Recharger</translation> <translation>Recharger</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/Results.ui" line="269"/> <location filename="../View/ui/Results.ui" line="270"/>
<source>Export</source> <source>Export</source>
<translation>Exporter</translation> <translation>Exporter</translation>
</message> </message>
@ -2394,12 +2428,12 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Maillage</translation> <translation>Maillage</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="153"/> <location filename="../View/Translate.py" line="154"/>
<source>Summary</source> <source>Summary</source>
<translation>Résumé</translation> <translation>Résumé</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="156"/> <location filename="../View/Translate.py" line="157"/>
<source>Checks</source> <source>Checks</source>
<translation>Vérifications</translation> <translation>Vérifications</translation>
</message> </message>
@ -2549,12 +2583,12 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Purger les profiles pour garder un nombre fixer de points</translation> <translation>Purger les profiles pour garder un nombre fixer de points</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/EditLateralContribution.ui" line="112"/> <location filename="../View/ui/EditBoundaryConditionsAdisTS.ui" line="119"/>
<source>Sort points</source> <source>Sort points</source>
<translation>Trier les points</translation> <translation>Trier les points</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/Results.ui" line="272"/> <location filename="../View/ui/Results.ui" line="273"/>
<source>Export data as CSV</source> <source>Export data as CSV</source>
<translation>Exporter les données au format CSV</translation> <translation>Exporter les données au format CSV</translation>
</message> </message>
@ -2619,47 +2653,47 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Données</translation> <translation>Données</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="174"/> <location filename="../View/Translate.py" line="175"/>
<source>Please select a reach</source> <source>Please select a reach</source>
<translation>Veuillez sélectionner un bief</translation> <translation>Veuillez sélectionner un bief</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="183"/> <location filename="../View/Translate.py" line="184"/>
<source>Last open study</source> <source>Last open study</source>
<translation>Dernière étude ouverte</translation> <translation>Dernière étude ouverte</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="186"/> <location filename="../View/Translate.py" line="187"/>
<source>Do you want to open again the last open study?</source> <source>Do you want to open again the last open study?</source>
<translation>Voulez-vous rouvrir la dernière étude ?</translation> <translation>Voulez-vous rouvrir la dernière étude ?</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="177"/> <location filename="../View/Translate.py" line="178"/>
<source>This edition window need a reach selected into the river network to work on it</source> <source>This edition window need a reach selected into the river network to work on it</source>
<translation>Cette fenêtre d&apos;édition a besoin d&apos;un bief sélectionné dans le réseau pour travailler dessus</translation> <translation>Cette fenêtre d&apos;édition a besoin d&apos;un bief sélectionné dans le réseau pour travailler dessus</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="191"/> <location filename="../View/Translate.py" line="192"/>
<source>Close without saving study</source> <source>Close without saving study</source>
<translation>Fermer sans sauvegarder l&apos;étude</translation> <translation>Fermer sans sauvegarder l&apos;étude</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="194"/> <location filename="../View/Translate.py" line="195"/>
<source>Do you want to save current study before closing it?</source> <source>Do you want to save current study before closing it?</source>
<translation>Souhaitez-vous sauvegarder l&apos;étude en cours avant de la fermer ?</translation> <translation>Souhaitez-vous sauvegarder l&apos;étude en cours avant de la fermer ?</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="171"/> <location filename="../View/Translate.py" line="172"/>
<source>Warning</source> <source>Warning</source>
<translation>Avertissement</translation> <translation>Avertissement</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="198"/> <location filename="../View/Translate.py" line="199"/>
<source>X (m)</source> <source>X (m)</source>
<translation>X (m)</translation> <translation>X (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="199"/> <location filename="../View/Translate.py" line="200"/>
<source>Y (m)</source> <source>Y (m)</source>
<translation>Y (m)</translation> <translation>Y (m)</translation>
</message> </message>
@ -2729,7 +2763,7 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Activer / Désactiver la sortie AdisTS</translation> <translation>Activer / Désactiver la sortie AdisTS</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/EditBoundaryConditionsAdisTS.ui" line="88"/> <location filename="../View/ui/EditBoundaryConditionsAdisTS.ui" line="89"/>
<source>Add a new point in boundary condition or punctual contribution</source> <source>Add a new point in boundary condition or punctual contribution</source>
<translation>Ajouter un nouveau point dans la condition limite</translation> <translation>Ajouter un nouveau point dans la condition limite</translation>
</message> </message>
@ -2834,12 +2868,12 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Export données brutes</translation> <translation>Export données brutes</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="200"/> <location filename="../View/Translate.py" line="201"/>
<source>Yes</source> <source>Yes</source>
<translation>Oui</translation> <translation>Oui</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="201"/> <location filename="../View/Translate.py" line="202"/>
<source>No</source> <source>No</source>
<translation>Non</translation> <translation>Non</translation>
</message> </message>
@ -2848,6 +2882,16 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<source>Compare results</source> <source>Compare results</source>
<translation>Comparaison de résultats</translation> <translation>Comparaison de résultats</translation>
</message> </message>
<message>
<location filename="../View/ui/Results.ui" line="285"/>
<source>Geo tiff</source>
<translation>Geo tiff</translation>
</message>
<message>
<location filename="../View/ui/Results.ui" line="288"/>
<source>Import background image</source>
<translation>Importer une image de fond</translation>
</message>
</context> </context>
<context> <context>
<name>MainWindow_reach</name> <name>MainWindow_reach</name>
@ -3033,7 +3077,7 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>jour</translation> <translation>jour</translation>
</message> </message>
<message> <message>
<location filename="../View/Results/translate.py" line="47"/> <location filename="../View/Results/translate.py" line="48"/>
<source>X (m)</source> <source>X (m)</source>
<translation>X (m)</translation> <translation>X (m)</translation>
</message> </message>
@ -3068,27 +3112,27 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Lecture des résultats</translation> <translation>Lecture des résultats</translation>
</message> </message>
<message> <message>
<location filename="../View/Results/translate.py" line="147"/> <location filename="../View/Results/translate.py" line="154"/>
<source>Water elevation</source> <source>Water elevation</source>
<translation>Cote de l&apos;eau</translation> <translation>Cote de l&apos;eau</translation>
</message> </message>
<message> <message>
<location filename="../View/Results/translate.py" line="51"/> <location filename="../View/Results/translate.py" line="52"/>
<source>Max water elevation</source> <source>Max water elevation</source>
<translation>Cote maximum de l&apos;eau</translation> <translation>Cote maximum de l&apos;eau</translation>
</message> </message>
<message> <message>
<location filename="../View/Results/translate.py" line="57"/> <location filename="../View/Results/translate.py" line="64"/>
<source>Reach name</source> <source>Reach name</source>
<translation>Nom du bief</translation> <translation>Nom du bief</translation>
</message> </message>
<message> <message>
<location filename="../View/Results/translate.py" line="153"/> <location filename="../View/Results/translate.py" line="160"/>
<source>Profile</source> <source>Profile</source>
<translation>Profil</translation> <translation>Profil</translation>
</message> </message>
<message> <message>
<location filename="../View/Results/translate.py" line="49"/> <location filename="../View/Results/translate.py" line="50"/>
<source>Bottom</source> <source>Bottom</source>
<translation>Fond</translation> <translation>Fond</translation>
</message> </message>
@ -3138,30 +3182,50 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Masse min</translation> <translation>Masse min</translation>
</message> </message>
<message> <message>
<location filename="../View/Results/translate.py" line="61"/> <location filename="../View/Results/translate.py" line="68"/>
<source>Variables names</source> <source>Variables names</source>
<translation>Noms des variables</translation> <translation>Noms des variables</translation>
</message> </message>
<message> <message>
<location filename="../View/Results/translate.py" line="74"/> <location filename="../View/Results/translate.py" line="81"/>
<source>Pollutant name</source> <source>Pollutant name</source>
<translation>Nom des polluants</translation> <translation>Nom des polluants</translation>
</message> </message>
<message> <message>
<location filename="../View/Results/translate.py" line="45"/> <location filename="../View/Results/translate.py" line="45"/>
<source>envelop</source> <source>envelop</source>
<translation>enveloppe</translation> <translation type="obsolete">enveloppe</translation>
</message> </message>
<message> <message>
<location filename="../View/Results/translate.py" line="65"/> <location filename="../View/Results/translate.py" line="72"/>
<source>Profile name</source> <source>Profile name</source>
<translation>Nom du profil</translation> <translation>Nom du profil</translation>
</message> </message>
<message> <message>
<location filename="../View/Results/translate.py" line="70"/> <location filename="../View/Results/translate.py" line="46"/>
<source>Solver</source> <source>Solver</source>
<translation>Solveur</translation> <translation>Solveur</translation>
</message> </message>
<message>
<location filename="../View/Results/translate.py" line="45"/>
<source>Envelop</source>
<translation>Enveloppe</translation>
</message>
<message>
<location filename="../View/Results/translate.py" line="57"/>
<source>GeoTIFF file (*.tiff *.tif)</source>
<translation>Fichiers GeoTIFF (*.tiff *.tif)</translation>
</message>
<message>
<location filename="../View/Results/translate.py" line="59"/>
<source>Image coordinates</source>
<translation>Coordonnées de l&apos;image</translation>
</message>
<message>
<location filename="../View/Results/translate.py" line="56"/>
<source>All files (*)</source>
<translation>Tous les fichiers (*)</translation>
</message>
</context> </context>
<context> <context>
<name>SedimentLayers</name> <name>SedimentLayers</name>
@ -3579,27 +3643,27 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Cote (m)</translation> <translation>Cote (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="116"/> <location filename="../View/Translate.py" line="117"/>
<source>Area (hectare)</source> <source>Area (hectare)</source>
<translation>Aire (hectare)</translation> <translation>Aire (hectare)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="118"/> <location filename="../View/Translate.py" line="119"/>
<source>Time (sec)</source> <source>Time (sec)</source>
<translation>Temps (s)</translation> <translation>Temps (s)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="119"/> <location filename="../View/Translate.py" line="120"/>
<source>Time (JJJ:HH:MM:SS)</source> <source>Time (JJJ:HH:MM:SS)</source>
<translation>Temps (JJJ:HH:MM:SS)</translation> <translation>Temps (JJJ:HH:MM:SS)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="121"/> <location filename="../View/Translate.py" line="122"/>
<source>Date (sec)</source> <source>Date (sec)</source>
<translation>Date (s)</translation> <translation>Date (s)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="122"/> <location filename="../View/Translate.py" line="123"/>
<source>Date (ISO format)</source> <source>Date (ISO format)</source>
<translation>Date (format ISO)</translation> <translation>Date (format ISO)</translation>
</message> </message>
@ -3624,17 +3688,17 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Vitesse (m/s)</translation> <translation>Vitesse (m/s)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="137"/> <location filename="../View/Translate.py" line="138"/>
<source>Wet Perimeter (m)</source> <source>Wet Perimeter (m)</source>
<translation>Périmètre mouillé (m)</translation> <translation>Périmètre mouillé (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="140"/> <location filename="../View/Translate.py" line="141"/>
<source>Hydraulic Radius (m)</source> <source>Hydraulic Radius (m)</source>
<translation>Rayon hydraulique (m)</translation> <translation>Rayon hydraulique (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="143"/> <location filename="../View/Translate.py" line="144"/>
<source>Froude number</source> <source>Froude number</source>
<translation>Nombre de Froude</translation> <translation>Nombre de Froude</translation>
</message> </message>
@ -3757,52 +3821,52 @@ moyen droit (m)</translation>
<translation>Vitesse min (m/s)</translation> <translation>Vitesse min (m/s)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="124"/> <location filename="../View/Translate.py" line="125"/>
<source>Area</source> <source>Area</source>
<translation>Aire</translation> <translation>Aire</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="125"/> <location filename="../View/Translate.py" line="126"/>
<source>Rho</source> <source>Rho</source>
<translation>Rho</translation> <translation>Rho</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="126"/> <location filename="../View/Translate.py" line="127"/>
<source>Porosity</source> <source>Porosity</source>
<translation>Porosité</translation> <translation>Porosité</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="127"/> <location filename="../View/Translate.py" line="128"/>
<source>CDC_RIV</source> <source>CDC_RIV</source>
<translation>CDC_RIV</translation> <translation>CDC_RIV</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="128"/> <location filename="../View/Translate.py" line="129"/>
<source>CDC_CAS</source> <source>CDC_CAS</source>
<translation>CDC_CAS</translation> <translation>CDC_CAS</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="129"/> <location filename="../View/Translate.py" line="130"/>
<source>APD</source> <source>APD</source>
<translation>APD</translation> <translation>APD</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="130"/> <location filename="../View/Translate.py" line="131"/>
<source>AC</source> <source>AC</source>
<translation>AC</translation> <translation>AC</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="131"/> <location filename="../View/Translate.py" line="132"/>
<source>BC</source> <source>BC</source>
<translation>BC</translation> <translation>BC</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="133"/> <location filename="../View/Translate.py" line="134"/>
<source>Concentration (g/l)</source> <source>Concentration (g/l)</source>
<translation>Concentration (g/l)</translation> <translation>Concentration (g/l)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="144"/> <location filename="../View/Translate.py" line="145"/>
<source>Mass (kg)</source> <source>Mass (kg)</source>
<translation>Masse</translation> <translation>Masse</translation>
</message> </message>
@ -3827,27 +3891,27 @@ moyen droit (m)</translation>
<translation>Débit</translation> <translation>Débit</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="110"/> <location filename="../View/Translate.py" line="111"/>
<source>Discharge Envelop</source> <source>Discharge Envelop</source>
<translation>Enveloppe du débit</translation> <translation>Enveloppe du débit</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="112"/> <location filename="../View/Translate.py" line="113"/>
<source>Max Discharge</source> <source>Max Discharge</source>
<translation>Débit max</translation> <translation>Débit max</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="114"/> <location filename="../View/Translate.py" line="115"/>
<source>Min Discharge</source> <source>Min Discharge</source>
<translation>Débit min</translation> <translation>Débit min</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="145"/> <location filename="../View/Translate.py" line="146"/>
<source>Concentration</source> <source>Concentration</source>
<translation>Concentration</translation> <translation>Concentration</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="136"/> <location filename="../View/Translate.py" line="137"/>
<source>Wet Area</source> <source>Wet Area</source>
<translation>Aire mouillée</translation> <translation>Aire mouillée</translation>
</message> </message>