From 673ae3908c60cd8af3065dfcb1ee9126f0717611 Mon Sep 17 00:00:00 2001
From: Youcef AOUAD <youcef.aouad@inrae.fr>
Date: Mon, 9 Sep 2024 11:44:17 +0200
Subject: [PATCH] var phys
---
src/Model/Results/ResultsAdisTS.py | 6 ++++++
src/View/Results/TableAdisTS.py | 7 +++++++
src/View/Results/WindowAdisTS.py | 2 +-
src/View/Results/translate.py | 4 ++++
src/View/ui/ResultsAdisTS.ui | 13 +++++++++++--
5 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/Model/Results/ResultsAdisTS.py b/src/Model/Results/ResultsAdisTS.py
index adf27310..cd7d09f9 100644
--- a/src/Model/Results/ResultsAdisTS.py
+++ b/src/Model/Results/ResultsAdisTS.py
@@ -44,6 +44,8 @@ class Results(object):
repertory_results = os.path.join(repertory, "resultats")
self._pollutants_list = [el.split("/")[-1][0:-4] for el in glob.glob(repertory_results + "/*.bin")]
+ self._phys_var_list = ["C", "G", "M", "D", "L", "N", "R"]
+
print("*********files names resultats from Results Object: ", self._pollutants_list)
@property
@@ -63,6 +65,10 @@ class Results(object):
def pollutants_list(self):
return self._pollutants_list
+ @property
+ def phys_var_list(self):
+ return self._phys_var_list
+
def set(self, key, value):
self._meta_data[key] = value
diff --git a/src/View/Results/TableAdisTS.py b/src/View/Results/TableAdisTS.py
index 31821911..6b77d358 100644
--- a/src/View/Results/TableAdisTS.py
+++ b/src/View/Results/TableAdisTS.py
@@ -63,6 +63,9 @@ class TableModel(PamhyrTableModel):
tmp_list.insert(len(tmp_list), "total_sediment")
self._lst = tmp_list
print("=====table pollutants: ", self._lst)
+ elif self._opt_data == "phys_var":
+ self._lst = self._data.phys_var_list
+ #print("=====table pollutants: ", self._lst)
def __init__(self, **kwargs):
self._timestamp = 0.0
@@ -83,6 +86,10 @@ class TableModel(PamhyrTableModel):
if self._headers[column] == "name":
v = self._lst[row]
return str(v)
+ elif self._opt_data == "phys_var":
+ if self._headers[column] == "name":
+ v = self._lst[row]
+ return str(v)
elif self._opt_data == "profile":
if self._headers[column] == "name":
v = self._lst[row].name
diff --git a/src/View/Results/WindowAdisTS.py b/src/View/Results/WindowAdisTS.py
index 2de25ae2..540d554f 100644
--- a/src/View/Results/WindowAdisTS.py
+++ b/src/View/Results/WindowAdisTS.py
@@ -126,7 +126,7 @@ class ResultsWindowAdisTS(PamhyrWindow):
print("results study river: ", self._results.study.river)
print("*********files names resultats from Results Window: ", self._results.pollutants_list)
self._table = {}
- for t in ["reach", "profile", "pollutants"]:#, "raw_data"]:
+ for t in ["reach", "profile", "pollutants", "phys_var"]:#, "raw_data"]:
print("t: ", t)
table = self.find(QTableView, f"tableView_{t}")
self._table[t] = TableModel(
diff --git a/src/View/Results/translate.py b/src/View/Results/translate.py
index 12264c62..b1e02ff1 100644
--- a/src/View/Results/translate.py
+++ b/src/View/Results/translate.py
@@ -48,6 +48,10 @@ class ResultsTranslate(MainTranslate):
"name": _translate("Results", "Pollutant name"),
}
+ self._sub_dict["table_headers_phys_var"] = {
+ "name": _translate("Results", "Variables names"),
+ }
+
self._sub_dict["table_headers_profile"] = {
"name": self._dict["name"],
"kp": self._dict["unit_kp"],
diff --git a/src/View/ui/ResultsAdisTS.ui b/src/View/ui/ResultsAdisTS.ui
index 6d08656a..a18a9982 100644
--- a/src/View/ui/ResultsAdisTS.ui
+++ b/src/View/ui/ResultsAdisTS.ui
@@ -24,7 +24,7 @@
</size>
</property>
<layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
+ <item row="0" column="1">
<widget class="QSplitter" name="splitter_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -54,7 +54,16 @@
</item>
</layout>
</widget>
- <widget class="QTableView" name="tableView_pollutants"/>
+ <widget class="QWidget" name="horizontalLayoutWidget">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QTableView" name="tableView_pollutants"/>
+ </item>
+ <item>
+ <widget class="QTableView" name="tableView_phys_var"/>
+ </item>
+ </layout>
+ </widget>
</widget>
<widget class="QWidget" name="layoutWidget">
<layout class="QGridLayout" name="gridLayout_2">
--
GitLab