Initial work on bringing sanity to insane codebase.

[architektonas] / src / drawingview.h

diff --git a/src/drawingview.h b/src/drawingview.h
index b8f1760230700ecdb00d06c6b251c713397aa25f..5cbd53b8952411808ec7ebb9622d72251613df17 100644 (file)
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -1,10 +1,11 @@
 #ifndef __DRAWINGVIEW_H__
 #define __DRAWINGVIEW_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdint.h>
-#include "action.h"
-#include "container.h"
+//#include "action.h"
+//#include "container.h"
+#include "structs.h"
 
 class DrawingView: public QWidget
 {
@@ -14,19 +15,25 @@ class DrawingView: public QWidget
                DrawingView(QWidget * parent = NULL);
 
        public:
-               void SetRotateToolActive(bool state = true);
-               void SetAddLineToolActive(bool state = true);
-               void SetAddCircleToolActive(bool state = true);
+//             void SetToolActive(Action * action);
+               void SetGridSize(uint32_t);
                void UpdateGridBackground(void);
+               Point SnapPointToGrid(Point);
 
        public slots:
                void AddNewObjectToDocument(Object *);
+               void HandleActionUpdate(void);
+               void SetCurrentLayer(int);
 
        protected:
                void paintEvent(QPaintEvent * event);
+               void resizeEvent(QResizeEvent * event);
                void mousePressEvent(QMouseEvent * event);
                void mouseMoveEvent(QMouseEvent * event);
                void mouseReleaseEvent(QMouseEvent * event);
+               void wheelEvent(QWheelEvent * event);
+               void keyPressEvent(QKeyEvent * event);
+               void keyReleaseEvent(QKeyEvent * event);
 
        private:
                QPoint GetAdjustedMousePosition(QMouseEvent * event);
@@ -36,41 +43,23 @@ class DrawingView: public QWidget
                bool useAntialiasing;
 
        private:
-//             QBrush * backgroundBrush;
                QPixmap gridBackground;
                double scale;                                                   // Window scaling factor
                int32_t offsetX, offsetY;                               // Window offsets
        public:
                Container document;
-               double gridSpacing;
+               uint32_t gridPixels;                                    // Grid size in pixels
        private:
                bool collided;
-//Should this go into Object's class variables???
-               bool rotateTool;
-               double rx, ry;
                bool scrollDrag;
                Vector oldPoint;
-               bool addLineTool;
-               bool addCircleTool;
-               Action * toolAction;
-/*             QSize minimumSizeHint() const;
-               QSize sizeHint() const;
 
-       private:
-               void CreateCursors(void);
-               QPoint GetAdjustedMousePosition(QMouseEvent * event);
-               QPoint GetAdjustedClientPosition(int x, int y);
-
-               QImage image;
-               QPoint pt, ptOffset, ptPrevious;
-               ToolType tool;                                                  // Current tool
-               GlyphPoints pts;                                                // Glyph point structure
-               int32 ptHighlight, oldPtHighlight, ptNextHighlight, oldPtNextHighlight;
-               bool polyFirstPoint;
+       public:
+//             Action * toolAction;
 
-               ToolWindow * toolPalette;
-               QCursor cur[8];
-*/
+//     public:
+//             static Container document;
 };
 
 #endif // __DRAWINGVIEW_H__
+