X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=55384fa48a3c7c686abc5ba2d44b46dd2d961718;hb=642cf72c11b49a9e00128ab6258a2438c785a5ab;hp=da1912f39312fbcc20fc6e0d60ed96553f071a5c;hpb=428876081ee41d40e32f5b4f2bfcfdb7a835e6e1;p=architektonas diff --git a/src/drawingview.h b/src/drawingview.h index da1912f..55384fa 100644 --- a/src/drawingview.h +++ b/src/drawingview.h @@ -15,19 +15,13 @@ 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 SetToolActive(Action * action); void SetGridSize(uint32_t); void UpdateGridBackground(void); public slots: void AddNewObjectToDocument(Object *); + void SetCurrentLayer(int); protected: void paintEvent(QPaintEvent * event); @@ -41,21 +35,17 @@ class DrawingView: public QWidget private: QPoint GetAdjustedMousePosition(QMouseEvent * event); QPoint GetAdjustedClientPosition(int x, int y); -// Vector SnapPointToGrid(Vector); public: bool useAntialiasing; private: -// QBrush * backgroundBrush; QPixmap gridBackground; double scale; // Window scaling factor int32_t offsetX, offsetY; // Window offsets public: Container document; -// 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??? @@ -64,9 +54,9 @@ class DrawingView: public QWidget double rx, ry; bool scrollDrag; Vector oldPoint; - bool addLineTool; - bool addCircleTool; - bool addDimensionTool; +// bool addLineTool; +// bool addCircleTool; +// bool addDimensionTool; public: Action * toolAction;