diff --git a/src/Solver/AdisTS.py b/src/Solver/AdisTS.py index 1c52337382775ff0c6fda7c9a06e11ec76f2293a..be2664ae2ec02a939971948561c3042692dd8f8f 100644 --- a/src/Solver/AdisTS.py +++ b/src/Solver/AdisTS.py @@ -709,6 +709,7 @@ class AdisTSwc(AdisTS): ###print("pol keys: ", pollutants_keys) ###print("t keys: ", timestamps_keys) ###print("phys var: ", phys_data_names) + ###print("phys data names mass zero:", list(data_tmp[pollutants_keys[1]][timestamps_keys[0]].keys())) #print("set timestamps keys: ", set(timestamps_keys)) #print("isma") ###print("iprofiles: ", iprofiles) diff --git a/src/View/Results/TableAdisTS.py b/src/View/Results/TableAdisTS.py index 7899c855556555034401a7a931edc7470a405d16..4c34179d49e7c0b016b85d28282211993a58f962 100644 --- a/src/View/Results/TableAdisTS.py +++ b/src/View/Results/TableAdisTS.py @@ -64,9 +64,10 @@ class TableModel(PamhyrTableModel): self._lst = tmp_list ###print("=====table pollutants: ", self._lst) - def __init__(self, **kwargs): + def __init__(self, type_pol, **kwargs): self._timestamp = 0.0 - #####self._type_pol = type_pol + self._type_pol = type_pol + print("typ pol from raw data: ", self._type_pol) super(TableModel, self).__init__(**kwargs) def data(self, index, role=Qt.DisplayRole): @@ -110,7 +111,7 @@ class TableModel(PamhyrTableModel): if self._headers[column] == header_name: v = self._lst[row].get_ts_key(self._timestamp, "pols")[pol_index][0] return f"{v:.4f}" - elif self._headers[column] == pol + " Mass" and self._: ##### + elif self._headers[column] == pol + " Mass" and self._type_pol==7: ##### print(self._lst[row].get_ts_key(self._timestamp, "pols")[pol_index]) m1 = self._lst[row].get_ts_key(self._timestamp, "pols")[pol_index][1] m2 = self._lst[row].get_ts_key(self._timestamp, "pols")[pol_index][2] diff --git a/src/View/Results/WindowAdisTS.py b/src/View/Results/WindowAdisTS.py index aca475d1139c097238b5114d7640a0ae8b65dedb..ed55763eb6d0fdb8f654d7fec8b6dd6830f93f0d 100644 --- a/src/View/Results/WindowAdisTS.py +++ b/src/View/Results/WindowAdisTS.py @@ -138,12 +138,12 @@ class ResultsWindowAdisTS(PamhyrWindow): print("t: ", t) table = self.find(QTableView, f"tableView_{t}") self._table[t] = TableModel( + self._type_pol, table_view=table, table_headers=self._trad.get_dict(f"table_headers_{t}"), data=self._results, undo=self._undo_stack, opt_data=t, - #####type_pol= self._type_pol, ) def setup_slider(self): @@ -197,29 +197,35 @@ class ResultsWindowAdisTS(PamhyrWindow): print("///plot c adists correct") - self.canvas_3 = MplCanvas(width=5, height=4, dpi=100) - self.canvas_3.setObjectName("canvas_3") - self.toolbar_3 = PamhyrPlotToolbar( - self.canvas_3, self, items=[ - "home", "move", "zoom", "save", - "iso", "back/forward" - ] - ) - self.plot_layout_3 = self.find( - QVBoxLayout, "verticalLayout_mass") - self.plot_layout_3.addWidget(self.toolbar_3) - self.plot_layout_3.addWidget(self.canvas_3) + if self._type_pol == 7: + self.canvas_3 = MplCanvas(width=5, height=4, dpi=100) + self.canvas_3.setObjectName("canvas_3") + self.toolbar_3 = PamhyrPlotToolbar( + self.canvas_3, self, items=[ + "home", "move", "zoom", "save", + "iso", "back/forward" + ] + ) + self.plot_layout_3 = self.find( + QVBoxLayout, "verticalLayout_mass") + self.plot_layout_3.addWidget(self.toolbar_3) + self.plot_layout_3.addWidget(self.canvas_3) + + self.plot_m = PlotM( + canvas=self.canvas_3, + results=self._results, + reach_id=0, + profile_id=0, + pol_id=0, + trad=self._trad, + toolbar=self.toolbar_3 + ) + self.plot_m.draw() + else: + print("hear -------------------------------------------------------------------------------") + #self.find(QVBoxLayout, "verticalLayout_mass").setDisabled(True) - self.plot_m = PlotM( - canvas=self.canvas_3, - results=self._results, - reach_id=0, - profile_id=0, - pol_id=0, - trad=self._trad, - toolbar=self.toolbar_3 - ) - self.plot_m.draw() + self.find(QTabWidget, "tabWidget").setTabVisible(2, False) ###setTabEnabled(2, False) print("///plot m adists correct") diff --git a/src/View/ui/ResultsAdisTS.ui b/src/View/ui/ResultsAdisTS.ui index be9fa2103473c3a64d4636de8c38b253717eecbc..e4bcf65dc7bf11bd50cdc679df1d5c3d7c095a61 100644 --- a/src/View/ui/ResultsAdisTS.ui +++ b/src/View/ui/ResultsAdisTS.ui @@ -130,7 +130,7 @@ <item row="0" column="0"> <widget class="QTabWidget" name="tabWidget"> <property name="currentIndex"> - <number>2</number> + <number>1</number> </property> <widget class="QWidget" name="tab_4"> <attribute name="title">