Added base units & display style to drawing.

[architektonas] / src / drawingview.h

diff --git a/src/drawingview.h b/src/drawingview.h
index 704b79d357f60b1b610a0afbf4d802ea8f271fd1..0d483926f049e62787b45bce2c7fa6a8a1a164c0 100644 (file)
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -22,9 +22,10 @@ class DrawingView: public QWidget
                Point SnapPointToGrid(Point);
                Point SnapPointToAngle(Point);
                void RenderObjects(Painter *, VPVector &, int, bool ignoreLayer = false);
-               void AddHoveredToSelection(void);
+               void HandleSelectionClick(VPVector &);
                VPVector GetSelection(void);
-               VPVector GetHovered(void);
+               VPVector GetHovered(bool exclude = false);
+               void MoveSelectedToLayer(int);
                void ToolHandler(int, Point);
                void ToolDraw(Painter *);
                void LineHandler(int, Point);
@@ -33,6 +34,7 @@ class DrawingView: public QWidget
                void RotateHandler(int, Point);
                void MirrorHandler(int, Point);
                void DimensionHandler(int, Point);
+               void DeleteHandler(int, Point);
                void TriangulateHandler(int, Point);
                void TrimHandler(int, Point);
                void ParallelHandler(int, Point);
@@ -49,9 +51,6 @@ class DrawingView: public QWidget
                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 *);
 
@@ -86,17 +85,16 @@ class DrawingView: public QWidget
 
        private:
                QPixmap gridBackground;
-               double scale;                                                   // Window scaling factor
-               int32_t offsetX, offsetY;                               // Window offsets
+               double scale;                                           // Window scaling factor
+               int32_t offsetX, offsetY;                       // Window offsets
                bool supressSelected;
                QCursor curMarker;
                QCursor curDropper;
+               uint32_t currentSelect;
        public:
                Container document;
-               uint32_t gridPixels;                                    // Grid size in pixels
-               double gridPixelsF;                                             // Grid size in pixels (float)
-//     private:
-       public:
+               uint32_t gridPixels;                            // Grid size in pixels
+               double gridPixelsF;                                     // Grid size in pixels (float)
                bool collided;
                bool scrollDrag;
                Vector oldPoint;
@@ -108,8 +106,10 @@ class DrawingView: public QWidget
                VPVector toolObjects;
                std::vector<Object> toolScratch;
                VPVector toolScratch2;
+               VPVector oldHover;
                Point toolPoint[32];
                Object * toolObj[32];
+               double toolParam[32];
                Point intersectionPoint;
                Point hoverPoint;
                bool hoverPointValid;
@@ -122,4 +122,3 @@ class DrawingView: public QWidget
 };
 
 #endif // __DRAWINGVIEW_H__
-