diff --git a/src/Model/Results/ResultsAdisTS.py b/src/Model/Results/ResultsAdisTS.py index adf27310211d3fd94d0a8d3f78ea36d154d97dec..cd7d09f9c78f34581b236d2b1645eba813e440de 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 31821911369f8d45facdbfd2a2c16290e6637333..6b77d3587ddaa53a88ae1935f0530c6928c7d574 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 2de25ae24be0845db9e01ae4b9be32dca6000d6c..540d554f634fac7191fc4ac4ecb56134bd424790 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 12264c621945bc6ca0fa27c3c054c2eb9aa86925..b1e02ff1ce96393215ae269b25fe975dfae4cd38 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 6d08656a95c6bd53acfa4983dcbada3b9eb52e0e..a18a99827cea337f5991258545d67a73abfd39c1 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">