diff --git a/src/Model/InitialConditions/InitialConditions.py b/src/Model/InitialConditions/InitialConditions.py index de5988837ef9d2adfe476be3a673c3271b8cc218..32a2bd680b86dbae7f2758d889ea76c7b63e12aa 100644 --- a/src/Model/InitialConditions/InitialConditions.py +++ b/src/Model/InitialConditions/InitialConditions.py @@ -19,7 +19,7 @@ class Data(object): self._flow = 0.0 self._speed = 0.0 self._elevation = 0.0 - self._draft = 0.0 + self._height = 0.0 @property def name(self): @@ -40,8 +40,8 @@ class Data(object): val = self._flow elif key == "elevation": val = self._elevation - elif key == "draft": - val = self._draft + elif key == "height": + val = self._height return val @@ -56,15 +56,15 @@ class Data(object): def _update_from_kp(self): min = self._update_get_min() - self._elevation = min - self._draft + self._elevation = min - self._height def _update_from_elevation(self): min = self._update_get_min() - self._draft = self._elevation - min + self._height = self._elevation - min - def _update_from_draft(self): + def _update_from_height(self): min = self._update_get_min() - self._elevation = self._draft + min + self._elevation = self._height + min def _update_from_flow(self): min = self._update_get_min() @@ -87,9 +87,9 @@ class Data(object): elif key == "elevation": self._elevation = float(value) self._update_from_elevation() - elif key == "draft": - self._draft = float(value) - self._update_from_draft() + elif key == "height": + self._height = float(value) + self._update_from_height() self._status.modified() @@ -196,7 +196,7 @@ class InitialConditions(object): key = lambda p: p.kp ) - def generate_growing_constante_draft(self, draft:float): + def generate_growing_constante_height(self, height:float): self._data = [] profiles = self._reach.reach.profiles @@ -208,10 +208,10 @@ class InitialConditions(object): new["kp"] = profile.kp if prev is None: - new["elevation"] = profile.z_min() + draft + new["elevation"] = profile.z_min() + height else: new["elevation"] = max( - profile.z_min() + draft, + profile.z_min() + height, prev["elevation"] ) diff --git a/src/View/InitialConditions/DialogDraft.py b/src/View/InitialConditions/DialogHeight.py similarity index 69% rename from src/View/InitialConditions/DialogDraft.py rename to src/View/InitialConditions/DialogHeight.py index 6e9259c493414b5700b1f105badc72a2fa7a3fac..91ceadb1b891674d96d0f8f72bdfac0ac0d3264d 100644 --- a/src/View/InitialConditions/DialogDraft.py +++ b/src/View/InitialConditions/DialogHeight.py @@ -16,10 +16,10 @@ from PyQt5.QtWidgets import ( QDoubleSpinBox, ) -class DraftDialog(ASubWindow, ListedSubWindow): - def __init__(self, title="Draft", parent=None): - super(DraftDialog, self).__init__( - name=title, ui="InitialConditions_Dialog_Generator_Draft", parent=parent +class HeightDialog(ASubWindow, ListedSubWindow): + def __init__(self, title="Height", parent=None): + super(HeightDialog, self).__init__( + name=title, ui="InitialConditions_Dialog_Generator_Height", parent=parent ) self.value = None diff --git a/src/View/InitialConditions/UndoCommand.py b/src/View/InitialConditions/UndoCommand.py index 28e9fe611b0106183597ed2b8da3a2b9cd66343e..215c299bc36b89495131c071070c1d567be0f3fa 100644 --- a/src/View/InitialConditions/UndoCommand.py +++ b/src/View/InitialConditions/UndoCommand.py @@ -161,6 +161,6 @@ class GenerateCommand(QUndoCommand): def redo(self): if self._generator == "growing": - self._ics.generate_growing_constante_draft(self._param) + self._ics.generate_growing_constante_height(self._param) elif self._generator == "discharge": self._ics.generate_discharge(self._param) diff --git a/src/View/InitialConditions/Window.py b/src/View/InitialConditions/Window.py index 6e13ba43415b65d5c757d36883ebb1db96f30dda..381b8d15c90e9143f579e7eccdbe62eacdabbdc3 100644 --- a/src/View/InitialConditions/Window.py +++ b/src/View/InitialConditions/Window.py @@ -34,7 +34,7 @@ from View.Plot.MplCanvas import MplCanvas from View.InitialConditions.PlotDKP import PlotDKP from View.InitialConditions.PlotFlow import PlotFlow from View.InitialConditions.translate import * -from View.InitialConditions.DialogDraft import DraftDialog +from View.InitialConditions.DialogHeight import HeightDialog from View.InitialConditions.DialogDischarge import DischargeDialog _translate = QCoreApplication.translate @@ -129,7 +129,7 @@ class InitialConditionsWindow(ASubMainWindow, ListedSubWindow): self.find(QAction, "action_sort").triggered.connect(self.sort) self.find(QPushButton, "pushButton_generate_1").clicked.connect( - self.generate_growing_constante_draft + self.generate_growing_constante_height ) self.find(QPushButton, "pushButton_generate_2").clicked.connect( @@ -212,8 +212,8 @@ class InitialConditionsWindow(ASubMainWindow, ListedSubWindow): self._table.redo() self._update_plot() - def generate_growing_constante_draft(self): - dlg = DraftDialog(parent=self) + def generate_growing_constante_height(self): + dlg = HeightDialog(parent=self) if dlg.exec(): value = dlg.value self._table.generate("growing", value) diff --git a/src/View/InitialConditions/translate.py b/src/View/InitialConditions/translate.py index bd2f3cc11913e712c50e4da8da941919620c62aa..21b4d286fa18519e41f1d1c793f5d2a9c0815325 100644 --- a/src/View/InitialConditions/translate.py +++ b/src/View/InitialConditions/translate.py @@ -11,5 +11,5 @@ table_headers = { "speed": _translate("LateralContribution", "Speed (m/s)"), "flow": _translate("LateralContribution", "Flow (m³/s)"), "elevation": _translate("LateralContribution", "Elevation (m)"), - "draft": _translate("LateralContribution", "Draft (m)") + "height": _translate("LateralContribution", "Height (m)") } diff --git a/src/View/ui/InitialConditions_Dialog_Generator_Draft.ui b/src/View/ui/InitialConditions_Dialog_Generator_Height.ui similarity index 100% rename from src/View/ui/InitialConditions_Dialog_Generator_Draft.ui rename to src/View/ui/InitialConditions_Dialog_Generator_Height.ui