diff options
Diffstat (limited to 'silx/gui/plot3d/Plot3DWindow.py')
| -rw-r--r-- | silx/gui/plot3d/Plot3DWindow.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/silx/gui/plot3d/Plot3DWindow.py b/silx/gui/plot3d/Plot3DWindow.py index 4658d38..1bc2738 100644 --- a/silx/gui/plot3d/Plot3DWindow.py +++ b/silx/gui/plot3d/Plot3DWindow.py @@ -34,13 +34,13 @@ __date__ = "26/01/2017" from silx.gui import qt -from .Plot3DToolBar import Plot3DToolBar from .Plot3DWidget import Plot3DWidget -from .ViewpointToolBar import ViewpointToolBar +from .tools import OutputToolBar, InteractiveModeToolBar +from .tools import ViewpointToolButton class Plot3DWindow(qt.QMainWindow): - """QGLWidget with a 3D viewport and an overview.""" + """OpenGL widget with a 3D viewport and an overview.""" def __init__(self, parent=None): super(Plot3DWindow, self).__init__(parent) @@ -50,9 +50,17 @@ class Plot3DWindow(qt.QMainWindow): self._plot3D = Plot3DWidget() self.setCentralWidget(self._plot3D) - self.addToolBar( - ViewpointToolBar(parent=self, plot3D=self._plot3D)) - toolbar = Plot3DToolBar(parent=self) + + toolbar = InteractiveModeToolBar(parent=self) + toolbar.setPlot3DWidget(self._plot3D) + self.addToolBar(toolbar) + self.addActions(toolbar.actions()) + + toolbar = qt.QToolBar(self) + toolbar.addWidget(ViewpointToolButton(plot3D=self._plot3D)) + self.addToolBar(toolbar) + + toolbar = OutputToolBar(parent=self) toolbar.setPlot3DWidget(self._plot3D) self.addToolBar(toolbar) self.addActions(toolbar.actions()) |