Added ability to create Circles.

[architektonas] / src / drawingview.h

diff --git a/src/drawingview.h b/src/drawingview.h
index 1e050e8f1d72917c14f487d8e306dffc0d5d7fbc..c8e46ff627fe6fb70be0d860bbca4efa2c910ce8 100644 (file)
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -5,6 +5,8 @@
 #include <stdint.h>
 #include "structs.h"
 
+enum { ToolMouseDown, ToolMouseMove, ToolMouseUp, ToolKeyDown, ToolKeyUp, ToolCleanup };
+
 class Painter;
 
 class DrawingView: public QWidget
@@ -19,22 +21,19 @@ class DrawingView: public QWidget
                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 ToolHandler(int, Point);
                void ToolDraw(Painter *);
                void LineHandler(int, Point);
+               void CircleHandler(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:
@@ -57,7 +56,6 @@ class DrawingView: public QWidget
                uint32_t numHovered;
                bool shiftDown;
                bool ctrlDown;
-               bool overrideColor;
 
        private:
                QPixmap gridBackground;
@@ -70,11 +68,13 @@ class DrawingView: public QWidget
                bool collided;
                bool scrollDrag;
                Vector oldPoint;
+               QString informativeText;
 
        public:
                std::vector<void *> select;
                std::vector<void *> hover;
                std::vector<void *> toolObjects;
+               std::vector<Object> toolScratch;
                Point toolPoint[32];
 
 //     public: