Fixed add Line tool to respect keyboard override, slight cleanup to code.

[architektonas] / src / drawingview.h

diff --git a/src/drawingview.h b/src/drawingview.h
index 7d4301e81ef74603fbdfd21ac0aedc1d7f90cf0c..9095e53fa2e63cc97d1141ec73eca65790bb5dac 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 "structs.h"
+
+class Painter;
 
 class DrawingView: public QWidget
 {
@@ -13,13 +15,33 @@ class DrawingView: public QWidget
                DrawingView(QWidget * parent = NULL);
 
        public:
-               void SetRotateToolActive(bool state = true);
+               void SetGridSize(uint32_t);
+               void UpdateGridBackground(void);
+               Point SnapPointToGrid(Point);
+               void RenderObjects(Painter *, Container *);
+               void DeleteSelectedItems(void);
+               void ClearSelection(void);
+               void AddHoveredToSelection(void);
+               void GetSelection(std::vector<void *> &);
+               void GetHovered(std::vector<void *> &);
+               void ToolMouse(int, Point);
+               void ToolDraw(Painter *);
+               void LineHandler(int, 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);
@@ -27,36 +49,31 @@ class DrawingView: public QWidget
 
        public:
                bool useAntialiasing;
+               uint32_t numSelected;
+               uint32_t numHovered;
+               bool shiftDown;
+               bool ctrlDown;
 
        private:
+               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;
-/*             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:
+               std::vector<void *> select;
+               std::vector<void *> hover;
+               Point toolPoint[32];
 
-               ToolWindow * toolPalette;
-               QCursor cur[8];
-*/
+//     public:
+//             static Container document;
 };
 
 #endif // __DRAWINGVIEW_H__
+