diff --git a/src/Model/LateralContribution/LateralContributionList.py b/src/Model/LateralContribution/LateralContributionList.py index b0fbf7ef12d20e60dd619db83a28a1a5dee0f2cc..c8957d9c54b83f00a81e929341f4c13a44f57dd0 100644 --- a/src/Model/LateralContribution/LateralContributionList.py +++ b/src/Model/LateralContribution/LateralContributionList.py @@ -6,9 +6,7 @@ from tools import trace, timer from Model.Except import NotImplementedMethodeError from Model.LateralContribution.LateralContributionTypes import ( - NotDefined, - PonctualContribution, - TimeOverZ, TimeOverDebit, ZOverDebit + NotDefined, LateralContrib, Rain, Evaporation, ) class LateralContributionList(object): diff --git a/src/Model/LateralContribution/LateralContributionTypes.py b/src/Model/LateralContribution/LateralContributionTypes.py index efecc8ada1bccdb883e3403cd621c542f88ee5b6..6ff07c3f114aa8ebabc842f1cdc0e06fa3aa788c 100644 --- a/src/Model/LateralContribution/LateralContributionTypes.py +++ b/src/Model/LateralContribution/LateralContributionTypes.py @@ -16,54 +16,38 @@ class NotDefined(LateralContribution): def _default_0(self): return 0.0 -class PonctualContribution(LateralContribution): +class LateralContrib(LateralContribution): def __init__(self, name:str = ""): - super(PonctualContribution, self).__init__(name=name) + super(LateralContrib, self).__init__(name=name) - self._type = "PC" + self._type = "LC" self._header = ["time", "debit"] - self._types = [PonctualContribution.time_convert, float] + self._types = [LateralContrib.time_convert, float] @classmethod def compatibility(cls): return ["liquid"] -class TimeOverZ(LateralContribution): +class Rain(LateralContribution): def __init__(self, name:str = ""): - super(TimeOverZ, self).__init__(name=name) + super(Rain, self).__init__(name=name) - self._type = "TZ" - self._header = ["time", "z"] - self._types = [TimeOverZ.time_convert, float] - - @classmethod - def compatibility(cls): - return ["liquid"] - -class TimeOverDebit(LateralContribution): - def __init__(self, name:str = ""): - super(TimeOverDebit, self).__init__(name=name) - - self._type = "TD" + self._type = "RA" self._header = ["time", "debit"] - self._types = [TimeOverDebit.time_convert, float] + self._types = [Rain.time_convert, float] @classmethod def compatibility(cls): return ["liquid"] -class ZOverDebit(LateralContribution): +class Evaporation(LateralContribution): def __init__(self, name:str = ""): - super(ZOverDebit, self).__init__(name=name) + super(Evaporation, self).__init__(name=name) - self._type = "ZD" - self._header = ["z", "debit"] - self._types = [float, float] + self._type = "EV" + self._header = ["time", "debit"] + self._types = [Evaporation.time_convert, float] @classmethod def compatibility(cls): return ["liquid"] - - @property - def _default_0(self): - return 0.0 diff --git a/src/View/LateralContribution/Edit/Table.py b/src/View/LateralContribution/Edit/Table.py index 8016d050ab0cbbcea391f46b8e18d7db7f47ade7..e3e74483e3531c2b262fea08be83af0a4294949d 100644 --- a/src/View/LateralContribution/Edit/Table.py +++ b/src/View/LateralContribution/Edit/Table.py @@ -19,8 +19,7 @@ from PyQt5.QtWidgets import ( ) from Model.LateralContribution.LateralContributionTypes import ( - NotDefined, PonctualContribution, - TimeOverZ, TimeOverDebit, ZOverDebit + NotDefined, LateralContrib, Rain, Evaporation, ) from View.LateralContribution.Edit.UndoCommand import ( diff --git a/src/View/LateralContribution/Table.py b/src/View/LateralContribution/Table.py index 9577ff1a69ded0dc557699004b3d4fe5a2821ffa..24c2022f72bb1e2279bd5ea98f71d75d48c16740 100644 --- a/src/View/LateralContribution/Table.py +++ b/src/View/LateralContribution/Table.py @@ -22,8 +22,7 @@ from View.LateralContribution.UndoCommand import ( ) from Model.LateralContribution.LateralContributionTypes import ( - NotDefined, PonctualContribution, - TimeOverZ, TimeOverDebit, ZOverDebit + NotDefined, LateralContrib, Rain, Evaporation, ) from View.LateralContribution.translate import * diff --git a/src/View/LateralContribution/Window.py b/src/View/LateralContribution/Window.py index 36f58b27a41bdecfb191eaa5f01ad1a3a2841772..0597eb0868db045bf701792abdd0a8dc2d9208bb 100644 --- a/src/View/LateralContribution/Window.py +++ b/src/View/LateralContribution/Window.py @@ -29,8 +29,7 @@ from View.LateralContribution.UndoCommand import ( ) from Model.LateralContribution.LateralContributionTypes import ( - NotDefined, PonctualContribution, - TimeOverZ, TimeOverDebit, ZOverDebit + NotDefined, LateralContrib, Rain, Evaporation, ) from View.LateralContribution.Table import ( diff --git a/src/View/LateralContribution/translate.py b/src/View/LateralContribution/translate.py index 82b875c52d19b455128c4df7c3ac2a5a3600f00d..88577bc13fcdfd8038d4eec3f69e29681f4d9729 100644 --- a/src/View/LateralContribution/translate.py +++ b/src/View/LateralContribution/translate.py @@ -3,18 +3,16 @@ from PyQt5.QtCore import QCoreApplication from Model.LateralContribution.LateralContributionTypes import ( - NotDefined, PonctualContribution, - TimeOverZ, TimeOverDebit, ZOverDebit + NotDefined, LateralContrib, Rain, Evaporation, ) _translate = QCoreApplication.translate long_types = { "ND": _translate("LateralContribution", "Not defined"), - "PC": _translate("LateralContribution", "Ponctual contribution"), - "TZ": _translate("LateralContribution", "Time over Z"), - "TD": _translate("LateralContribution", "Time over Debit"), - "ZD": _translate("LateralContribution", "Z over Debit"), + "LC": _translate("LateralContribution", "Lateral contribution"), + "RA": _translate("LateralContribution", "Rain"), + "EV": _translate("LateralContribution", "Evaporation"), } table_headers = { @@ -25,8 +23,7 @@ table_headers = { LC_types = { "ND": NotDefined, - "PC": PonctualContribution, - "TZ": TimeOverZ, - "TD": TimeOverDebit, - "ZD": ZOverDebit + "LC": LateralContrib, + "RA": Rain, + "EV": Evaporation, }