Add pen toolbar widget.

[architektonas] / src / drawingview.h

diff --git a/src/drawingview.h b/src/drawingview.h
index 98b34b5681fab05569975ca3754ffd86777cb421..29a47a7083e7c2f801d5deda81e6c1f3d543fd03 100644 (file)
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -1,10 +1,14 @@
 #ifndef __DRAWINGVIEW_H__
 #define __DRAWINGVIEW_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdint.h>
-#include "action.h"
-#include "container.h"
+#include "rect.h"
+#include "structs.h"
+
+enum { ToolMouseDown, ToolMouseMove, ToolMouseUp, ToolKeyDown, ToolKeyUp, ToolCleanup };
+
+class Painter;
 
 class DrawingView: public QWidget
 {
@@ -14,19 +18,49 @@ 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 SetGridSize(uint32_t);
                void UpdateGridBackground(void);
+               Point SnapPointToGrid(Point);
+               Point SnapPointToAngle(Point);
+               void RenderObjects(Painter *, std::vector<void *> &, int, bool ignoreLayer = false);
+               void AddHoveredToSelection(void);
+               void GetSelection(std::vector<void *> &);
+               void GetHovered(std::vector<void *> &);
+               void ToolHandler(int, Point);
+               void ToolDraw(Painter *);
+               void LineHandler(int, Point);
+               void CircleHandler(int, Point);
+               void ArcHandler(int, Point);
+               void RotateHandler(int, Point);
+               void MirrorHandler(int, Point);
+               Rect GetObjectExtents(Object *);
+               void CheckObjectBounds(void);
+               bool HitTestObjects(Point);
+               bool HitTest(Object *, Point);
+               bool HandleObjectClicked(void);
+               void HandleObjectMovement(Point);
 
        public slots:
-               void AddNewObjectToDocument(Object *);
+               void DeleteCurrentLayer(int);
+               void HandleLayerToggle(void);
+               void HandleLayerSwap(int, int);
+               void HandlePenWidth(float);
+               void HandlePenStyle(int);
+               void HandlePenColor(uint32_t);
+
+       signals:
+               void ObjectHovered(Object *);
+               void ObjectSelected(Object *);
 
        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);
@@ -34,41 +68,38 @@ class DrawingView: public QWidget
 
        public:
                bool useAntialiasing;
+//             uint32_t numSelected;
+               uint32_t numHovered;
+               bool shiftDown;
+               bool ctrlDown;
 
        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);
+               QString informativeText;
 
-               QImage image;
-               QPoint pt, ptOffset, ptPrevious;
-               ToolType tool;                                                  // Current tool
-               GlyphPoints pts;                                                // Glyph point structure
-               int32 ptHighlight, oldPtHighlight, ptNextHighlight, oldPtNextHighlight;
-               bool polyFirstPoint;
-
-               ToolWindow * toolPalette;
-               QCursor cur[8];
-*/
+       public:
+               std::vector<void *> select;
+               std::vector<void *> hover;
+               std::vector<void *> toolObjects;
+               std::vector<Object> toolScratch;
+               Point toolPoint[32];
+               Point intersectionPoint;
+               Point hoverPoint;
+               bool hoverPointValid;
+               bool hoveringIntersection;
+               Object * dragged;
+               bool draggingObject;
+               bool angleSnap;
 };
 
 #endif // __DRAWINGVIEW_H__
+