Various fixes to Container/Group handling, added DrawArcAction.

[architektonas] / src / drawingview.h

diff --git a/src/drawingview.h b/src/drawingview.h
index ac7170d026bd63c44a65a23caa4a4c83005a4a94..b296f28e64c887f2a8276d5a775cd76f178fe5f6 100644 (file)
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -17,7 +17,9 @@ class DrawingView: public QWidget
                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);
 
        public slots:
@@ -25,6 +27,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 +35,7 @@ class DrawingView: public QWidget
        private:
                QPoint GetAdjustedMousePosition(QMouseEvent * event);
                QPoint GetAdjustedClientPosition(int x, int y);
+               Vector SnapPointToGrid(Vector);
 
        public:
                bool useAntialiasing;
@@ -43,7 +47,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,6 +60,8 @@ class DrawingView: public QWidget
                bool addLineTool;
                bool addCircleTool;
                bool addDimensionTool;
+//             bool selectionInProgress;
+//             QRectF selection;
 
        public:
                Action * toolAction;