removed aristo

src/board/UBBoardController.cpp

@@ -1421,11 +1421,6 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QUrl
             mActiveScene->addMask(pPos);
             UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector);
         }
-        else if (sourceUrl.toString() == UBToolsManager::manager()->aristo.id)
-        {
-            mActiveScene->addAristo(pPos);
-            UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector);
-        }
         else
         {
             showMessage(tr("Unknown tool type %1").arg(sourceUrl.toString()));

src/board/UBBoardView.cpp

@@ -76,7 +76,6 @@
 #include "tools/UBGraphicsCache.h"
 #include "tools/UBGraphicsTriangle.h"
 #include "tools/UBGraphicsProtractor.h"
-#include "tools/UBGraphicsAristo.h"
 
 #include "core/memcheck.h"
 
@@ -478,7 +477,6 @@ bool UBBoardView::isCppTool(QGraphicsItem *item)
         || item->type() == UBGraphicsItemType::RulerItemType
         || item->type() == UBGraphicsItemType::ProtractorItemType
         || item->type() == UBGraphicsItemType::TriangleItemType
-        || item->type() == UBGraphicsItemType::AristoItemType
         || item->type() == UBGraphicsItemType::CurtainItemType);
 }
 
@@ -557,7 +555,6 @@ Here we determines cases when items should to get mouse press event at pressing
     case UBGraphicsTriangle::Type:
     case UBGraphicsCompass::Type:
     case UBGraphicsCache::Type:
-    case UBGraphicsAristo::Type:
         return true;
 
     case UBGraphicsDelegateFrame::Type:

src/core/UB.h

@@ -153,7 +153,6 @@ struct UBGraphicsItemType
         TriangleItemType,
         MagnifierItemType,
         cacheItemType,
-        AristoItemType,
         groupContainerType,
         ToolWidgetItemType,
         GraphicsWidgetItemType,

src/domain/UBGraphicsScene.cpp

@@ -47,7 +47,6 @@
 #include "tools/UBGraphicsTriangle.h"
 #include "tools/UBGraphicsCurtainItem.h"
 #include "tools/UBGraphicsCache.h"
-#include "tools/UBGraphicsAristo.h"
 
 #include "document/UBDocumentProxy.h"
 
@@ -1955,22 +1954,6 @@ void UBGraphicsScene::addCompass(QPointF center)
     compass->setVisible(true);
 }
 
-void UBGraphicsScene::addAristo(QPointF center)
-{
-    UBGraphicsAristo* aristo = new UBGraphicsAristo();
-    mTools << aristo;
-
-    aristo->setData(UBGraphicsItemData::ItemLayerType, QVariant(UBItemLayerType::Tool));
-
-    addItem(aristo);
-
-    QPointF itemSceneCenter = aristo->sceneBoundingRect().center();
-    aristo->moveBy(center.x() - itemSceneCenter.x(), center.y() - itemSceneCenter.y());
-
-    aristo->setVisible(true);
-    setModified(true);
-}
-
 void UBGraphicsScene::addCache()
 {
     UBGraphicsCache* cache = UBGraphicsCache::instance(this);

src/domain/UBGraphicsScene.h

@@ -224,7 +224,6 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem
         void addCompass(QPointF center);
         void addTriangle(QPointF center);
         void addMagnifier(UBMagnifierParams params);
-        void addAristo(QPointF center);
 
         void addMask(const QPointF &center = QPointF());
         void addCache();

src/tools/UBGraphicsAristo.h

-/*
- * Copyright (C) 2012 Webdoc SA
- *
- * This file is part of Open-Sankoré.
- *
- * Open-Sankoré is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3 of the License,
- * with a specific linking exception for the OpenSSL project's
- * "OpenSSL" library (or with modified versions of it that use the
- * same license as the "OpenSSL" library).
- *
- * Open-Sankoré is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef UBGRAPHICSARISTO_H_
-#define UBGRAPHICSARISTO_H_
-
-#include "core/UB.h"
-#include "domain/UBItem.h"
-#include "domain/UBGraphicsScene.h"
-#include "tools/UBAbstractDrawRuler.h"
-
-#include <QtGlobal>
-#include <QBrush>
-#include <QCursor>
-#include <QGraphicsPathItem>
-#include <QGraphicsSceneHoverEvent>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSvgItem>
-#include <QObject>
-#include <QPainter>
-#include <QPainterPath>
-#include <QPointF>
-#include <QRectF>
-#include <QStyleOptionGraphicsItem>
-#include <QTransform>
-#include <QWidget>
-
-class UBGraphicsAristo : public UBAbstractDrawRuler, public QGraphicsPathItem, public UBItem
-{
-Q_OBJECT
-
-public:
-    UBGraphicsAristo();
-    virtual ~UBGraphicsAristo();
-
-    enum {
-        Type = UBGraphicsItemType::AristoItemType 
-    };
-
-    enum Tool {
-        None,
-        Move,
-        Resize,
-        Rotate,
-        Close,
-        MoveMarker,
-        HorizontalFlip
-    };
-
-    enum Orientation
-    {
-        Bottom = 0,
-        Top,
-        Undefined
-    };
-    
-    void setOrientation(Orientation orientation);       
-
-    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();
-
-    virtual int type() const
-    {
-        return Type;
-    }
-    UBGraphicsScene* scene() const;
-
-protected:
-    virtual void paint (QPainter *painter, const QStyleOptionGraphicsItem *styleOption, QWidget *widget);
-
-    virtual void rotateAroundCenter(qreal angle);
-    virtual void resize(qreal factor);
-
-    virtual QPointF rotationCenter() const;
-
-    virtual QRectF closeButtonRect() const;
-    QRectF hFlipRect() const;
-    QRectF markerButtonRect() const;
-    QRectF resizeButtonRect () const;        
-    QRectF rotateRect() const;
-
-    QCursor flipCursor() const;        
-    QCursor markerCursor() const;
-    QCursor resizeCursor() const;
-
-    virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-    virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
-    virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
-    virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
-
-private:
-    Tool toolFromPos(QPointF pos);
-
-    QTransform calculateRotationTransform();
-    void rotateAroundCenter(QTransform& transform, QPointF center);
-
-    void calculatePoints(QRectF bounds);
-    QPainterPath determinePath();
-    void setItemsPos();
-
-    QBrush fillBrush() const;
-    void paintGraduations(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;
-    }        
-
-    bool mMarking;
-    bool mResizing;
-    bool mRotating;
-
-    Orientation mOrientation;
-
-    qreal mRotatedAngle;
-    qreal mMarkerAngle;
-    qreal mStartAngle;
-
-    qreal mSpan;
-
-    QGraphicsSvgItem* mHFlipSvgItem;
-    QGraphicsSvgItem* mMarkerSvgItem;
-    QGraphicsSvgItem* mResizeSvgItem;
-    QGraphicsSvgItem* mRotateSvgItem;      
-
-    QPointF A, B, C;
-    
-    static const int sArcAngleMargin = 5;
-    static const Orientation sDefaultOrientation;        
-    static const QRectF sDefaultRect;
-};
-
-#endif /* UBGRAPHICSARISTO_H_ */

src/tools/UBToolsManager.cpp

@@ -88,23 +88,13 @@ UBToolsManager::UBToolsManager(QObject *parent)
     mToolsIcon.insert(magnifier.id,":/images/toolPalette/magnifierTool.png");
     mDescriptors << magnifier;
 
-//  --------------------------------------------------------------------------------
-//  DO NOT ERASE THIS COMMENTED CODE! IT WILL BE UNCOMMENTED DURING THE NEXT DAYS!!!
-//  --------------------------------------------------------------------------------
     cache.id = "uniboardTool://uniboard.mnemis.com/cache";
     cache.icon = QPixmap(":/images/toolPalette/cacheTool.png");
     cache.label = tr("Cache");
     cache.version = "1.0";
     mToolsIcon.insert(cache.id, ":/images/toolPalette/cacheTool.png");
     mDescriptors << cache;
-//  --------------------------------------------------------------------------------
-
-//    aristo.id = "uniboardTool://uniboard.mnemis.com/aristo";
-//    aristo.icon = QPixmap(":/images/toolPalette/aristoTool.png");
-//    aristo.label = tr("Aristo");
-//    aristo.version = "1.0";
-//    mToolsIcon.insert(aristo.id, ":/images/toolPalette/aristoTool.png");
-//    mDescriptors << aristo;
+
 }
 
 UBToolsManager::~UBToolsManager()

src/tools/UBToolsManager.h

@@ -84,7 +84,6 @@ class UBToolsManager : public QObject
         UBToolDescriptor triangle;
         UBToolDescriptor magnifier;
         UBToolDescriptor cache;
-        UBToolDescriptor aristo;
 
         QString iconFromToolId(QString id) { return mToolsIcon.value(id);}
 

src/tools/tools.pri

@@ -2,7 +2,6 @@ HEADERS     +=  src/tools/UBGraphicsRuler.h \
                 src/tools/UBGraphicsTriangle.h \
                 src/tools/UBGraphicsProtractor.h \
                 src/tools/UBGraphicsCompass.h \
-                src/tools/UBGraphicsAristo.h \
                 src/tools/UBToolsManager.h  \
                 src/tools/UBGraphicsCurtainItem.h \
                 src/tools/UBGraphicsCurtainItemDelegate.h \
@@ -13,7 +12,6 @@ SOURCES     +=  src/tools/UBGraphicsRuler.cpp \
                 src/tools/UBGraphicsTriangle.cpp \
                 src/tools/UBGraphicsProtractor.cpp \
                 src/tools/UBGraphicsCompass.cpp \
-                src/tools/UBGraphicsAristo.cpp \
                 src/tools/UBToolsManager.cpp \
                 src/tools/UBGraphicsCurtainItem.cpp \
                 src/tools/UBGraphicsCurtainItemDelegate.cpp \