From b786bb44e2373ebda1d0d3a262d62e9fea6f11c8 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Fri, 12 May 2023 16:54:34 +0200
Subject: [PATCH] LC: Add specific Lateral contribution types.
---
.../LateralContributionList.py | 4 +-
.../LateralContributionTypes.py | 42 ++++++-------------
src/View/LateralContribution/Edit/Table.py | 3 +-
src/View/LateralContribution/Table.py | 3 +-
src/View/LateralContribution/Window.py | 3 +-
src/View/LateralContribution/translate.py | 17 ++++----
6 files changed, 24 insertions(+), 48 deletions(-)
diff --git a/src/Model/LateralContribution/LateralContributionList.py b/src/Model/LateralContribution/LateralContributionList.py
index b0fbf7ef..c8957d9c 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 efecc8ad..6ff07c3f 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 8016d050..e3e74483 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 9577ff1a..24c2022f 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 36f58b27..0597eb08 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 82b875c5..88577bc1 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,
}
--
GitLab