Fix DrawArcAction to actually allow creation of Arcs.

[architektonas] / src / drawingview.h

diff --git a/src/drawingview.h b/src/drawingview.h
index eaf8826f564e4d6ab747ed78bd61bb6044de6c8a..44420e9e08216fe2f325201d008e4e4139f21843 100644 (file)
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -15,9 +15,15 @@ class DrawingView: public QWidget
 
        public:
                void SetRotateToolActive(bool state = true);
+#if 0
                void SetAddLineToolActive(bool state = true);
                void SetAddCircleToolActive(bool state = true);
+               void SetAddArcToolActive(bool state = true);
                void SetAddDimensionToolActive(bool state = true);
+#endif
+//             void SetToolActive(Action * action, bool state = true);
+               void SetToolActive(Action * action);//, bool state = true);
+               void SetGridSize(uint32_t);
                void UpdateGridBackground(void);
 
        public slots:
@@ -25,6 +31,7 @@ class DrawingView: public QWidget
 
        protected:
                void paintEvent(QPaintEvent * event);
+               void resizeEvent(QResizeEvent * event);
                void mousePressEvent(QMouseEvent * event);
                void mouseMoveEvent(QMouseEvent * event);
                void mouseReleaseEvent(QMouseEvent * event);
@@ -32,6 +39,7 @@ class DrawingView: public QWidget
        private:
                QPoint GetAdjustedMousePosition(QMouseEvent * event);
                QPoint GetAdjustedClientPosition(int x, int y);
+               Vector SnapPointToGrid(Vector);
 
        public:
                bool useAntialiasing;
@@ -43,7 +51,9 @@ class DrawingView: public QWidget
                int32_t offsetX, offsetY;                               // Window offsets
        public:
                Container document;
-               double gridSpacing;
+               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???
@@ -54,8 +64,8 @@ class DrawingView: public QWidget
                bool addLineTool;
                bool addCircleTool;
                bool addDimensionTool;
-               bool selectionInProgress;
-               QRectF selection;
+//             bool selectionInProgress;
+//             QRectF selection;
 
        public:
                Action * toolAction;