# HG changeset patch # User John Tsiombikas # Date 1334028934 -10800 # Node ID 88312413467c1fa82cd877b304cb31511b28faf9 # Parent 17d9dc2edc91098bd9820169671e93c655361a79 adding a sidewidget diff -r 17d9dc2edc91 -r 88312413467c src/ui.cc --- a/src/ui.cc Tue Apr 10 06:11:16 2012 +0300 +++ b/src/ui.cc Tue Apr 10 06:35:34 2012 +0300 @@ -14,6 +14,12 @@ glview = new GLView; setCentralWidget(glview); + // side-window + sidewin = new SideWindow; + sidewin->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); + sidewin->setFeatures(QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable); + addDockWidget(Qt::LeftDockWidgetArea, sidewin); + // actions QAction *act_open = new QAction(qApp->style()->standardIcon(QStyle::SP_DialogOpenButton), "&Open...", this); act_open->setStatusTip("Open a volume dataset"); @@ -53,6 +59,12 @@ } } + +SideWindow::SideWindow() +{ +} + + void post_redisplay() { glview->updateGL(); @@ -79,7 +91,6 @@ if(!volray_init()) { exit(0); } - glClearColor(1, 0, 0, 1); } void GLView::resizeGL(int xsz, int ysz) diff -r 17d9dc2edc91 -r 88312413467c src/ui.h --- a/src/ui.h Tue Apr 10 06:11:16 2012 +0300 +++ b/src/ui.h Tue Apr 10 06:35:34 2012 +0300 @@ -2,13 +2,18 @@ #define UI_H_ #include +#include #include #include "volray.h" class GLView; +class SideWindow; class MainWindow : public QMainWindow { Q_OBJECT +private: + SideWindow *sidewin; + private slots: void open_volume(); @@ -16,6 +21,12 @@ MainWindow(); }; +class SideWindow : public QDockWidget { + Q_OBJECT +public: + SideWindow(); +}; + class GLView : public QGLWidget { Q_OBJECT