mirror of https://gitlab.com/pamhyr/pamhyr2
Results: Fix plot add data 'Q(t)'.
parent
14549330b9
commit
9b0bdd1e63
|
|
@ -146,11 +146,14 @@ class ResultsWindow(PamhyrWindow):
|
||||||
profile_id=[0])
|
profile_id=[0])
|
||||||
|
|
||||||
self.update_table_selection_solver(0)
|
self.update_table_selection_solver(0)
|
||||||
|
self.update_plot_additional_data()
|
||||||
|
|
||||||
def setup_table(self):
|
def setup_table(self):
|
||||||
self._table = {}
|
self._table = {}
|
||||||
|
|
||||||
for t in ["reach", "profile", "raw_data", "solver"]:
|
for t in ["reach", "profile", "raw_data", "solver"]:
|
||||||
table = self.find(QTableView, f"tableView_{t}")
|
table = self.find(QTableView, f"tableView_{t}")
|
||||||
|
|
||||||
self._table[t] = TableModel(
|
self._table[t] = TableModel(
|
||||||
table_view=table,
|
table_view=table,
|
||||||
table_headers=self._trad.get_dict(f"table_headers_{t}"),
|
table_headers=self._trad.get_dict(f"table_headers_{t}"),
|
||||||
|
|
@ -159,8 +162,11 @@ class ResultsWindow(PamhyrWindow):
|
||||||
opt_data=t,
|
opt_data=t,
|
||||||
parent=self
|
parent=self
|
||||||
)
|
)
|
||||||
|
|
||||||
self._table[t]._timestamp = self._timestamps[
|
self._table[t]._timestamp = self._timestamps[
|
||||||
self._slider_time.value()]
|
self._slider_time.value()
|
||||||
|
]
|
||||||
|
|
||||||
if len(self._results) <= 1:
|
if len(self._results) <= 1:
|
||||||
table = self.find(QTableView, f"tableView_solver")
|
table = self.find(QTableView, f"tableView_solver")
|
||||||
table.hide()
|
table.hide()
|
||||||
|
|
@ -191,12 +197,15 @@ class ResultsWindow(PamhyrWindow):
|
||||||
|
|
||||||
def setup_plots(self):
|
def setup_plots(self):
|
||||||
self.canvas = MplCanvas(width=5, height=4, dpi=100)
|
self.canvas = MplCanvas(width=5, height=4, dpi=100)
|
||||||
|
|
||||||
tab_widget = self.find(QTabWidget, f"tabWidget")
|
tab_widget = self.find(QTabWidget, f"tabWidget")
|
||||||
|
|
||||||
tab_widget.setTabsClosable(True)
|
tab_widget.setTabsClosable(True)
|
||||||
tab_widget.tabCloseRequested.connect(self.delete_tab)
|
tab_widget.tabCloseRequested.connect(self.delete_tab)
|
||||||
tab_widget.tabBar().setTabButton(0, QTabBar.RightSide, None)
|
tab_widget.tabBar().setTabButton(0, QTabBar.RightSide, None)
|
||||||
tab_widget.tabBar().setTabButton(1, QTabBar.RightSide, None)
|
tab_widget.tabBar().setTabButton(1, QTabBar.RightSide, None)
|
||||||
tab_widget.tabBar().setTabButton(2, QTabBar.RightSide, None)
|
tab_widget.tabBar().setTabButton(2, QTabBar.RightSide, None)
|
||||||
|
|
||||||
self.canvas.setObjectName("canvas")
|
self.canvas.setObjectName("canvas")
|
||||||
self.toolbar = PamhyrPlotToolbar(
|
self.toolbar = PamhyrPlotToolbar(
|
||||||
self.canvas, self, items=[
|
self.canvas, self, items=[
|
||||||
|
|
@ -204,6 +213,7 @@ class ResultsWindow(PamhyrWindow):
|
||||||
"iso", "back/forward"
|
"iso", "back/forward"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
self.plot_layout = self.find(QVBoxLayout, "verticalLayout")
|
self.plot_layout = self.find(QVBoxLayout, "verticalLayout")
|
||||||
self.plot_layout.addWidget(self.toolbar)
|
self.plot_layout.addWidget(self.toolbar)
|
||||||
self.plot_layout.addWidget(self.canvas)
|
self.plot_layout.addWidget(self.canvas)
|
||||||
|
|
@ -1343,7 +1353,7 @@ class ResultsWindow(PamhyrWindow):
|
||||||
self.plot_rkc.canvas.draw_idle()
|
self.plot_rkc.canvas.draw_idle()
|
||||||
self.plot_rkc.update_idle()
|
self.plot_rkc.update_idle()
|
||||||
|
|
||||||
if data['type_x'] == 'discharge' and data['type_y'] == 'time':
|
if data['type_x'] == 'time' and data['type_y'] == 'discharge':
|
||||||
line = self.canvas_4.axes.plot(
|
line = self.canvas_4.axes.plot(
|
||||||
x, y, marker="+",
|
x, y, marker="+",
|
||||||
label=legend + ' ' + unit
|
label=legend + ' ' + unit
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue