1.1 --- a/src/ui.h	Sat Apr 14 01:13:43 2012 +0300
     1.2 +++ b/src/ui.h	Sat Apr 14 04:59:14 2012 +0300
     1.3 @@ -3,15 +3,16 @@
     1.4  
     1.5  #include <QMainWindow>
     1.6  #include <QDockWidget>
     1.7 -#include <QGLWidget>
     1.8  #include "volray.h"
     1.9  
    1.10 -class GLView;
    1.11  class SideWindow;
    1.12  
    1.13 +// This is the main application window (duh)
    1.14  class MainWindow : public QMainWindow {
    1.15 +private:
    1.16  	Q_OBJECT
    1.17 -private:
    1.18 +
    1.19 +	MainGLView *maingl;
    1.20  	SideWindow *sidewin;
    1.21  
    1.22  private slots:
    1.23 @@ -21,8 +22,15 @@
    1.24  	MainWindow();
    1.25  };
    1.26  
    1.27 +/* This is the detachable window with the volume slice view
    1.28 + * transfer function, etc
    1.29 + */
    1.30  class SideWindow : public QDockWidget {
    1.31 +private:
    1.32  	Q_OBJECT
    1.33 +
    1.34 +	SliceGLView *slice_view;
    1.35 +
    1.36  private slots:
    1.37  	void zslider_change(int val);
    1.38  	void clip_change(int checked);
    1.39 @@ -31,25 +39,7 @@
    1.40  	SideWindow();
    1.41  };
    1.42  
    1.43 -class GLView : public QGLWidget {
    1.44 -	Q_OBJECT
    1.45 -
    1.46 -protected:
    1.47 -	void initializeGL();
    1.48 -	void resizeGL(int xsz, int ysz);
    1.49 -	void paintGL();
    1.50 -
    1.51 -	void mousePressEvent(QMouseEvent *ev);
    1.52 -	void mouseReleaseEvent(QMouseEvent *ev);
    1.53 -	void mouseMoveEvent(QMouseEvent *ev);
    1.54 -
    1.55 -public:
    1.56 -	GLView(QWidget *parent = 0);
    1.57 -
    1.58 -	QSize minimumSizeHint() const;
    1.59 -	QSize sizeHint() const;
    1.60 -};
    1.61 -
    1.62 +// call to force a redisplay on all GL views
    1.63  void post_redisplay();
    1.64  
    1.65