diff --git a/src/Model/BoundaryCondition/BoundaryConditionList.py b/src/Model/BoundaryCondition/BoundaryConditionList.py index 096dc7b80bee24f09ddb2daeb3b38f61b0df7881..5f2857da71b519fcbf71b6dccfadaa5a5ff7df9b 100644 --- a/src/Model/BoundaryCondition/BoundaryConditionList.py +++ b/src/Model/BoundaryCondition/BoundaryConditionList.py @@ -8,7 +8,7 @@ from Model.Except import NotImplementedMethodeError from Model.BoundaryCondition.BoundaryConditionTypes import ( NotDefined, PonctualContribution, - TimeOverZ, TimeOverDebit, ZOverDebit + TimeOverZ, TimeOverDischarge, ZOverDischarge ) class BoundaryConditionList(object): diff --git a/src/Model/BoundaryCondition/BoundaryConditionTypes.py b/src/Model/BoundaryCondition/BoundaryConditionTypes.py index 537d81415c63ec0823cf5f0d4c53afc3a97cc20a..98a488435711d56afac9219bd60172f80b2a0b41 100644 --- a/src/Model/BoundaryCondition/BoundaryConditionTypes.py +++ b/src/Model/BoundaryCondition/BoundaryConditionTypes.py @@ -21,7 +21,7 @@ class PonctualContribution(BoundaryCondition): super(PonctualContribution, self).__init__(name=name, status=status) self._type = "PC" - self._header = ["time", "debit"] + self._header = ["time", "discharge"] self._types = [PonctualContribution.time_convert, float] @classmethod @@ -40,24 +40,24 @@ class TimeOverZ(BoundaryCondition): def compatibility(cls): return ["liquid"] -class TimeOverDebit(BoundaryCondition): +class TimeOverDischarge(BoundaryCondition): def __init__(self, name:str = "", status = None): - super(TimeOverDebit, self).__init__(name=name, status=status) + super(TimeOverDischarge, self).__init__(name=name, status=status) self._type = "TD" - self._header = ["time", "debit"] - self._types = [TimeOverDebit.time_convert, float] + self._header = ["time", "discharge"] + self._types = [TimeOverDischarge.time_convert, float] @classmethod def compatibility(cls): return ["liquid"] -class ZOverDebit(BoundaryCondition): +class ZOverDischarge(BoundaryCondition): def __init__(self, name:str = "", status = None): - super(ZOverDebit, self).__init__(name=name, status=status) + super(ZOverDischarge, self).__init__(name=name, status=status) self._type = "ZD" - self._header = ["z", "debit"] + self._header = ["z", "discharge"] self._types = [float, float] @classmethod diff --git a/src/Model/LateralContribution/LateralContributionTypes.py b/src/Model/LateralContribution/LateralContributionTypes.py index d45cd1e5ca688f64f45f0cec508dcb7bdd3d347e..7a3a854812fc0c7a4933692c8fe8f1e544af040c 100644 --- a/src/Model/LateralContribution/LateralContributionTypes.py +++ b/src/Model/LateralContribution/LateralContributionTypes.py @@ -21,7 +21,7 @@ class LateralContrib(LateralContribution): super(LateralContrib, self).__init__(name=name, status=status) self._type = "LC" - self._header = ["time", "debit"] + self._header = ["time", "discharge"] self._types = [LateralContrib.time_convert, float] @classmethod @@ -33,7 +33,7 @@ class Rain(LateralContribution): super(Rain, self).__init__(name=name, status=status) self._type = "RA" - self._header = ["time", "debit"] + self._header = ["time", "discharge"] self._types = [Rain.time_convert, float] @classmethod @@ -45,7 +45,7 @@ class Evaporation(LateralContribution): super(Evaporation, self).__init__(name=name, status=status) self._type = "EV" - self._header = ["time", "debit"] + self._header = ["time", "discharge"] self._types = [Evaporation.time_convert, float] @classmethod diff --git a/src/View/BoundaryCondition/Edit/Table.py b/src/View/BoundaryCondition/Edit/Table.py index 99f324f8498e61cab2d7468b9e9454a147f6e4bf..6c94b9282d27a0e40f9043bef3a30c7eae90a2b8 100644 --- a/src/View/BoundaryCondition/Edit/Table.py +++ b/src/View/BoundaryCondition/Edit/Table.py @@ -20,7 +20,7 @@ from PyQt5.QtWidgets import ( from Model.BoundaryCondition.BoundaryConditionTypes import ( NotDefined, PonctualContribution, - TimeOverZ, TimeOverDebit, ZOverDebit + TimeOverZ, TimeOverDischarge, ZOverDischarge ) from View.BoundaryCondition.Edit.UndoCommand import ( diff --git a/src/View/BoundaryCondition/Edit/translate.py b/src/View/BoundaryCondition/Edit/translate.py index 5d148b33f0a450b48cf351cef1edf64def46b657..44ef5a46ee29e845e24166fd5f458fdf85e4c8ed 100644 --- a/src/View/BoundaryCondition/Edit/translate.py +++ b/src/View/BoundaryCondition/Edit/translate.py @@ -9,6 +9,6 @@ table_headers = { "y": _translate("BoundaryCondition", "Y"), "time": _translate("BoundaryCondition", "Time"), "date": _translate("BoundaryCondition", "Date"), - "debit": _translate("BoundaryCondition", "Debit (m³/s)"), + "discharge": _translate("BoundaryCondition", "Discharge (m³/s)"), "z": _translate("BoundaryCondition", "Z (m)") } diff --git a/src/View/BoundaryCondition/Table.py b/src/View/BoundaryCondition/Table.py index 6383114194869a0b884c16f273c570ce3ca97f44..98890e0ce0d36c744c365f6a80970e20b2fde137 100644 --- a/src/View/BoundaryCondition/Table.py +++ b/src/View/BoundaryCondition/Table.py @@ -17,7 +17,7 @@ from PyQt5.QtWidgets import ( from Model.BoundaryCondition.BoundaryConditionTypes import ( NotDefined, PonctualContribution, - TimeOverZ, TimeOverDebit, ZOverDebit + TimeOverZ, TimeOverDischarge, ZOverDischarge ) from View.BoundaryCondition.UndoCommand import ( diff --git a/src/View/BoundaryCondition/Window.py b/src/View/BoundaryCondition/Window.py index 99d9becd5a69cb10dad6c30550d5a6463861d646..62d823d71ef69518663acaf24a6748963b605f96 100644 --- a/src/View/BoundaryCondition/Window.py +++ b/src/View/BoundaryCondition/Window.py @@ -24,7 +24,7 @@ from PyQt5.QtWidgets import ( from Model.BoundaryCondition.BoundaryConditionTypes import ( NotDefined, PonctualContribution, - TimeOverZ, TimeOverDebit, ZOverDebit + TimeOverZ, TimeOverDischarge, ZOverDischarge ) from View.BoundaryCondition.UndoCommand import ( diff --git a/src/View/BoundaryCondition/translate.py b/src/View/BoundaryCondition/translate.py index 762ca867bde99eaa0b53d2d16fb244366842758e..e191d0beab228365163ec5719a57b7488f475f88 100644 --- a/src/View/BoundaryCondition/translate.py +++ b/src/View/BoundaryCondition/translate.py @@ -4,7 +4,7 @@ from PyQt5.QtCore import QCoreApplication from Model.BoundaryCondition.BoundaryConditionTypes import ( NotDefined, PonctualContribution, - TimeOverZ, TimeOverDebit, ZOverDebit + TimeOverZ, TimeOverDischarge, ZOverDischarge ) _translate = QCoreApplication.translate @@ -13,8 +13,8 @@ long_types = { "ND": _translate("BoundaryCondition", "Not defined"), "PC": _translate("BoundaryCondition", "Ponctual contribution"), "TZ": _translate("BoundaryCondition", "Time over Z"), - "TD": _translate("BoundaryCondition", "Time over Debit"), - "ZD": _translate("BoundaryCondition", "Z over Debit"), + "TD": _translate("BoundaryCondition", "Time over Discharge"), + "ZD": _translate("BoundaryCondition", "Z over Discharge"), } table_headers = { @@ -27,6 +27,6 @@ BC_types = { "ND": NotDefined, "PC": PonctualContribution, "TZ": TimeOverZ, - "TD": TimeOverDebit, - "ZD": ZOverDebit + "TD": TimeOverDischarge, + "ZD": ZOverDischarge } diff --git a/src/View/LateralContribution/Edit/translate.py b/src/View/LateralContribution/Edit/translate.py index e42270b22462cf9f49cea4b4901ae6b5bbdd41ee..e44147e2a34fe89ada02ead48ce0d726ea408a28 100644 --- a/src/View/LateralContribution/Edit/translate.py +++ b/src/View/LateralContribution/Edit/translate.py @@ -9,6 +9,6 @@ table_headers = { "y": _translate("LateralContribution", "Y"), "time": _translate("LateralContribution", "Time"), "date": _translate("LateralContribution", "Date"), - "debit": _translate("LateralContribution", "Debit (m³/s)"), + "discharge": _translate("LateralContribution", "Discharge (m³/s)"), "z": _translate("LateralContribution", "Z (m)") }