Fix scrollwheel zooming from walking all over the screen.

[architektonas] / src / drawingview.h

diff --git a/src/drawingview.h b/src/drawingview.h
index bd3e07e43307fe4d1256fa4898d70a683a243390..d252ffcf3515e5273c74c48e6cdb33554daf2a26 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,21 +18,54 @@ class DrawingView: public QWidget
                DrawingView(QWidget * parent = NULL);
 
        public:
-//             void SetRotateToolActive(bool state = true);
-               void SetToolActive(Action * action);
                void SetGridSize(uint32_t);
                void UpdateGridBackground(void);
+               Point SnapPointToGrid(Point);
+               Point SnapPointToAngle(Point);
+               void RenderObjects(Painter *, VPVector &, int, bool ignoreLayer = false);
+               void AddHoveredToSelection(void);
+               VPVector GetSelection(void);
+               VPVector GetHovered(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);
+               void DimensionHandler(int, Point);
+               void TriangulateHandler(int, Point);
+               void TrimHandler(int, Point);
+               void ParallelHandler(int, Point);
+               Rect GetObjectExtents(Object *);
+               void CheckObjectBounds(void);
+               bool HitTestObjects(Point);
+               bool HitTest(Object *, Point);
+               bool HandleObjectClicked(void);
+               void HandleObjectMovement(Point);
+               void AddDimensionTo(void * obj);
 
        public slots:
-               void AddNewObjectToDocument(Object *);
-               void SetCurrentLayer(int);
+               void DeleteCurrentLayer(int);
+               void HandleLayerToggle(void);
+               void HandleLayerSwap(int, int);
+               void HandlePenWidth(float);
+               void HandlePenStyle(int);
+               void HandlePenColor(uint32_t);
+               void HandlePenStamp(void);
+
+       signals:
+               void ObjectHovered(Object *);
+               void ObjectSelected(Object *);
 
        protected:
+               void focusOutEvent(QFocusEvent * event);
                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);
 
@@ -38,6 +75,10 @@ class DrawingView: public QWidget
 
        public:
                bool useAntialiasing;
+               uint32_t numHovered;
+               bool shiftDown;
+               bool ctrlDown;
+               bool altDown;
 
        private:
                QPixmap gridBackground;
@@ -48,18 +89,28 @@ class DrawingView: public QWidget
                uint32_t gridPixels;                                    // Grid size in pixels
        private:
                bool collided;
-//Should this go into Object's class variables???
-//maybe, maybe not... :-P
-//             bool rotateTool;
-//             double rx, ry;
                bool scrollDrag;
                Vector oldPoint;
-//             bool addLineTool;
-//             bool addCircleTool;
-//             bool addDimensionTool;
+               Vector oldScrollPoint;
+               QString informativeText;
 
        public:
-               Action * toolAction;
+               VPVector select;
+               VPVector toolObjects;
+               std::vector<Object> toolScratch;
+               VPVector toolScratch2;
+               Point toolPoint[32];
+               Object * toolObj[32];
+               Point intersectionPoint;
+               Point hoverPoint;
+               bool hoverPointValid;
+               bool hoveringIntersection;
+               Object * dragged;
+               bool draggingObject;
+               bool angleSnap;
+               bool dirty;
+               bool scrollWheelSeen;
 };
 
 #endif // __DRAWINGVIEW_H__
+