Initial work on bringing sanity to insane codebase.

[architektonas] / src / drawingview.h

diff --git a/src/drawingview.h b/src/drawingview.h
index c7f7c3a3832d0e7aed65c568d0967cccb830996a..5cbd53b8952411808ec7ebb9622d72251613df17 100644 (file)
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -1,9 +1,11 @@
 #ifndef __DRAWINGVIEW_H__
 #define __DRAWINGVIEW_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdint.h>
-#include "container.h"
+//#include "action.h"
+//#include "container.h"
+#include "structs.h"
 
 class DrawingView: public QWidget
 {
@@ -12,40 +14,52 @@ class DrawingView: public QWidget
        public:
                DrawingView(QWidget * parent = NULL);
 
+       public:
+//             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);
                QPoint GetAdjustedClientPosition(int x, int y);
 
+       public:
+               bool useAntialiasing;
+
        private:
+               QPixmap gridBackground;
                double scale;                                                   // Window scaling factor
                int32_t offsetX, offsetY;                               // Window offsets
+       public:
                Container document;
-               double gridSpacing;
-               bool collided;
-/*             QSize minimumSizeHint() const;
-               QSize sizeHint() const;
-
+               uint32_t gridPixels;                                    // Grid size in pixels
        private:
-               void CreateCursors(void);
-               QPoint GetAdjustedMousePosition(QMouseEvent * event);
-               QPoint GetAdjustedClientPosition(int x, int y);
+               bool collided;
+               bool scrollDrag;
+               Vector oldPoint;
 
-               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__
+