mirror of https://gitlab.com/pamhyr/pamhyr2
var phys
parent
1a31c9122e
commit
673ae3908c
|
|
@ -44,6 +44,8 @@ class Results(object):
|
||||||
repertory_results = os.path.join(repertory, "resultats")
|
repertory_results = os.path.join(repertory, "resultats")
|
||||||
self._pollutants_list = [el.split("/")[-1][0:-4] for el in glob.glob(repertory_results + "/*.bin")]
|
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)
|
print("*********files names resultats from Results Object: ", self._pollutants_list)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
|
@ -63,6 +65,10 @@ class Results(object):
|
||||||
def pollutants_list(self):
|
def pollutants_list(self):
|
||||||
return self._pollutants_list
|
return self._pollutants_list
|
||||||
|
|
||||||
|
@property
|
||||||
|
def phys_var_list(self):
|
||||||
|
return self._phys_var_list
|
||||||
|
|
||||||
def set(self, key, value):
|
def set(self, key, value):
|
||||||
self._meta_data[key] = value
|
self._meta_data[key] = value
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -63,6 +63,9 @@ class TableModel(PamhyrTableModel):
|
||||||
tmp_list.insert(len(tmp_list), "total_sediment")
|
tmp_list.insert(len(tmp_list), "total_sediment")
|
||||||
self._lst = tmp_list
|
self._lst = tmp_list
|
||||||
print("=====table pollutants: ", self._lst)
|
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):
|
def __init__(self, **kwargs):
|
||||||
self._timestamp = 0.0
|
self._timestamp = 0.0
|
||||||
|
|
@ -83,6 +86,10 @@ class TableModel(PamhyrTableModel):
|
||||||
if self._headers[column] == "name":
|
if self._headers[column] == "name":
|
||||||
v = self._lst[row]
|
v = self._lst[row]
|
||||||
return str(v)
|
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":
|
elif self._opt_data == "profile":
|
||||||
if self._headers[column] == "name":
|
if self._headers[column] == "name":
|
||||||
v = self._lst[row].name
|
v = self._lst[row].name
|
||||||
|
|
|
||||||
|
|
@ -126,7 +126,7 @@ class ResultsWindowAdisTS(PamhyrWindow):
|
||||||
print("results study river: ", self._results.study.river)
|
print("results study river: ", self._results.study.river)
|
||||||
print("*********files names resultats from Results Window: ", self._results.pollutants_list)
|
print("*********files names resultats from Results Window: ", self._results.pollutants_list)
|
||||||
self._table = {}
|
self._table = {}
|
||||||
for t in ["reach", "profile", "pollutants"]:#, "raw_data"]:
|
for t in ["reach", "profile", "pollutants", "phys_var"]:#, "raw_data"]:
|
||||||
print("t: ", t)
|
print("t: ", t)
|
||||||
table = self.find(QTableView, f"tableView_{t}")
|
table = self.find(QTableView, f"tableView_{t}")
|
||||||
self._table[t] = TableModel(
|
self._table[t] = TableModel(
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,10 @@ class ResultsTranslate(MainTranslate):
|
||||||
"name": _translate("Results", "Pollutant name"),
|
"name": _translate("Results", "Pollutant name"),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
self._sub_dict["table_headers_phys_var"] = {
|
||||||
|
"name": _translate("Results", "Variables names"),
|
||||||
|
}
|
||||||
|
|
||||||
self._sub_dict["table_headers_profile"] = {
|
self._sub_dict["table_headers_profile"] = {
|
||||||
"name": self._dict["name"],
|
"name": self._dict["name"],
|
||||||
"kp": self._dict["unit_kp"],
|
"kp": self._dict["unit_kp"],
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout_3">
|
<layout class="QGridLayout" name="gridLayout_3">
|
||||||
<item row="0" column="0">
|
<item row="0" column="1">
|
||||||
<widget class="QSplitter" name="splitter_4">
|
<widget class="QSplitter" name="splitter_4">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
|
|
@ -54,7 +54,16 @@
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</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>
|
||||||
<widget class="QWidget" name="layoutWidget">
|
<widget class="QWidget" name="layoutWidget">
|
||||||
<layout class="QGridLayout" name="gridLayout_2">
|
<layout class="QGridLayout" name="gridLayout_2">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue