Fixed, improved, cleaned and commented aristo tool.

src/tools/UBGraphicsAristo.h

@@ -16,81 +16,71 @@
 #ifndef UBGRAPHICSARISTO_H_
 #define UBGRAPHICSARISTO_H_
 
-#include <QtGui>
-#include <QtSvg>
-#include <QGraphicsPolygonItem>
-
 #include "core/UB.h"
 #include "domain/UBItem.h"
 #include "tools/UBAbstractDrawRuler.h"
 
-
-class UBGraphicsScene;
-class UBItem;
-
-class UBGraphicsAristo : public UBAbstractDrawRuler, public QGraphicsPolygonItem, public UBItem
+#include <QBrush>
+#include <QCursor>
+#include <QGraphicsPathItem>
+#include <QGraphicsSceneHoverEvent>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsSvgItem>
+#include <QPainter>
+#include <QPainterPath>
+#include <QPointF>
+#include <QRectF>
+#include <QStyleOptionGraphicsItem>
+#include <QTransform>
+#include <QWidget>
+
+class UBGraphicsAristo : public UBAbstractDrawRuler, public QGraphicsPathItem, public UBItem
 {
-    Q_OBJECT
+Q_OBJECT
 
-    public:
+public:
     UBGraphicsAristo();
     virtual ~UBGraphicsAristo();
 
-        enum { Type = UBGraphicsItemType::AristoItemType };
-        enum Tool {None, Move, Resize, Rotate, Close, MoveMarker, HorizontalFlip};
+    enum {
+        Type = UBGraphicsItemType::AristoItemType 
+    };
 
-        virtual int type() const
+    enum Tool {
+        None,
+        Move,
+        Resize,
+        Rotate,
+        Close,
+        MoveMarker,
+        HorizontalFlip
+    };
+
+    enum Orientation
     {
-            return Type;
-        }
+        Bottom = 0,
+        Top,
+        Undefined
+    };
+    
+    void setOrientation(Orientation orientation);
+    void setBoundingRect(QRectF boundingRect);        
 
-        virtual UBItem* deepCopy(void) const;
+    virtual UBItem* deepCopy() const;
     virtual void copyItemParameters(UBItem *copy) const;
 
     virtual void StartLine(const QPointF& scenePos, qreal width);
     virtual void DrawLine(const QPointF& position, qreal width);
     virtual void EndLine();
 
-        enum UBGraphicsAristoOrientation
-        {
-                Bottom = 0,
-                Top
-        };
-
-        static UBGraphicsAristoOrientation orientationFromStr(QStringRef& str)
-        {
-            if (str == "Bottom") return Bottom;
-            if (str == "Top") return Top;
-            return sDefaultOrientation;
-        }
-        static QString orientationToStr(UBGraphicsAristoOrientation orientation)
-        {
-            QString result;
-            if (orientation == 0) result = "Bottom";
-            else if (orientation == 1) result = "Top";
-
-            return result;
-        }
-
-        void setRect(const QRectF &rect, UBGraphicsAristoOrientation orientation)
+    virtual int type() const
     {
-            setRect(rect.x(), rect.y(), rect.width(), rect.height(), orientation);
+        return Type;
     }
-
-        void setRect(qreal x, qreal y, qreal w, qreal h, UBGraphicsAristoOrientation orientation);
-
-        void setOrientation(UBGraphicsAristoOrientation orientation);
-
-        UBGraphicsAristoOrientation getOrientation() const {return mOrientation;}
-
-        QRectF rect() const {return boundingRect();}
-
     UBGraphicsScene* scene() const;
 
-    protected:
-
+protected:
     virtual void paint (QPainter *painter, const QStyleOptionGraphicsItem *styleOption, QWidget *widget);
-        virtual QPainterPath shape() const;
 
     virtual void rotateAroundCenter(qreal angle);
     virtual void resize(qreal factor);
@@ -98,14 +88,14 @@ class UBGraphicsAristo : public UBAbstractDrawRuler, public QGraphicsPolygonItem
     virtual QPointF rotationCenter() const;
 
     virtual QRectF closeButtonRect() const;
-        QRectF  resizeButtonRect () const;
     QRectF hFlipRect() const;
-        QRectF    rotateRect() const;
     QRectF markerButtonRect() const;
+    QRectF resizeButtonRect () const;        
+    QRectF rotateRect() const;
 
     QCursor flipCursor() const;        
-        QCursor    resizeCursor() const;
     QCursor markerCursor() const;
+    QCursor resizeCursor() const;
 
     virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
     virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
@@ -114,52 +104,50 @@ class UBGraphicsAristo : public UBAbstractDrawRuler, public QGraphicsPolygonItem
     virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
     virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
 
-    private:
-        UBGraphicsAristo::Tool toolFromPos(QPointF pos);
-        QTransform calculateRotationTransform();
-        qreal angle;
+private:
+    Tool toolFromPos(QPointF pos);
 
+    QTransform calculateRotationTransform();
     void rotateAroundCenter(QTransform& transform, QPointF center);
 
-        bool mResizing;
-        bool mRotating;
-        bool mMarking;
-        QRect lastRect;
-        qreal mSpan;
-
-        // Coordinates are transformed....
-        QPoint lastPos;
-        QGraphicsSvgItem* mHFlipSvgItem;
-        QGraphicsSvgItem* mRotateSvgItem;
-        QGraphicsSvgItem* mResizeSvgItem;
-        QGraphicsSvgItem* mMarkerSvgItem;
-        qreal   mStartAngle;
-        qreal mCurrentAngle;
-
-        static const QRect sDefaultRect;
-        static const UBGraphicsAristoOrientation sDefaultOrientation;
+    void calculatePoints();
+    QPainterPath determinePath();
+    void setItemsPos();
+    void makeGeometryChange();
 
+    QBrush fillBrush() const;
     void paintGraduations(QPainter *painter);
-        void paintRulerGraduations(QPainter *painter);
-        void paintProtractorGraduations(QPainter* painter);
     void paintMarker(QPainter *painter);
+    void paintProtractorGraduations(QPainter* painter);
+    void paintRulerGraduations(QPainter *painter);
+
     inline qreal radius () const
     {
         return sqrt(((B.x() - A.x())*(B.x() - A.x()))+((B.y() - A.y())*(B.y() - A.y()))) * 9 / 16 - 20;
     }        
-        QBrush fillBrush() const;
 
-        UBGraphicsAristoOrientation mOrientation;
+    bool mMarking;
+    bool mResizing;
+    bool mRotating;
 
-        void calculatePoints(const QRectF& rect);
+    Orientation mOrientation;
+
+    qreal mAngle;
+    qreal mCurrentAngle;
+    qreal mStartAngle;
+
+    qreal mSpan;
+
+    QGraphicsSvgItem* mHFlipSvgItem;
+    QGraphicsSvgItem* mMarkerSvgItem;
+    QGraphicsSvgItem* mResizeSvgItem;
+    QGraphicsSvgItem* mRotateSvgItem;      
 
     QPointF A, B, C;
     
-        static const int d = 70; // width of triangle border
-        static const int sArrowLength = 30;
-        static const int sMinWidth = 380;
-        static const int sMinHeight = 200;
     static const int sArcAngleMargin = 5;
+    static const Orientation sDefaultOrientation;        
+    static const QRectF sDefaultRect;
 };
 
 #endif /* UBGRAPHICSARISTO_H_ */