diff -r ac5c1f691ce2 -r 61f160dfd0f1 QTfrontend/drawmapscene.h --- a/QTfrontend/drawmapscene.h Tue Oct 15 23:07:22 2013 +0400 +++ b/QTfrontend/drawmapscene.h Fri Oct 18 15:26:43 2013 +0400 @@ -29,6 +29,7 @@ { quint8 width; bool erasing; + QPoint initialPoint; QList points; }; @@ -38,6 +39,12 @@ { Q_OBJECT public: + enum PathType { + Polyline = 0, + Rectangle = 1, + Ellipse = 2 + }; + explicit DrawMapScene(QObject *parent = 0); QByteArray encode(); @@ -54,6 +61,7 @@ void setErasing(bool erasing); void showCursor(); void hideCursor(); + void setPathType(PathType pathType); private: QPen m_pen; @@ -67,6 +75,7 @@ QGraphicsEllipseItem * m_cursor; bool m_isCursorShown; QByteArray m_specialPoints; + PathType m_pathType; virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * mouseEvent); virtual void mousePressEvent(QGraphicsSceneMouseEvent * mouseEvent); @@ -77,6 +86,7 @@ quint8 serializePenWidth(int width); int deserializePenWidth(quint8 width); + QList makeEllipse(const QPointF & center, const QPointF & corner); }; #endif // DRAWMAPSCENE_H