Commit 2842bb53 authored by Pierre-Antoine Rouby's avatar Pierre-Antoine Rouby
Browse files

Results: Add toolbar to each plot.

Showing with 31 additions and 6 deletions
+31 -6
...@@ -41,6 +41,7 @@ from PyQt5.QtWidgets import ( ...@@ -41,6 +41,7 @@ from PyQt5.QtWidgets import (
) )
from View.Plot.MplCanvas import MplCanvas from View.Plot.MplCanvas import MplCanvas
from View.Plot.navigation_toolbar_2qt import PamHyrNavigationToolbar2QT
from View.Results.PlotXY import PlotXY from View.Results.PlotXY import PlotXY
from View.Results.PlotAC import PlotAC from View.Results.PlotAC import PlotAC
...@@ -127,7 +128,11 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow): ...@@ -127,7 +128,11 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow):
def setup_graph(self): def setup_graph(self):
self.canvas = MplCanvas(width=5, height=4, dpi=100) self.canvas = MplCanvas(width=5, height=4, dpi=100)
self.canvas.setObjectName("canvas") self.canvas.setObjectName("canvas")
self.toolbar = PamHyrNavigationToolbar2QT(
self.canvas, self
)
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.canvas) self.plot_layout.addWidget(self.canvas)
self.plot_xy = PlotXY( self.plot_xy = PlotXY(
...@@ -135,14 +140,18 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow): ...@@ -135,14 +140,18 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow):
results = self._results, results = self._results,
reach_id = 0, reach_id = 0,
profile_id = 0, profile_id = 0,
toolbar = None, toolbar = self.toolbar,
display_current = False display_current = False
) )
self.plot_xy.draw() self.plot_xy.draw()
self.canvas_2 = MplCanvas(width=5, height=4, dpi=100) self.canvas_2 = MplCanvas(width=5, height=4, dpi=100)
self.canvas_2.setObjectName("canvas_2") self.canvas_2.setObjectName("canvas_2")
self.toolbar_2 = PamHyrNavigationToolbar2QT(
self.canvas_2, self
)
self.plot_layout_2 = self.find(QVBoxLayout, "verticalLayout_2") self.plot_layout_2 = self.find(QVBoxLayout, "verticalLayout_2")
self.plot_layout_2.addWidget(self.toolbar_2)
self.plot_layout_2.addWidget(self.canvas_2) self.plot_layout_2.addWidget(self.canvas_2)
self.plot_kpc = PlotKPC( self.plot_kpc = PlotKPC(
...@@ -150,13 +159,17 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow): ...@@ -150,13 +159,17 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow):
results = self._results, results = self._results,
reach_id = 0, reach_id = 0,
profile_id = 0, profile_id = 0,
toolbar = None toolbar = self.toolbar_2
) )
self.plot_kpc.draw() self.plot_kpc.draw()
self.canvas_3 = MplCanvas(width=5, height=4, dpi=100) self.canvas_3 = MplCanvas(width=5, height=4, dpi=100)
self.canvas_3.setObjectName("canvas_3") self.canvas_3.setObjectName("canvas_3")
self.toolbar_3 = PamHyrNavigationToolbar2QT(
self.canvas_3, self
)
self.plot_layout_3 = self.find(QVBoxLayout, "verticalLayout_3") self.plot_layout_3 = self.find(QVBoxLayout, "verticalLayout_3")
self.plot_layout_3.addWidget(self.toolbar_3)
self.plot_layout_3.addWidget(self.canvas_3) self.plot_layout_3.addWidget(self.canvas_3)
self.plot_ac = PlotAC( self.plot_ac = PlotAC(
...@@ -164,13 +177,17 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow): ...@@ -164,13 +177,17 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow):
results = self._results, results = self._results,
reach_id = 0, reach_id = 0,
profile_id = 0, profile_id = 0,
toolbar = None toolbar = self.toolbar_3
) )
self.plot_ac.draw() self.plot_ac.draw()
self.canvas_4 = MplCanvas(width=5, height=4, dpi=100) self.canvas_4 = MplCanvas(width=5, height=4, dpi=100)
self.canvas_4.setObjectName("canvas_4") self.canvas_4.setObjectName("canvas_4")
self.toolbar_4 = PamHyrNavigationToolbar2QT(
self.canvas_4, self
)
self.plot_layout_4 = self.find(QVBoxLayout, "verticalLayout_hydrograph") self.plot_layout_4 = self.find(QVBoxLayout, "verticalLayout_hydrograph")
self.plot_layout_4.addWidget(self.toolbar_4)
self.plot_layout_4.addWidget(self.canvas_4) self.plot_layout_4.addWidget(self.canvas_4)
self.plot_h = PlotH( self.plot_h = PlotH(
...@@ -178,13 +195,17 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow): ...@@ -178,13 +195,17 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow):
results = self._results, results = self._results,
reach_id = 0, reach_id = 0,
profile_id = 0, profile_id = 0,
toolbar = None toolbar = self.toolbar_4
) )
self.plot_h.draw() self.plot_h.draw()
self.canvas_5 = MplCanvas(width=5, height=4, dpi=100) self.canvas_5 = MplCanvas(width=5, height=4, dpi=100)
self.canvas_5.setObjectName("canvas_5") self.canvas_5.setObjectName("canvas_5")
self.toolbar_5 = PamHyrNavigationToolbar2QT(
self.canvas_5, self
)
self.plot_layout_5 = self.find(QVBoxLayout, "verticalLayout_sed_reach") self.plot_layout_5 = self.find(QVBoxLayout, "verticalLayout_sed_reach")
self.plot_layout_5.addWidget(self.toolbar_5)
self.plot_layout_5.addWidget(self.canvas_5) self.plot_layout_5.addWidget(self.canvas_5)
if self._study.river.has_sediment(): if self._study.river.has_sediment():
...@@ -194,13 +215,17 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow): ...@@ -194,13 +215,17 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow):
study = self._study, study = self._study,
reach_id = 0, reach_id = 0,
profile_id = 0, profile_id = 0,
toolbar = None toolbar = self.toolbar_5
) )
self.plot_sed_reach.draw() self.plot_sed_reach.draw()
self.canvas_6 = MplCanvas(width=5, height=4, dpi=100) self.canvas_6 = MplCanvas(width=5, height=4, dpi=100)
self.canvas_6.setObjectName("canvas_6") self.canvas_6.setObjectName("canvas_6")
self.toolbar_6 = PamHyrNavigationToolbar2QT(
self.canvas_6, self
)
self.plot_layout_6 = self.find(QVBoxLayout, "verticalLayout_sed_profile") self.plot_layout_6 = self.find(QVBoxLayout, "verticalLayout_sed_profile")
self.plot_layout_6.addWidget(self.toolbar_6)
self.plot_layout_6.addWidget(self.canvas_6) self.plot_layout_6.addWidget(self.canvas_6)
if self._study.river.has_sediment(): if self._study.river.has_sediment():
...@@ -210,7 +235,7 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow): ...@@ -210,7 +235,7 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow):
study = self._study, study = self._study,
reach_id = 0, reach_id = 0,
profile_id = 0, profile_id = 0,
toolbar = None toolbar = self.toolbar_6
) )
self.plot_sed_profile.draw() self.plot_sed_profile.draw()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment