X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=da1912f39312fbcc20fc6e0d60ed96553f071a5c;hb=64482766268cddae393da1277987de31e69ffdd9;hp=b296f28e64c887f2a8276d5a775cd76f178fe5f6;hpb=bb8d0671717bac2c5350e34024273381be1d8175;p=architektonas diff --git a/src/drawingview.h b/src/drawingview.h index b296f28..da1912f 100644 --- a/src/drawingview.h +++ b/src/drawingview.h @@ -15,10 +15,14 @@ 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); @@ -31,11 +35,13 @@ class DrawingView: public QWidget void mousePressEvent(QMouseEvent * event); void mouseMoveEvent(QMouseEvent * event); void mouseReleaseEvent(QMouseEvent * event); + void keyPressEvent(QKeyEvent * event); + void keyReleaseEvent(QKeyEvent * event); private: QPoint GetAdjustedMousePosition(QMouseEvent * event); QPoint GetAdjustedClientPosition(int x, int y); - Vector SnapPointToGrid(Vector); +// Vector SnapPointToGrid(Vector); public: bool useAntialiasing; @@ -47,12 +53,13 @@ class DrawingView: public QWidget int32_t offsetX, offsetY; // Window offsets public: Container document; - double gridSpacing; // Grid spacing in base units +// 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??? +//maybe, maybe not... :-P bool rotateTool; double rx, ry; bool scrollDrag; @@ -60,8 +67,6 @@ class DrawingView: public QWidget bool addLineTool; bool addCircleTool; bool addDimensionTool; -// bool selectionInProgress; -// QRectF selection; public: Action * toolAction;