Fix for Print Preview for centering of drawing on page.

[architektonas] / src / drawingview.h

diff --git a/src/drawingview.h b/src/drawingview.h
index 1af3a7776506a98fe1de0fbeec85a699ab90e88b..704b79d357f60b1b610a0afbf4d802ea8f271fd1 100644 (file)
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -18,13 +18,13 @@ class DrawingView: public QWidget
                DrawingView(QWidget * parent = NULL);
 
        public:
-               void SetGridSize(uint32_t);
-               void UpdateGridBackground(void);
+               void DrawBackground(Painter *);
                Point SnapPointToGrid(Point);
-               void RenderObjects(Painter *, std::vector<void *> &, int, bool ignoreLayer = false);
+               Point SnapPointToAngle(Point);
+               void RenderObjects(Painter *, VPVector &, int, bool ignoreLayer = false);
                void AddHoveredToSelection(void);
-               void GetSelection(std::vector<void *> &);
-               void GetHovered(std::vector<void *> &);
+               VPVector GetSelection(void);
+               VPVector GetHovered(void);
                void ToolHandler(int, Point);
                void ToolDraw(Painter *);
                void LineHandler(int, Point);
@@ -32,21 +32,37 @@ class DrawingView: public QWidget
                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 DeleteCurrentLayer(int);
                void HandleLayerToggle(void);
                void HandleLayerSwap(int, int);
+               void HandleLayerSwap(int, int, VPVector &);
+               void HandlePenWidth(float);
+               void HandlePenStyle(int);
+               void HandlePenColor(uint32_t);
+               void HandlePenStamp(QAction *);
+               void HandlePenDropper(QAction *);
 
        signals:
                void ObjectHovered(Object *);
+               void ObjectSelected(Object *);
+               void NeedZoomUpdate(void);
 
        protected:
+               void focusOutEvent(QFocusEvent * event);
+               void focusInEvent(QFocusEvent * event);
                void paintEvent(QPaintEvent * event);
                void resizeEvent(QResizeEvent * event);
                void mousePressEvent(QMouseEvent * event);
@@ -57,39 +73,52 @@ class DrawingView: public QWidget
                void keyReleaseEvent(QKeyEvent * event);
 
        private:
+               void DrawSubGrid(Painter *, uint32_t, double, Vector, Vector);
                QPoint GetAdjustedMousePosition(QMouseEvent * event);
                QPoint GetAdjustedClientPosition(int x, int y);
 
        public:
                bool useAntialiasing;
-//             uint32_t numSelected;
                uint32_t numHovered;
                bool shiftDown;
                bool ctrlDown;
+               bool altDown;
 
        private:
                QPixmap gridBackground;
                double scale;                                                   // Window scaling factor
                int32_t offsetX, offsetY;                               // Window offsets
+               bool supressSelected;
+               QCursor curMarker;
+               QCursor curDropper;
        public:
                Container document;
                uint32_t gridPixels;                                    // Grid size in pixels
-       private:
+               double gridPixelsF;                                             // Grid size in pixels (float)
+//     private:
+       public:
                bool collided;
                bool scrollDrag;
                Vector oldPoint;
+               Vector oldScrollPoint;
                QString informativeText;
 
        public:
-               std::vector<void *> select;
-               std::vector<void *> hover;
-               std::vector<void *> toolObjects;
+               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__