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

Pamhyr: Centralize ND and NA translate.

setup.py
Pierre-Antoine Rouby 2024-02-21 17:19:50 +01:00
parent 2e158f4c1b
commit a4c5d34720
19 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/View/BoundaryCondition/Edit/Window.py
View File

@ -108,7 +108,7 @@ class EditBoundaryConditionWindow(PamhyrWindow):
name = trad[self._pamhyr_name]
if self._data is not None:
node_name = (self._data.node.name if self._data.node is not None
else _translate("BoundaryCondition", "Not associate"))
else trad['not_associated'])
name += (
f" - {study.name} " +
f" - {self._data.name} ({self._data.id}) " +

4
src/View/BoundaryCondition/Table.py
View File

@ -85,7 +85,7 @@ class ComboBoxDelegate(QItemDelegate):
)
else:
self.editor.addItems(
[_translate("BoundaryCondition", "Not associate")] +
[self._trad["not_associated"]] +
self._data.nodes_names()
)
@ -145,7 +145,7 @@ class TableModel(PamhyrTableModel):
elif self._headers[column] == "node":
n = self._lst.get(self._tab, row).node
if n is None:
return _translate("BoundaryCondition", "Not associate")
return self._trad["not_associated"]
return n.name
return QVariant()

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

@ -47,7 +47,7 @@ class BCTranslate(MainTranslate):
)
self._sub_dict["long_types"] = {
"ND": _translate("BoundaryCondition", "Not defined"),
"ND": self._dict["not_defined"],
"PC": _translate("BoundaryCondition", "Ponctual contribution"),
"TZ": _translate("BoundaryCondition", "Z(t)"),
"TD": _translate("BoundaryCondition", "Q(t)"),

9
src/View/Frictions/Table.py
View File

@ -52,11 +52,12 @@ _translate = QCoreApplication.translate
class ComboBoxDelegate(QItemDelegate):
def __init__(self, data=None, study=None,
mode="stricklers", parent=None):
mode="stricklers", trad=None, parent=None):
super(ComboBoxDelegate, self).__init__(parent)
self._data = data
self._study = study
self._trad = trad
self._mode = mode
def createEditor(self, parent, option, index):
@ -64,7 +65,7 @@ class ComboBoxDelegate(QItemDelegate):
if self._mode == "stricklers":
self.editor.addItems(
[_translate("Frictions", "Not defined")] +
[self._trad["not_defined"]] +
list(
map(
lambda s: str(s),
@ -119,12 +120,12 @@ class TableModel(PamhyrTableModel):
elif self._headers[column] == "begin_strickler":
value = self._lst.get(row).begin_strickler
if value is None:
return _translate("Frictions", "Not defined")
return self._trad["not_defined"]
return str(value)
elif self._headers[column] == "end_strickler":
value = self._lst.get(row).end_strickler
if value is None:
return _translate("Frictions", "Not defined")
return self._trad["not_defined"]
return str(value)
return QVariant()

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

@ -99,6 +99,7 @@ class FrictionsWindow(PamhyrWindow):
data=self._reach,
study=self._study,
mode="stricklers",
trad=self._trad,
parent=self
)
@ -115,6 +116,7 @@ class FrictionsWindow(PamhyrWindow):
"end_strickler": self._delegate_stricklers,
},
data=self._reach,
trad=self._trad,
undo=self._undo_stack,
opt_data=self._study
)

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

@ -52,10 +52,12 @@ class PlotXY(PamhyrPlot):
self.init_axes()
if self.data is None:
self.idle()
return
if self.data.number_profiles == 0:
self._init = False
self.idle()
return
self.draw_xy()

4
src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py
View File

@ -106,9 +106,7 @@ hydraulic structure values?"
# BHS types long names
self._sub_dict["long_types"] = {
"ND": _translate(
"BasicHydraulicStructures", "Not defined"
),
"ND": self._dict["not_defined"],
"S1": _translate(
"BasicHydraulicStructures", "Discharge weir"
),

8
src/View/HydraulicStructures/Table.py
View File

@ -76,7 +76,7 @@ class ComboBoxDelegate(QItemDelegate):
)
self.editor.addItems(
[_translate("Hydraulic structure", "Not associated")] +
[self._trad['not_associated']] +
val
)
@ -124,12 +124,12 @@ class TableModel(PamhyrTableModel):
elif self._headers[column] == "reach":
n = self._lst.get(row).input_reach
if n is None:
return _translate("Hydraulic structure", "Not associated")
return self._trad['not_associated']
return n.name
elif self._headers[column] == "kp":
n = self._lst.get(row).input_kp
if n is None:
return _translate("Hydraulic structure", "Not associated")
return self._trad['not_associated']
return n
return QVariant()
@ -140,7 +140,7 @@ class TableModel(PamhyrTableModel):
row = index.row()
column = index.column()
na = _translate("Hydraulic structure", "Not associated")
na = self._trad['not_associated']
try:
if self._headers[column] == "name":

3
src/View/LateralContribution/Edit/Window.py
View File

@ -59,8 +59,7 @@ class EditLateralContributionWindow(PamhyrWindow):
name = trad[self._pamhyr_name]
if self._data is not None:
edge_name = (self._data.edge.name if self._data.edge is not None
else _translate("LateralContribution",
"Not associate"))
else trad['not_associated'])
name += (
f" - {study.name} " +
f" - {self._data.name} ({self._data.id}) " +

4
src/View/LateralContribution/Table.py
View File

@ -80,7 +80,7 @@ class ComboBoxDelegate(QItemDelegate):
self.editor.addItems(lst)
else:
self.editor.addItems(
[_translate("LateralContribution", "Not associate")] +
[self._trad['not_associated']] +
self._data.edges_names()
)
@ -133,7 +133,7 @@ class TableModel(PamhyrTableModel):
elif self._headers[column] == "edge":
n = self._lst.get(self._tab, row).edge
if n is None:
return _translate("LateralContribution", "Not associate")
return self._trad['not_associated']
return n.name
elif self._headers[column] == "begin_kp":
return self._lst.get(self._tab, row).begin_kp

4
src/View/LateralContribution/Window.py
View File

@ -132,6 +132,7 @@ class LateralContributionWindow(PamhyrWindow):
self.plot = PlotXY(
canvas=self.canvas,
data=None,
trad=self._trad,
toolbar=None,
)
@ -197,10 +198,11 @@ class LateralContributionWindow(PamhyrWindow):
self.plot = PlotXY(
canvas=self.canvas,
data=data,
trad=self._trad,
toolbar=None,
)
self.plot.highlight = highlight
self.plot.draw()
self.plot.update()
def add(self):
tab = self.current_tab()

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

@ -43,12 +43,16 @@ class LCTranslate(MainTranslate):
)
self._sub_dict["long_types"] = {
"ND": _translate("LateralContribution", "Not defined"),
"ND": self._dict["not_defined"],
"LC": _translate("LateralContribution", "Lateral contribution"),
"RA": _translate("LateralContribution", "Rain"),
"EV": _translate("LateralContribution", "Evaporation"),
}
self._dict["x"] = _translate("Geometry", "X (m)")
self._dict["y"] = _translate("Geometry", "Y (m)")
self._dict["z"] = _translate("Geometry", "Z (m)")
self._sub_dict["table_headers"] = {
"name": self._dict["name"],
"type": self._dict["type"],

2
src/View/Reservoir/Edit/Window.py
View File

@ -63,7 +63,7 @@ class EditReservoirWindow(PamhyrWindow):
name = trad[self._pamhyr_name]
if self._data is not None:
node_name = (self._data.node.name if self._data.node is not None
else _translate("Reservoir", "Not associated"))
else trad['not_associated'])
name += (
f" - {study.name} " +
f" - {self._data.name} ({self._data.id}) " +

4
src/View/Reservoir/Table.py
View File

@ -70,7 +70,7 @@ class ComboBoxDelegate(QItemDelegate):
)
self.editor.addItems(
[_translate("Reservoir", "Not associated")] +
[self._trad['not_associated']] +
nodes
)
@ -118,7 +118,7 @@ class TableModel(PamhyrTableModel):
elif self._headers[column] == "node":
n = self._lst.get(row).node
if n is None:
return _translate("Reservoir", "Not associated")
return self._trad['not_associated']
return n.name
return QVariant()

9
src/View/SedimentLayers/Reach/Profile/Table.py
View File

@ -44,16 +44,17 @@ logger = logging.getLogger()
class ComboBoxDelegate(QItemDelegate):
def __init__(self, study=None, parent=None):
def __init__(self, study=None, trad=None, parent=None):
super(ComboBoxDelegate, self).__init__(parent)
self._trad = trad
self._study = study
def createEditor(self, parent, option, index):
self.editor = QComboBox(parent)
self.editor.addItems(
# [_translate("SedimentLayers", "Not defined")] +
# [self._trad["not_defined"]] +
list(
map(
lambda sl: str(sl),
@ -104,7 +105,7 @@ class TableModel(PamhyrTableModel):
elif self._headers[column] == "sl":
value = self._data.point(row).sl
if value is None:
text = _translate("SedimentLayers", "Not defined")
text = self._trad["not_defined"]
return text
return str(value)
elif self._headers[column] == "x":
@ -125,7 +126,7 @@ class TableModel(PamhyrTableModel):
if self._headers[column] == "sl":
new = None
if value != _translate("SedimentLayers", "Not defined"):
if value != self._trad["not_defined"]:
new = next(
filter(
lambda sl: str(sl) == value,

5
src/View/SedimentLayers/Reach/SLDialog.py
View File

@ -45,6 +45,7 @@ class SLDialog(PamhyrDialog):
title=trad[self._pamhyr_name],
study=study,
config=config,
trad=trad,
parent=parent
)
@ -55,7 +56,7 @@ class SLDialog(PamhyrDialog):
def setup_combobox(self):
self.combobox_add_items(
"comboBox",
[_translate("SedimentLayers", "Not defined")] +
[self._trad["not_defined"]] +
list(
map(
lambda sl: str(sl),
@ -66,7 +67,7 @@ class SLDialog(PamhyrDialog):
@property
def sl(self):
if self.value == _translate("SedimentLayers", "Not defined"):
if self.value == self._trad["not_defined"]:
return None
return next(

6
src/View/SedimentLayers/Reach/Table.py
View File

@ -53,7 +53,7 @@ class ComboBoxDelegate(QItemDelegate):
self.editor = QComboBox(parent)
self.editor.addItems(
[self._trad["nd"]] +
[self._trad["not_defined"]] +
list(
map(
lambda sl: str(sl),
@ -106,7 +106,7 @@ class TableModel(PamhyrTableModel):
if self._headers[column] == "sl":
value = self._data.profile(row).sl
if value is None:
text = _translate("SedimentLayers", "Not defined")
text = self._trad["not_defined"]
return text
return str(value)
@ -121,7 +121,7 @@ class TableModel(PamhyrTableModel):
if self._headers[column] == "sl":
new = None
if value != _translate("SedimentLayers", "Not defined"):
if value != self._trad["not_defined"]:
new = next(
filter(
lambda sl: str(sl) == value,

1
src/View/SedimentLayers/Reach/translate.py
View File

@ -34,7 +34,6 @@ class SedimentReachTranslate(SedimentTranslate):
"SedimentLayers", "Apply sediment layers to reach"
)
self._dict["nd"] = _translate("SedimentLayers", "Not defined")
self._dict["kp"] = self._dict["unit_kp"]
self._dict["height"] = self._dict["unit_height"]

3
src/View/Translate.py
View File

@ -42,6 +42,9 @@ class CommonWordTranslate(PamhyrTranslate):
self._dict["main_channel"] = _translate("CommonWord", "Main channel")
self._dict["floodway"] = _translate("CommonWord", "Floodway")
self._dict["not_defined"] = _translate("CommonWord", "Not defined")
self._dict["not_associated"] = _translate("CommonWord", "Not associated")
class UnitTranslate(CommonWordTranslate):
def __init__(self):