Initial work on making Rotate tool work, plus removal of unneeded files.

[architektonas] / src / drawingview.h

diff --git a/src/drawingview.h b/src/drawingview.h
index b296f28e64c887f2a8276d5a775cd76f178fe5f6..1e050e8f1d72917c14f487d8e306dffc0d5d7fbc 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 "structs.h"
+
+class Painter;
 
 class DrawingView: public QWidget
 {
@@ -14,16 +15,27 @@ 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 SetAddArcToolActive(bool state = true);
-               void SetAddDimensionToolActive(bool state = true);
                void SetGridSize(uint32_t);
                void UpdateGridBackground(void);
+               Point SnapPointToGrid(Point);
+               void RenderObjects(Painter *, std::vector<void *> &);
+               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);
+               void RotateHandler(int, Point);
+               void CheckObjectBounds(void);
+               bool HitTestObjects(Point);
+               void HandleObjectMovement(Point);
 
        public slots:
                void AddNewObjectToDocument(Object *);
+               void HandleActionUpdate(void);
+               void SetCurrentLayer(int);
 
        protected:
                void paintEvent(QPaintEvent * event);
@@ -31,40 +43,43 @@ class DrawingView: public QWidget
                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);
-               Vector SnapPointToGrid(Vector);
 
        public:
                bool useAntialiasing;
+               uint32_t numSelected;
+               uint32_t numHovered;
+               bool shiftDown;
+               bool ctrlDown;
+               bool overrideColor;
 
        private:
-//             QBrush * backgroundBrush;
                QPixmap gridBackground;
                double scale;                                                   // Window scaling factor
                int32_t offsetX, offsetY;                               // Window offsets
        public:
                Container document;
-               double gridSpacing;                                             // Grid spacing in base units
                uint32_t gridPixels;                                    // Grid size in pixels
-//             double gridBaseUnits;                                   // Grid size in base units
        private:
                bool collided;
-//Should this go into Object's class variables???
-               bool rotateTool;
-               double rx, ry;
                bool scrollDrag;
                Vector oldPoint;
-               bool addLineTool;
-               bool addCircleTool;
-               bool addDimensionTool;
-//             bool selectionInProgress;
-//             QRectF selection;
 
        public:
-               Action * toolAction;
+               std::vector<void *> select;
+               std::vector<void *> hover;
+               std::vector<void *> toolObjects;
+               Point toolPoint[32];
+
+//     public:
+//             static Container document;
 };
 
 #endif // __DRAWINGVIEW_H__
+