Compare commits

..

No commits in common. "ddc612328e74de044244ad9315479d898c79ceca" and "4cddd43f5a46e54ee6e04763cf7f8d3e46309055" have entirely different histories.

25 changed files with 155 additions and 493 deletions

View File

@ -275,7 +275,6 @@ class Layer(SQLSubModel):
self._sl.modified() self._sl.modified()
class SedimentLayer(SQLSubModel): class SedimentLayer(SQLSubModel):
_sub_classes = [Layer] _sub_classes = [Layer]

View File

@ -414,6 +414,7 @@ class SQLSubModel(PamhyrID):
""" """
raise NotImplementedMethodeError(self, self._db_save) raise NotImplementedMethodeError(self, self._db_save)
def _data_traversal(self, def _data_traversal(self,
predicate=lambda obj, data: True, predicate=lambda obj, data: True,
modifier=lambda obj, data: None, modifier=lambda obj, data: None,

View File

@ -83,7 +83,7 @@ class PamhyrModelList(SQLSubModel):
return self.lst.index(el) return self.lst.index(el)
def get(self, index): def get(self, index):
if len(self.lst) <= index: if len(self._lst) == 0:
return None return None
return self.lst[index] return self.lst[index]
@ -122,10 +122,7 @@ class PamhyrModelList(SQLSubModel):
raise NotImplementedMethodeError(self, self.new) raise NotImplementedMethodeError(self, self.new)
def insert(self, index, new): def insert(self, index, new):
if new in self._lst: self._lst.insert(index, new)
new.set_as_not_deleted()
else:
self._lst.insert(index, new)
if self._status is not None: if self._status is not None:
self._status.modified() self._status.modified()
@ -168,7 +165,7 @@ class PamhyrModelList(SQLSubModel):
lambda x: x[1], lambda x: x[1],
filter( filter(
lambda x: x[0] in indexes, lambda x: x[0] in indexes,
enumerate(self._lst) enumerate(self.lst)
) )
) )
) )

View File

@ -38,19 +38,6 @@ logger = logging.getLogger()
class ListModel(PamhyrListModel): class ListModel(PamhyrListModel):
def get_true_data_row(self, row):
el = self._data.get(row)
return next(
map(
lambda e: e[0],
filter(
lambda e: e[1] == el,
enumerate(self._data._lst)
)
), 0
)
def data(self, index, role): def data(self, index, role):
row = index.row() row = index.row()
column = index.column() column = index.column()
@ -78,8 +65,6 @@ class ListModel(PamhyrListModel):
return QVariant() return QVariant()
def add(self, row): def add(self, row):
row = self.get_true_data_row(row)
self._undo.push( self._undo.push(
AddCommand( AddCommand(
self._data, row self._data, row
@ -90,7 +75,7 @@ class ListModel(PamhyrListModel):
def delete(self, row): def delete(self, row):
self._undo.push( self._undo.push(
DelCommand( DelCommand(
self._data, self._data.files[row] self._data, row
) )
) )
self.update() self.update()

View File

@ -58,24 +58,27 @@ class AddCommand(QUndoCommand):
self._new = None self._new = None
def undo(self): def undo(self):
self._new.set_as_deleted() self._files.delete([self._new])
def redo(self): def redo(self):
if self._new is None: if self._new is None:
self._new = self._files.new(self._row) self._new = self._files.new(self._row)
else: else:
self._new.set_as_not_deleted() self._files.undelete([self._new])
# self._files.insert(self._row, self._new)
class DelCommand(QUndoCommand): class DelCommand(QUndoCommand):
def __init__(self, files, line): def __init__(self, files, row):
QUndoCommand.__init__(self) QUndoCommand.__init__(self)
self._files = files self._files = files
self._line = line self._row = row
self._old = self._files.get(row)
def undo(self): def undo(self):
self._line.set_as_not_deleted() self._files.undelete([self._old])
# self._files.insert(self._row, self._old)
def redo(self): def redo(self):
self._line.set_as_deleted() self._files.delete_i([self._row])

View File

@ -234,23 +234,3 @@ class TableModel(PamhyrTableModel):
) )
self.layoutAboutToBeChanged.emit() self.layoutAboutToBeChanged.emit()
self.update() self.update()
def read_from_file(self, file_name, bctype):
logger.debug(f"Import boundary conditions from {file_name}")
data0 = []
data1 = []
if bctype == "ZD":
mult = 1
else:
mult = 60
with open(file_name, encoding="utf-8") as bc_file:
for line in bc_file:
if not (line.startswith("#") or
line.startswith("*") or
line.startswith("$")):
line = line.split()
data0.append(float(line[0]) * mult)
data1.append(line[1])
self.replace_data(data0, data1)

View File

@ -30,10 +30,10 @@ from PyQt5.QtGui import (
QKeySequence, QKeySequence,
) )
from PyQt5 import QtCore, QtWidgets from PyQt5 import QtCore
from PyQt5.QtCore import ( from PyQt5.QtCore import (
Qt, QVariant, QAbstractTableModel, QCoreApplication, Qt, QVariant, QAbstractTableModel, QCoreApplication,
pyqtSlot, pyqtSignal, QSettings, pyqtSlot, pyqtSignal,
) )
from PyQt5.QtWidgets import ( from PyQt5.QtWidgets import (
@ -204,8 +204,6 @@ class EditBoundaryConditionWindow(PamhyrWindow):
self.find(QAction, "action_add").triggered.connect(self.add) self.find(QAction, "action_add").triggered.connect(self.add)
self.find(QAction, "action_del").triggered.connect(self.delete) self.find(QAction, "action_del").triggered.connect(self.delete)
self.find(QAction, "action_sort").triggered.connect(self.sort) self.find(QAction, "action_sort").triggered.connect(self.sort)
self.find(QAction, "action_import").triggered\
.connect(self.import_from_file)
self.find(QAction, "action_generate_uniform")\ self.find(QAction, "action_generate_uniform")\
.triggered.connect(self.generate_uniform) .triggered.connect(self.generate_uniform)
@ -303,31 +301,6 @@ class EditBoundaryConditionWindow(PamhyrWindow):
self._table.sort(False) self._table.sort(False)
self.plot.update() self.plot.update()
def import_from_file(self):
options = QFileDialog.Options()
settings = QSettings(QSettings.IniFormat,
QSettings.UserScope, 'MyOrg', )
options |= QFileDialog.DontUseNativeDialog
if self._data.bctype == "TD":
file_types = [self._trad["file_hyd"]]
if self._data.bctype == "TZ":
file_types = [self._trad["file_lim"]]
if self._data.bctype == "ZD":
file_types = [self._trad["file_ava"]]
file_types.append(self._trad["file_all"])
file_name, _ = QtWidgets.QFileDialog.getOpenFileName(
self,
self._trad["open_file"],
"",
";; ".join(file_types),
options=options
)
if file_name != "":
self._table.read_from_file(file_name, self._data.bctype)
def move_up(self): def move_up(self):
row = self.index_selected_row() row = self.index_selected_row()
self._table.move_up(row) self._table.move_up(row)

View File

@ -35,17 +35,6 @@ class BCETranslate(BCTranslate):
self._dict["Boundary Condition Options"] = _translate( self._dict["Boundary Condition Options"] = _translate(
"BoundaryCondition", "Boundary Condition Options") "BoundaryCondition", "Boundary Condition Options")
self._dict["open_file"] = _translate(
"BoundaryCondition", "Open a file")
self._dict["file_hyd"] = _translate(
"BoundaryCondition", "Mage hydrograph file (*.HYD)")
self._dict["file_lim"] = _translate(
"BoundaryCondition", "Mage limnigraph file (*.LIM)")
self._dict["file_lim"] = _translate(
"BoundaryCondition", "Mage rating curve file (*.AVA)")
self._dict["file_all"] = _translate(
"BoundaryCondition", "All files (*)")
self._sub_dict["table_headers"] = { self._sub_dict["table_headers"] = {
"x": _translate("BoundaryCondition", "X"), "x": _translate("BoundaryCondition", "X"),
"y": _translate("BoundaryCondition", "Y"), "y": _translate("BoundaryCondition", "Y"),

View File

@ -38,7 +38,7 @@ from View.Frictions.UndoCommand import (
SetNameCommand, SetBeginCommand, SetEndCommand, SetNameCommand, SetBeginCommand, SetEndCommand,
SetBeginStricklerCommand, SetEndStricklerCommand, SetBeginStricklerCommand, SetEndStricklerCommand,
AddCommand, DelCommand, SortCommand, AddCommand, DelCommand, SortCommand,
MoveCommand, PasteCommand, DuplicateCommand, ReplaceDataCommand, MoveCommand, PasteCommand, DuplicateCommand,
) )
from View.Tools.PamhyrTable import PamhyrTableModel from View.Tools.PamhyrTable import PamhyrTableModel
@ -99,7 +99,7 @@ class ComboBoxDelegate(QItemDelegate):
self.commitData.emit(self.sender()) self.commitData.emit(self.sender())
class FrictionTableModel(PamhyrTableModel): class TableModel(PamhyrTableModel):
def _setup_lst(self): def _setup_lst(self):
self._lst = self._data.frictions self._lst = self._data.frictions
self._study = self._opt_data self._study = self._opt_data
@ -199,18 +199,6 @@ class FrictionTableModel(PamhyrTableModel):
self.endRemoveRows() self.endRemoveRows()
self.layoutChanged.emit() self.layoutChanged.emit()
def replace_data(self, new_data):
self.layoutAboutToBeChanged.emit()
self._undo.push(
ReplaceDataCommand(
self._lst, new_data
)
)
self.layoutAboutToBeChanged.emit()
self.layoutChanged.emit()
def sort(self, _reverse, parent=QModelIndex()): def sort(self, _reverse, parent=QModelIndex()):
self.layoutAboutToBeChanged.emit() self.layoutAboutToBeChanged.emit()
@ -264,33 +252,3 @@ class FrictionTableModel(PamhyrTableModel):
def redo(self): def redo(self):
self._undo.redo() self._undo.redo()
self.layoutChanged.emit() self.layoutChanged.emit()
def read_from_file(self, file_name):
reach_id = self._study.river.enable_edges().index(self._data) + 1
logger.debug(f"Import frictions from {file_name}")
data = []
with open(file_name, encoding="utf-8") as rug_file:
for line in rug_file:
if line.upper().startswith("K"):
line = line.split()
if int(line[1]) == reach_id:
data.append(line[1:])
new_data = []
for d in data:
new = None
minor = float(d[3])
medium = float(d[4])
for s in self._study.river.stricklers.stricklers:
if s.minor == minor and s.medium == medium:
new = s
break
if new is None:
new = self._study.river.stricklers.new(len(
self._study.river.stricklers))
new.minor = minor
new.medium = medium
new_data.append([self._data, float(d[1]), float(d[2]), new, new])
self.replace_data(new_data)

View File

@ -145,36 +145,6 @@ class AddCommand(QUndoCommand):
self._frictions.insert(self._index, self._new) self._frictions.insert(self._index, self._new)
class ReplaceDataCommand(QUndoCommand):
def __init__(self, frictions, new_data):
QUndoCommand.__init__(self)
self._frictions = frictions
self._new_data = new_data
self._old_rows = list(range(len(frictions)))
self._new_rows = list(range(len(new_data)))
self._old_friction = []
for row in self._old_rows:
self._old_friction.append((row, self._frictions.lst[row]))
def undo(self):
self._frictions.delete_i(self._new_rows)
for row, el in self._old_friction:
self._frictions.insert(row, el)
def redo(self):
self._frictions.delete_i(self._old_rows)
for row in self._new_rows:
new = self._frictions.new(row)
d = self._new_data[row]
new.edge = d[0]
new.begin_rk = d[1]
new.end_rk = d[2]
new.begin_strickler = d[3]
new.end_strickler = d[4]
class DelCommand(QUndoCommand): class DelCommand(QUndoCommand):
def __init__(self, frictions, rows): def __init__(self, frictions, rows):
QUndoCommand.__init__(self) QUndoCommand.__init__(self)

View File

@ -26,11 +26,10 @@ from PyQt5.QtGui import (
QKeySequence, QKeySequence,
) )
from PyQt5 import QtWidgets
from PyQt5.QtCore import ( from PyQt5.QtCore import (
Qt, QVariant, QAbstractTableModel, Qt, QVariant, QAbstractTableModel,
QCoreApplication, QModelIndex, pyqtSlot, QCoreApplication, QModelIndex, pyqtSlot,
QRect, QSettings, QRect,
) )
from PyQt5.QtWidgets import ( from PyQt5.QtWidgets import (
@ -47,7 +46,7 @@ from View.Frictions.UndoCommand import (
) )
from View.Frictions.Table import ( from View.Frictions.Table import (
FrictionTableModel, ComboBoxDelegate TableModel, ComboBoxDelegate
) )
from View.Tools.Plot.PamhyrCanvas import MplCanvas from View.Tools.Plot.PamhyrCanvas import MplCanvas
@ -115,7 +114,7 @@ class FrictionsWindow(PamhyrWindow):
editable_headers = [] editable_headers = []
table = self.find(QTableView, f"tableView") table = self.find(QTableView, f"tableView")
self._table = FrictionTableModel( self._table = TableModel(
table_view=table, table_view=table,
table_headers=self._trad.get_dict("table_headers"), table_headers=self._trad.get_dict("table_headers"),
editable_headers=editable_headers, editable_headers=editable_headers,
@ -167,8 +166,7 @@ class FrictionsWindow(PamhyrWindow):
self.find(QAction, "action_add").triggered.connect(self.add) self.find(QAction, "action_add").triggered.connect(self.add)
self.find(QAction, "action_del").triggered.connect(self.delete) self.find(QAction, "action_del").triggered.connect(self.delete)
self.find(QAction, "action_sort").triggered.connect(self.sort) self.find(QAction, "action_sort").triggered.connect(self.sort)
self.find(QAction, "action_import").triggered\
.connect(self.import_from_file)
self.find(QAction, "action_edit_stricklers").triggered.connect( self.find(QAction, "action_edit_stricklers").triggered.connect(
self.edit_stricklers self.edit_stricklers
) )
@ -275,22 +273,3 @@ class FrictionsWindow(PamhyrWindow):
parent=self parent=self
) )
strick.show() strick.show()
def import_from_file(self):
options = QFileDialog.Options()
settings = QSettings(QSettings.IniFormat,
QSettings.UserScope, 'MyOrg', )
options |= QFileDialog.DontUseNativeDialog
file_types = [self._trad["file_rug"], self._trad["file_all"]]
file_name, _ = QtWidgets.QFileDialog.getOpenFileName(
self,
self._trad["open_file"],
"",
";; ".join(file_types),
options=options
)
if file_name != "":
self._table.read_from_file(file_name)

View File

@ -38,10 +38,6 @@ class FrictionsTranslate(MainTranslate):
self._dict["Edit frictions"] = _translate( self._dict["Edit frictions"] = _translate(
"Frictions", "Edit frictions" "Frictions", "Edit frictions"
) )
self._dict["file_rug"] = _translate(
"Frictions", "Mage initial frictions file (*.RUG *.rug)")
self._dict["file_all"] = _translate(
"Frictions", "All files (*)")
self._sub_dict["table_headers"] = { self._sub_dict["table_headers"] = {
# "name": self._dict["name"], # "name": self._dict["name"],

View File

@ -282,7 +282,7 @@ class InitialConditionTableModel(PamhyrTableModel):
self.layoutAboutToBeChanged.emit() self.layoutAboutToBeChanged.emit()
self.layoutChanged.emit() self.layoutChanged.emit()
def import_from_results(self, results): def import_from_results(self, index, results):
if results is None: if results is None:
logger.error("No results data") logger.error("No results data")
return return
@ -319,33 +319,6 @@ class InitialConditionTableModel(PamhyrTableModel):
self.layoutAboutToBeChanged.emit() self.layoutAboutToBeChanged.emit()
self.layoutChanged.emit() self.layoutChanged.emit()
def read_from_ini(self, file_name):
reach_id = self._data.river.enable_edges().index(self._reach) + 1
logger.debug(f"Import initial conditions from {file_name}")
data = []
with open(file_name, encoding="utf-8") as ini_file:
for line in ini_file:
if not (line.startswith("#") or
line.startswith("*") or
line.startswith("$")):
line = line.split()
if int(line[0]) == reach_id:
data.append([line[4], line[2], line[3]])
self._undo.push(
ReplaceDataCommand(
self._lst,
list(
map(
lambda d: self._lst.new_from_data(*d),
data
)
)
)
)
def undo(self): def undo(self):
self._undo.undo() self._undo.undo()
self.layoutChanged.emit() self.layoutChanged.emit()

View File

@ -269,29 +269,20 @@ class InitialConditionsWindow(PamhyrWindow):
settings = QSettings(QSettings.IniFormat, settings = QSettings(QSettings.IniFormat,
QSettings.UserScope, 'MyOrg', ) QSettings.UserScope, 'MyOrg', )
options |= QFileDialog.DontUseNativeDialog options |= QFileDialog.DontUseNativeDialog
filename, _ = QtWidgets.QFileDialog.getOpenFileName(
file_types = [
self._trad["file_bin"],
self._trad["file_ini"],
self._trad["file_all"],
]
file_name, _ = QtWidgets.QFileDialog.getOpenFileName(
self, self,
self._trad["open_file"], self._trad["open_file"],
"", "",
";; ".join(file_types), ";; ".join(["Mage (*.BIN)"]),
options=options options=options
) )
if file_name != "": if filename != "":
size = os.stat(file_name).st_size size = os.stat(filename).st_size
# self._table.import_geometry(0, file_name) # self._table.import_geometry(0, filename)
if file_name[-4:] == ".BIN": self._import_from_file(filename)
self._import_from_bin_file(file_name)
elif file_name[-4:].upper() == ".INI":
self._import_from_ini_file(file_name)
def _import_from_bin_file(self, file_name): def _import_from_file(self, file_name):
solver = Mage8("dummy") solver = Mage8("dummy")
name = os.path.basename(file_name)\ name = os.path.basename(file_name)\
.replace(".BIN", "") .replace(".BIN", "")
@ -319,10 +310,9 @@ class InitialConditionsWindow(PamhyrWindow):
def _import_from_results(self, results): def _import_from_results(self, results):
logger.debug(f"import from results: {results}") logger.debug(f"import from results: {results}")
self._table.import_from_results(row, results) row = self.index_selected_row()
def _import_from_ini_file(self, file_name): self._table.import_from_results(row, results)
self._table.read_from_ini(file_name)
def move_up(self): def move_up(self):
row = self.index_selected_row() row = self.index_selected_row()

View File

@ -34,15 +34,6 @@ class ICTranslate(MainTranslate):
self._dict["discharge"] = self._dict["unit_discharge"] self._dict["discharge"] = self._dict["unit_discharge"]
self._dict["rk"] = self._dict["unit_rk"] self._dict["rk"] = self._dict["unit_rk"]
self._dict["open_file"] = _translate(
"InitialCondition", "Open a file")
self._dict["file_bin"] = _translate(
"InitialCondition", "Mage results file (*.BIN)")
self._dict["file_ini"] = _translate(
"InitialCondition", "Mage initial conditions file (*.INI *.ini)")
self._dict["file_all"] = _translate(
"InitialCondition", "All files (*)")
self._sub_dict["table_headers"] = { self._sub_dict["table_headers"] = {
# "name": _translate("InitialCondition", "Name"), # "name": _translate("InitialCondition", "Name"),
"rk": self._dict["unit_rk"], "rk": self._dict["unit_rk"],

View File

@ -134,7 +134,6 @@ class AddCommand(QUndoCommand):
else: else:
self._new.set_as_not_deleted() self._new.set_as_not_deleted()
class DelCommand(QUndoCommand): class DelCommand(QUndoCommand):
def __init__(self, lcs, tab, rows): def __init__(self, lcs, tab, rows):
QUndoCommand.__init__(self) QUndoCommand.__init__(self)

View File

@ -38,19 +38,6 @@ logger = logging.getLogger()
class ListModel(PamhyrListModel): class ListModel(PamhyrListModel):
def get_true_data_row(self, row):
el = self._data.get(row)
return next(
map(
lambda e: e[0],
filter(
lambda e: e[1] == el,
enumerate(self._data._lst)
)
), 0
)
def data(self, index, role): def data(self, index, role):
row = index.row() row = index.row()
column = index.column() column = index.column()
@ -78,20 +65,17 @@ class ListModel(PamhyrListModel):
return QVariant() return QVariant()
def add(self, row): def add(self, row):
row = self.get_true_data_row(row)
self._undo.push( self._undo.push(
AddCommand( AddCommand(
self._data, row self._data, row
) )
) )
self.update() self.update()
def delete(self, row): def delete(self, row):
self._undo.push( self._undo.push(
DelCommand( DelCommand(
self._data, self._data.lines[row] self._data, row
) )
) )
self.update() self.update()

View File

@ -58,24 +58,25 @@ class AddCommand(QUndoCommand):
self._new = None self._new = None
def undo(self): def undo(self):
self._new.set_as_deleted() self._lines.delete([self._new])
def redo(self): def redo(self):
if self._new is None: if self._new is None:
self._new = self._lines.new(self._row) self._new = self._lines.new(self._row)
else: else:
self._new.set_as_not_deleted() self._lines.insert(self._row, self._new)
class DelCommand(QUndoCommand): class DelCommand(QUndoCommand):
def __init__(self, lines, data): def __init__(self, lines, row):
QUndoCommand.__init__(self) QUndoCommand.__init__(self)
self._lines = lines self._lines = lines
self._data = data self._row = row
self._old = self._lines.get(row)
def undo(self): def undo(self):
self._data.set_as_not_deleted() self._lines.insert(self._row, self._old)
def redo(self): def redo(self):
self._data.set_as_deleted() self._lines.delete_i([self._row])

View File

@ -71,7 +71,7 @@ class ScenarioMenu(AbstractMenu):
) )
action = self._exec() action = self._exec()
if action is None: if action == None:
return return
elif action == select: elif action == select:
self._parent.select_scenario(item) self._parent.select_scenario(item)

View File

@ -48,19 +48,6 @@ _translate = QCoreApplication.translate
class TableModel(PamhyrTableModel): class TableModel(PamhyrTableModel):
def get_true_data_row(self, row):
el = self._data.get(row)
return next(
map(
lambda e: e[0],
filter(
lambda e: e[1] == el,
enumerate(self._data._lst)
)
), 0
)
def data(self, index, role): def data(self, index, role):
if role != Qt.ItemDataRole.DisplayRole: if role != Qt.ItemDataRole.DisplayRole:
return QVariant() return QVariant()
@ -122,8 +109,6 @@ class TableModel(PamhyrTableModel):
def add(self, row, parent=QModelIndex()): def add(self, row, parent=QModelIndex()):
self.beginInsertRows(parent, row, row - 1) self.beginInsertRows(parent, row, row - 1)
row = self.get_true_data_row(row)
self._undo.push( self._undo.push(
AddCommand( AddCommand(
self._data, row self._data, row
@ -138,12 +123,7 @@ class TableModel(PamhyrTableModel):
self._undo.push( self._undo.push(
DelCommand( DelCommand(
self._data, list( self._data, rows
map(
lambda r: self._data.get(r),
rows
)
)
) )
) )

View File

@ -102,29 +102,33 @@ class AddCommand(QUndoCommand):
self._new = None self._new = None
def undo(self): def undo(self):
self._new.set_as_deleted() self._data.delete_i([self._index])
def redo(self): def redo(self):
if self._new is None: if self._new is None:
self._new = self._data.new(self._index) self._new = self._data.new(self._index)
else: else:
self._new.set_as_not_deleted() self._data.undelete([self._new])
# self._data.insert(self._index, self._new)
class DelCommand(QUndoCommand): class DelCommand(QUndoCommand):
def __init__(self, data, lines): def __init__(self, data, rows):
QUndoCommand.__init__(self) QUndoCommand.__init__(self)
self._data = data self._data = data
self._lines = lines self._rows = rows
self._el = []
for row in rows:
self._el.append(self._data.get(row))
self._el.sort()
def undo(self): def undo(self):
for line in self._lines: self._data.undelete(self._el)
line.set_as_not_deleted()
def redo(self): def redo(self):
for line in self._lines: self._data.delete(self._el)
line.set_as_deleted()
class SortCommand(QUndoCommand): class SortCommand(QUndoCommand):

View File

@ -70,7 +70,6 @@
<attribute name="toolBarBreak"> <attribute name="toolBarBreak">
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
<addaction name="action_import"/>
<addaction name="action_add"/> <addaction name="action_add"/>
<addaction name="action_del"/> <addaction name="action_del"/>
<addaction name="action_sort"/> <addaction name="action_sort"/>
@ -150,18 +149,6 @@
<string>Remove points to make the curve increasing</string> <string>Remove points to make the curve increasing</string>
</property> </property>
</action> </action>
<action name="action_import">
<property name="icon">
<iconset>
<normaloff>ressources/import.png</normaloff>ressources/import.png</iconset>
</property>
<property name="text">
<string>Import</string>
</property>
<property name="toolTip">
<string>Import from file</string>
</property>
</action>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>

View File

@ -60,7 +60,6 @@
<attribute name="toolBarBreak"> <attribute name="toolBarBreak">
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
<addaction name="action_import"/>
<addaction name="action_add"/> <addaction name="action_add"/>
<addaction name="action_del"/> <addaction name="action_del"/>
<addaction name="action_sort"/> <addaction name="action_sort"/>
@ -108,18 +107,6 @@
<string>Ctrl+E</string> <string>Ctrl+E</string>
</property> </property>
</action> </action>
<action name="action_import">
<property name="icon">
<iconset>
<normaloff>ressources/import.png</normaloff>ressources/import.png</iconset>
</property>
<property name="text">
<string>Import</string>
</property>
<property name="toolTip">
<string>Import from file</string>
</property>
</action>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>

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>
@ -192,17 +193,17 @@
<translation>Éditer les conditions aux limites</translation> <translation>Éditer les conditions aux limites</translation>
</message> </message>
<message> <message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="50"/> <location filename="../View/BoundaryCondition/Edit/translate.py" line="39"/>
<source>X</source> <source>X</source>
<translation>X</translation> <translation>X</translation>
</message> </message>
<message> <message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="51"/> <location filename="../View/BoundaryCondition/Edit/translate.py" line="40"/>
<source>Y</source> <source>Y</source>
<translation>Y</translation> <translation>Y</translation>
</message> </message>
<message> <message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="56"/> <location filename="../View/BoundaryCondition/Edit/translate.py" line="45"/>
<source>Solid (kg/s)</source> <source>Solid (kg/s)</source>
<translation>Solide (kg/s)</translation> <translation>Solide (kg/s)</translation>
</message> </message>
@ -242,19 +243,19 @@
<translation>Options des conditions limites</translation> <translation>Options des conditions limites</translation>
</message> </message>
<message> <message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="59"/> <location filename="../View/BoundaryCondition/Edit/translate.py" line="48"/>
<source>No geometry</source> <source>No geometry</source>
<translation>Pas de géométrie</translation> <translation>Pas de géométrie</translation>
</message> </message>
<message> <message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="62"/> <location filename="../View/BoundaryCondition/Edit/translate.py" line="51"/>
<source>No geometry found for this reach. <source>No geometry found for this reach.
This feature requires a reach with a geometry.</source> This feature requires a reach with a geometry.</source>
<translation>Aucune géométrie n&apos;a été trouvée sur ce bief. <translation>Aucune géométrie n&apos;a été trouvée sur ce bief.
Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translation> Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translation>
</message> </message>
<message> <message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="67"/> <location filename="../View/BoundaryCondition/Edit/translate.py" line="56"/>
<source>Warning</source> <source>Warning</source>
<translation>Avertissement</translation> <translation>Avertissement</translation>
</message> </message>
@ -263,31 +264,6 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<source>Pollutant</source> <source>Pollutant</source>
<translation>Polluant</translation> <translation>Polluant</translation>
</message> </message>
<message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="38"/>
<source>Open a file</source>
<translation>Ouvrir un fichier</translation>
</message>
<message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="40"/>
<source>Mage hydrograph file (*.HYD)</source>
<translation>Hydrogramme Mage (*.HYD)</translation>
</message>
<message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="42"/>
<source>Mage limnigraph file (*.LIM)</source>
<translation>Limnigramme Mage (*.LIM)</translation>
</message>
<message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="44"/>
<source>Mage rating curve file (*.AVA)</source>
<translation>Courbe de tarage Mage (*.AVA)</translation>
</message>
<message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="46"/>
<source>All files (*)</source>
<translation>Tous les fichiers (*)</translation>
</message>
</context> </context>
<context> <context>
<name>BoundaryConditions</name> <name>BoundaryConditions</name>
@ -472,27 +448,27 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Biefs</translation> <translation>Biefs</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="44"/> <location filename="../View/Translate.py" line="43"/>
<source>Main channel</source> <source>Main channel</source>
<translation>Lit mineur</translation> <translation>Lit mineur</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="45"/> <location filename="../View/Translate.py" line="44"/>
<source>Floodway</source> <source>Floodway</source>
<translation>Lit moyen</translation> <translation>Lit moyen</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="47"/> <location filename="../View/Translate.py" line="46"/>
<source>Not defined</source> <source>Not defined</source>
<translation>Non défini</translation> <translation>Non défini</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="48"/> <location filename="../View/Translate.py" line="47"/>
<source>Not associated</source> <source>Not associated</source>
<translation>Non associé</translation> <translation>Non associé</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="43"/> <location filename="../View/Translate.py" line="42"/>
<source>Cross-section</source> <source>Cross-section</source>
<translation>Section en travers</translation> <translation>Section en travers</translation>
</message> </message>
@ -502,15 +478,10 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Titre</translation> <translation>Titre</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="52"/> <location filename="../View/Translate.py" line="51"/>
<source>Method</source> <source>Method</source>
<translation>Méthode</translation> <translation>Méthode</translation>
</message> </message>
<message>
<location filename="../View/Translate.py" line="42"/>
<source>Select reach</source>
<translation>Sélectionner un bief</translation>
</message>
</context> </context>
<context> <context>
<name>Configure</name> <name>Configure</name>
@ -1295,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>
@ -1519,26 +1485,6 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<source>Initial conditions</source> <source>Initial conditions</source>
<translation>Conditions initiales</translation> <translation>Conditions initiales</translation>
</message> </message>
<message>
<location filename="../View/InitialConditions/translate.py" line="37"/>
<source>Open a file</source>
<translation>Ouvrir un fichier</translation>
</message>
<message>
<location filename="../View/InitialConditions/translate.py" line="39"/>
<source>Mage results file (*.BIN)</source>
<translation>Fichier de résultats Mage (*.BIN)</translation>
</message>
<message>
<location filename="../View/InitialConditions/translate.py" line="41"/>
<source>Mage initial conditions file (*.INI *.ini)</source>
<translation>Fichiers de conditions initiales Mage (*.INI *.ini)</translation>
</message>
<message>
<location filename="../View/InitialConditions/translate.py" line="43"/>
<source>All files (*)</source>
<translation>Tous les fichiers (*)</translation>
</message>
</context> </context>
<context> <context>
<name>InitialConditionAdisTS</name> <name>InitialConditionAdisTS</name>
@ -1627,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="162"/> <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="165"/> <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="168"/> <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>
@ -1857,12 +1803,12 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Éditer la géométrie</translation> <translation>Éditer la géométrie</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="107"/> <location filename="../View/ui/GeometryReach.ui" line="106"/>
<source>Import geometry</source> <source>Import geometry</source>
<translation>Importer une géométrie</translation> <translation>Importer une géométrie</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="119"/> <location filename="../View/ui/GeometryReach.ui" line="118"/>
<source>Export geometry</source> <source>Export geometry</source>
<translation>Exporter la géométrie</translation> <translation>Exporter la géométrie</translation>
</message> </message>
@ -2442,52 +2388,52 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Importer</translation> <translation>Importer</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="131"/> <location filename="../View/ui/GeometryReach.ui" line="130"/>
<source>Add a cross-section</source> <source>Add a cross-section</source>
<translation>Ajouter une section en travers</translation> <translation>Ajouter une section en travers</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="143"/> <location filename="../View/ui/GeometryReach.ui" line="142"/>
<source>Delete selected cross-section(s)</source> <source>Delete selected cross-section(s)</source>
<translation>Supprimer les sections en travers sélectionnées</translation> <translation>Supprimer les sections en travers sélectionnées</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="155"/> <location filename="../View/ui/GeometryReach.ui" line="154"/>
<source>Edit selected cross section(s)</source> <source>Edit selected cross section(s)</source>
<translation>Éditer les sections en travers sélectionnées</translation> <translation>Éditer les sections en travers sélectionnées</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="167"/> <location filename="../View/ui/GeometryReach.ui" line="166"/>
<source>Sort cross-sections by ascending position</source> <source>Sort cross-sections by ascending position</source>
<translation>Trier les sections en travers par PK croissant</translation> <translation>Trier les sections en travers par PK croissant</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="179"/> <location filename="../View/ui/GeometryReach.ui" line="178"/>
<source>Sort cross-sections by descending position</source> <source>Sort cross-sections by descending position</source>
<translation>Trier les sections en travers par PK décroissant</translation> <translation>Trier les sections en travers par PK décroissant</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="191"/> <location filename="../View/ui/GeometryReach.ui" line="190"/>
<source>Move up selected cross-section(s)</source> <source>Move up selected cross-section(s)</source>
<translation>Déplacer les sections en travers vers le haut</translation> <translation>Déplacer les sections en travers vers le haut</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="203"/> <location filename="../View/ui/GeometryReach.ui" line="202"/>
<source>Move down selected cross-section(s)</source> <source>Move down selected cross-section(s)</source>
<translation>Déplacer les sections en travers vers le bas</translation> <translation>Déplacer les sections en travers vers le bas</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="212"/> <location filename="../View/ui/GeometryReach.ui" line="211"/>
<source>Meshing</source> <source>Meshing</source>
<translation>Maillage</translation> <translation>Maillage</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="155"/> <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="158"/> <location filename="../View/Translate.py" line="157"/>
<source>Checks</source> <source>Checks</source>
<translation>Vérifications</translation> <translation>Vérifications</translation>
</message> </message>
@ -2622,17 +2568,17 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Importer depuis un fichier</translation> <translation>Importer depuis un fichier</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="217"/> <location filename="../View/ui/GeometryReach.ui" line="216"/>
<source>Update RK</source> <source>Update RK</source>
<translation>Mise à jour des PK</translation> <translation>Mise à jour des PK</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="220"/> <location filename="../View/ui/GeometryReach.ui" line="219"/>
<source>Recompute RK</source> <source>Recompute RK</source>
<translation>Recalcule des PK</translation> <translation>Recalcule des PK</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="228"/> <location filename="../View/ui/GeometryReach.ui" line="227"/>
<source>Purge cross-sections to keep a given number of points</source> <source>Purge cross-sections to keep a given number of points</source>
<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>
@ -2647,42 +2593,42 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<translation>Exporter les données au format CSV</translation> <translation>Exporter les données au format CSV</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/EditBoundaryConditions.ui" line="131"/> <location filename="../View/ui/EditBoundaryConditions.ui" line="130"/>
<source>Generate uniform</source> <source>Generate uniform</source>
<translation>Générer un regime uniforme</translation> <translation>Générer un regime uniforme</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/EditBoundaryConditions.ui" line="134"/> <location filename="../View/ui/EditBoundaryConditions.ui" line="133"/>
<source>Generate rating curve from Manning law</source> <source>Generate rating curve from Manning law</source>
<translation>Générer une courbe de tarage (loi de Maning)</translation> <translation>Générer une courbe de tarage (loi de Maning)</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/EditBoundaryConditions.ui" line="139"/> <location filename="../View/ui/EditBoundaryConditions.ui" line="138"/>
<source>Generate critical</source> <source>Generate critical</source>
<translation>Générer régime critique</translation> <translation>Générer régime critique</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/EditBoundaryConditions.ui" line="142"/> <location filename="../View/ui/EditBoundaryConditions.ui" line="141"/>
<source>Generate rating curve as Q(z) = Sqrt(g*S(z)^3/L(z))</source> <source>Generate rating curve as Q(z) = Sqrt(g*S(z)^3/L(z))</source>
<translation>Générer une courbe de tarage (Q(z) = Sqrt(g*S(z)^3/L(z)))</translation> <translation>Générer une courbe de tarage (Q(z) = Sqrt(g*S(z)^3/L(z)))</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/EditBoundaryConditions.ui" line="147"/> <location filename="../View/ui/EditBoundaryConditions.ui" line="146"/>
<source>Make increasing</source> <source>Make increasing</source>
<translation>Augmenter</translation> <translation>Augmenter</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/EditBoundaryConditions.ui" line="150"/> <location filename="../View/ui/EditBoundaryConditions.ui" line="149"/>
<source>Remove points to make the curve increasing</source> <source>Remove points to make the curve increasing</source>
<translation>Supprimer des points pour rendre la courbe croissante</translation> <translation>Supprimer des points pour rendre la courbe croissante</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="233"/> <location filename="../View/ui/GeometryReach.ui" line="232"/>
<source>Shift</source> <source>Shift</source>
<translation>Translater</translation> <translation>Translater</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="236"/> <location filename="../View/ui/GeometryReach.ui" line="235"/>
<source>Shift selected sections coordinates</source> <source>Shift selected sections coordinates</source>
<translation>Translater les coordonnées des sections sélectionnées</translation> <translation>Translater les coordonnées des sections sélectionnées</translation>
</message> </message>
@ -2707,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="176"/> <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="185"/> <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="188"/> <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="179"/> <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="193"/> <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="196"/> <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="173"/> <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="200"/> <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="201"/> <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>
@ -2922,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="202"/> <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="203"/> <location filename="../View/Translate.py" line="202"/>
<source>No</source> <source>No</source>
<translation>Non</translation> <translation>Non</translation>
</message> </message>
@ -2946,16 +2892,6 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<source>Import background image</source> <source>Import background image</source>
<translation>Importer une image de fond</translation> <translation>Importer une image de fond</translation>
</message> </message>
<message>
<location filename="../View/ui/GeometryReach.ui" line="241"/>
<source>Select reach</source>
<translation>Sélectionner un bief</translation>
</message>
<message>
<location filename="../View/ui/GeometryReach.ui" line="244"/>
<source>Change current reach</source>
<translation>Changer le bief courrant</translation>
</message>
</context> </context>
<context> <context>
<name>MainWindow_reach</name> <name>MainWindow_reach</name>
@ -3682,87 +3618,87 @@ Cette fonctionnalité nécessite un bief muni d&apos;une géométrie.</translati
<context> <context>
<name>Unit</name> <name>Unit</name>
<message> <message>
<location filename="../View/Translate.py" line="60"/> <location filename="../View/Translate.py" line="59"/>
<source>Width (m)</source> <source>Width (m)</source>
<translation>Largeur (m)</translation> <translation>Largeur (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="66"/> <location filename="../View/Translate.py" line="65"/>
<source>Depth (m)</source> <source>Depth (m)</source>
<translation>Profondeur (m)</translation> <translation>Profondeur (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="73"/> <location filename="../View/Translate.py" line="72"/>
<source>Diameter (m)</source> <source>Diameter (m)</source>
<translation>Diamètre (m)</translation> <translation>Diamètre (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="74"/> <location filename="../View/Translate.py" line="73"/>
<source>Thickness (m)</source> <source>Thickness (m)</source>
<translation>Épaisseur (m)</translation> <translation>Épaisseur (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="75"/> <location filename="../View/Translate.py" line="74"/>
<source>Elevation (m)</source> <source>Elevation (m)</source>
<translation>Cote (m)</translation> <translation>Cote (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="118"/> <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="120"/> <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="121"/> <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="123"/> <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="124"/> <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>
<message> <message>
<location filename="../View/Translate.py" line="59"/> <location filename="../View/Translate.py" line="58"/>
<source>River Kilometer (m)</source> <source>River Kilometer (m)</source>
<translation>Point Kilométrique (m)</translation> <translation>Point Kilométrique (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="67"/> <location filename="../View/Translate.py" line="66"/>
<source>Max Depth (m)</source> <source>Max Depth (m)</source>
<translation>Profondeur max (m)</translation> <translation>Profondeur max (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="72"/> <location filename="../View/Translate.py" line="71"/>
<source>Mean Depth (m)</source> <source>Mean Depth (m)</source>
<translation>Profondeur moyenne (m)</translation> <translation>Profondeur moyenne (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="100"/> <location filename="../View/Translate.py" line="99"/>
<source>Velocity (m/s)</source> <source>Velocity (m/s)</source>
<translation>Vitesse (m/s)</translation> <translation>Vitesse (m/s)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="139"/> <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="142"/> <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="145"/> <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>
@ -3805,132 +3741,132 @@ moyen droit (m)</translation>
<translation>D90</translation> <translation>D90</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="61"/> <location filename="../View/Translate.py" line="60"/>
<source>Width Envelop (m)</source> <source>Width Envelop (m)</source>
<translation>Enveloppe de la argeur (m)</translation> <translation>Enveloppe de la argeur (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="64"/> <location filename="../View/Translate.py" line="63"/>
<source>Max Width (m)</source> <source>Max Width (m)</source>
<translation>Largeur max (m)</translation> <translation>Largeur max (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="65"/> <location filename="../View/Translate.py" line="64"/>
<source>Min Width (m)</source> <source>Min Width (m)</source>
<translation>Largeur min (m)</translation> <translation>Largeur min (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="68"/> <location filename="../View/Translate.py" line="67"/>
<source>Min Depth (m)</source> <source>Min Depth (m)</source>
<translation>Profondeur min (m)</translation> <translation>Profondeur min (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="69"/> <location filename="../View/Translate.py" line="68"/>
<source>Depth Envelop (m)</source> <source>Depth Envelop (m)</source>
<translation>Enveloppe de la profondeur (m)</translation> <translation>Enveloppe de la profondeur (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="76"/> <location filename="../View/Translate.py" line="75"/>
<source>Bed Elevation (m)</source> <source>Bed Elevation (m)</source>
<translation>Cote du fond (m)</translation> <translation>Cote du fond (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="79"/> <location filename="../View/Translate.py" line="78"/>
<source>Bed Elevation Envelop (m)</source> <source>Bed Elevation Envelop (m)</source>
<translation>Enveloppe de la cote du fond (m)</translation> <translation>Enveloppe de la cote du fond (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="82"/> <location filename="../View/Translate.py" line="81"/>
<source>Max Bed Elevation (m)</source> <source>Max Bed Elevation (m)</source>
<translation>Cote du fond max (m)</translation> <translation>Cote du fond max (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="85"/> <location filename="../View/Translate.py" line="84"/>
<source>Min Bed Elevation (m)</source> <source>Min Bed Elevation (m)</source>
<translation>Cote du fond min (m)</translation> <translation>Cote du fond min (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="88"/> <location filename="../View/Translate.py" line="87"/>
<source>Water Elevation (m)</source> <source>Water Elevation (m)</source>
<translation>Cote de l&apos;eau (m)</translation> <translation>Cote de l&apos;eau (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="91"/> <location filename="../View/Translate.py" line="90"/>
<source>Water Elevation Envelop (m)</source> <source>Water Elevation Envelop (m)</source>
<translation>Enveloppe de la cote de l&apos;eau (m)</translation> <translation>Enveloppe de la cote de l&apos;eau (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="94"/> <location filename="../View/Translate.py" line="93"/>
<source>Max Water Elevation (m)</source> <source>Max Water Elevation (m)</source>
<translation>Cote de l&apos;eau max (m)</translation> <translation>Cote de l&apos;eau max (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="97"/> <location filename="../View/Translate.py" line="96"/>
<source>Min Water Elevation (m)</source> <source>Min Water Elevation (m)</source>
<translation>Cote de l&apos;eau min (m)</translation> <translation>Cote de l&apos;eau min (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="101"/> <location filename="../View/Translate.py" line="100"/>
<source>Velocity Envelop (m/s)</source> <source>Velocity Envelop (m/s)</source>
<translation>Enveloppe de la vitesse (m/s)</translation> <translation>Enveloppe de la vitesse (m/s)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="104"/> <location filename="../View/Translate.py" line="103"/>
<source>Max Velocity (m/s)</source> <source>Max Velocity (m/s)</source>
<translation>Vitesse max (m/s)</translation> <translation>Vitesse max (m/s)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="107"/> <location filename="../View/Translate.py" line="106"/>
<source>Min Velocity (m/s)</source> <source>Min Velocity (m/s)</source>
<translation>Vitesse min (m/s)</translation> <translation>Vitesse min (m/s)</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="126"/> <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="127"/> <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="128"/> <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="129"/> <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="130"/> <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="131"/> <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="132"/> <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="133"/> <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="135"/> <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="146"/> <location filename="../View/Translate.py" line="145"/>
<source>Mass (kg)</source> <source>Mass (kg)</source>
<translation>Masse</translation> <translation>Masse</translation>
</message> </message>
@ -3950,32 +3886,32 @@ moyen droit (m)</translation>
<translation>Coeff c</translation> <translation>Coeff c</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="110"/> <location filename="../View/Translate.py" line="109"/>
<source>Discharge</source> <source>Discharge</source>
<translation>Débit</translation> <translation>Débit</translation>
</message> </message>
<message> <message>
<location filename="../View/Translate.py" line="112"/> <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="114"/> <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="116"/> <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="147"/> <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="138"/> <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>