Merge branch 'master' of github.com:Sankore/Sankore-3.1

src/board/UBBoardView.cpp

@@ -316,7 +316,6 @@ void UBBoardView::tabletEvent (QTabletEvent * event)
     }
 
     QPointF scenePos = viewportTransform ().inverted ().map (tabletPos);
-    qDebug() << "scene Pos " << scenePos;
 
     qreal pressure = 1.0;
     if (((currentTool == UBStylusTool::Pen || currentTool == UBStylusTool::Line)
@@ -329,16 +328,12 @@ void UBBoardView::tabletEvent (QTabletEvent * event)
 
     switch (event->type ()) {
     case QEvent::TabletPress: {
-        qDebug() << "TabletPress";
-
         mTabletStylusIsPressed = true;
         scene()->inputDevicePress (scenePos, pressure);
 
         break;
     }
     case QEvent::TabletMove: {
-        qDebug() << "TabletMove";
-
         if (mTabletStylusIsPressed)
             scene ()->inputDeviceMove (scenePos, pressure);
 
@@ -348,8 +343,6 @@ void UBBoardView::tabletEvent (QTabletEvent * event)
 
     }
     case QEvent::TabletRelease: {
-        qDebug() << "TabletRelease";
-
         UBStylusTool::Enum currentTool = (UBStylusTool::Enum)dc->stylusTool ();
         scene ()->setToolCursor (currentTool);
         setToolCursor (currentTool);

src/board/UBDrawingController.cpp

@@ -45,6 +45,7 @@ UBDrawingController::UBDrawingController(QObject * parent)
     , mActiveRuler(NULL)
     , mStylusTool((UBStylusTool::Enum)-1)
     , mLatestDrawingTool((UBStylusTool::Enum)-1)
+    //, mDrawingMode(eDrawingMode_Vector)
 
 {
     connect(UBSettings::settings(), SIGNAL(colorContextChanged()), this, SIGNAL(colorPaletteChanged()));
@@ -387,3 +388,13 @@ void UBDrawingController::captureToolSelected(bool checked)
     if (checked)
         setStylusTool(UBStylusTool::Capture);
 }
+
+void UBDrawingController::setDrawingMode(eDrawingMode mode)
+{
+    mDrawingMode = mode;
+}
+
+eDrawingMode UBDrawingController::drawingMode()
+{
+    return mDrawingMode;
+}

src/board/UBDrawingController.h

@@ -22,6 +22,11 @@
 
 class UBAbstractDrawRuler;
 
+typedef enum{
+    eDrawingMode_Artistic,
+    eDrawingMode_Vector
+}eDrawingMode;
+
 class UBDrawingController : public QObject
 {
     Q_OBJECT;
@@ -49,6 +54,8 @@ class UBDrawingController : public QObject
         void setPenColor(bool onDarkBackground, const QColor& color, int pIndex);
         void setMarkerColor(bool onDarkBackground, const QColor& color, int pIndex);
         void setMarkerAlpha(qreal alpha);
+        void setDrawingMode(eDrawingMode mode);
+        eDrawingMode drawingMode();
 
         UBAbstractDrawRuler* mActiveRuler;
 
@@ -69,6 +76,7 @@ class UBDrawingController : public QObject
     private:
         UBStylusTool::Enum mStylusTool;
         UBStylusTool::Enum mLatestDrawingTool;
+        eDrawingMode mDrawingMode;
 
         static UBDrawingController* sDrawingController;
 

src/core/UBApplicationController.cpp

@@ -463,6 +463,7 @@ void UBApplicationController::showDesktop(bool dontSwitchFrontProcess)
         UBPlatformUtils::bringPreviousProcessToFront();
     }
 
+    UBDrawingController::drawingController()->setDrawingMode(eDrawingMode_Artistic);
     UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector);
 }
 
@@ -606,6 +607,7 @@ void UBApplicationController::checkUpdateRequest()
 void UBApplicationController::hideDesktop()
 {
     mDisplayManager->adjustScreens(-1);
+    UBDrawingController::drawingController()->setDrawingMode(eDrawingMode_Vector);
 
     if (mMainMode == Board)
     {

src/domain/UBGraphicsPolygonItem.cpp

@@ -176,7 +176,6 @@ UBGraphicsPolygonItem* UBGraphicsPolygonItem::deepCopy(const QPolygonF& pol) con
 
 void UBGraphicsPolygonItem::paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget)
 {
-
     if(mHasAlpha && scene() && scene()->isLightBackground())
     {
         painter->setCompositionMode(QPainter::CompositionMode_Darken);
@@ -190,11 +189,3 @@ UBGraphicsScene* UBGraphicsPolygonItem::scene()
 {
     return qobject_cast<UBGraphicsScene*>(QGraphicsPolygonItem::scene());
 }
-
-
-
-
-
-
-
-

src/domain/UBGraphicsPolygonItem.h

@@ -116,7 +116,6 @@ class UBGraphicsPolygonItem : public QGraphicsPolygonItem, public UBItem
     protected:
         void paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget);
 
-
     private:
 
         void clearStroke();

src/domain/UBGraphicsScene.cpp

@@ -54,6 +54,7 @@
 #include "UBGraphicsWidgetItem.h"
 #include "UBGraphicsPDFItem.h"
 #include "UBGraphicsTextItem.h"
+#include "UBGraphicsStrokesGroup.h"
 
 #include "UBAppleWidget.h"
 #include "UBW3CWidget.h"
@@ -269,8 +270,9 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent)
     , magniferDisplayViewWidget(0)
     , mZLayerController(new UBZLayerController(this))
     , mIsDesktopMode(false)
+    , mpLastPolygon(NULL)
 {
-
+    UBCoreGraphicsScene::setObjectName("BoardScene");
 #ifdef __ppc__
     mShouldUseOMP = false;
 #elif defined(Q_WS_MAC)
@@ -331,19 +333,29 @@ bool UBGraphicsScene::inputDevicePress(const QPointF& scenePos, const qreal& pre
 
         if (UBDrawingController::drawingController()->isDrawingTool())
         {
+            // -----------------------------------------------------------------
+            // We fall here if we are using the Pen, the Marker or the Line tool
+            // -----------------------------------------------------------------
             qreal width = 0;
 
             // delete current stroke, if not assigned to any polygon
-            if (mCurrentStroke)
-                if (mCurrentStroke->polygons().empty())
+            if (mCurrentStroke && mCurrentStroke->polygons().empty()){
                 delete mCurrentStroke;
+                mCurrentStroke = NULL;
+            }
 
+            // ---------------------------------------------------------------
+            // Create a new Stroke. A Stroke is a collection of QGraphicsLines
+            // ---------------------------------------------------------------
             mCurrentStroke = new UBGraphicsStroke();
 
-            if (currentTool != UBStylusTool::Line)
+            if (currentTool != UBStylusTool::Line){
+                // Handle the pressure
                 width = UBDrawingController::drawingController()->currentToolWidth() * pressure;
-            else
-                width = UBDrawingController::drawingController()->currentToolWidth(); //ignore pressure for line tool
+            }else{
+                // Ignore pressure for the line tool
+                width = UBDrawingController::drawingController()->currentToolWidth();
+            }
 
             width /= UBApplication::boardController->systemScaleFactor();
             width /= UBApplication::boardController->currentZoom();
@@ -353,14 +365,12 @@ bool UBGraphicsScene::inputDevicePress(const QPointF& scenePos, const qreal& pre
 
 			if (UBDrawingController::drawingController()->mActiveRuler)
             {
-				UBDrawingController::drawingController()->mActiveRuler->StartLine(
-					scenePos, width);
+                UBDrawingController::drawingController()->mActiveRuler->StartLine(scenePos, width);
 			}
 			else
 			{
 				moveTo(scenePos);
-				drawLineTo(scenePos, width,
-					UBDrawingController::drawingController()->stylusTool() == UBStylusTool::Line);
+                drawLineTo(scenePos, width, UBDrawingController::drawingController()->stylusTool() == UBStylusTool::Line);
 			}
             accepted = true;
         }
@@ -411,24 +421,31 @@ bool UBGraphicsScene::inputDeviceMove(const QPointF& scenePos, const qreal& pres
         {
             qreal width = 0;
 
-            if (currentTool != UBStylusTool::Line)
+            if (currentTool != UBStylusTool::Line){
+                // Handle the pressure
                 width = dc->currentToolWidth() * pressure;
-            else
-                width = dc->currentToolWidth();//ignore pressure for line tool
+            }else{
+                // Ignore pressure for line tool
+                width = dc->currentToolWidth();
+            }
 
             width /= UBApplication::boardController->systemScaleFactor();
             width /= UBApplication::boardController->currentZoom();
 
-			if (dc->mActiveRuler)
+            if (currentTool == UBStylusTool::Line || dc->mActiveRuler)
             {
-				dc->mActiveRuler->DrawLine(position, width);
+                if(NULL != mpLastPolygon && NULL != mCurrentStroke && mAddedItems.size() > 0){
+                    UBCoreGraphicsScene::removeItemFromDeletion(mpLastPolygon);
+                    mAddedItems.remove(mpLastPolygon);
+                    mCurrentStroke->remove(mpLastPolygon);
+                    removeItem(mpLastPolygon);
+                    mPreviousPolygonItems.removeAll(mpLastPolygon);
                 }
-			else
-			{
-	            if (currentTool == UBStylusTool::Line)
-		        {
-                            // TODO:    Verify this beautiful implementation and check if
-                            //          it is possible to optimize it
+
+                // ------------------------------------------------------------------------
+                // Here we wanna make sure that the Line will 'grip' at i*45, i*90 degrees
+                // ------------------------------------------------------------------------
+
                 QLineF radius(mPreviousPoint, position);
                 qreal angle = radius.angle();
                 angle = qRound(angle / 45) * 45;
@@ -441,8 +458,10 @@ bool UBGraphicsScene::inputDeviceMove(const QPointF& scenePos, const qreal& pres
                     position = newPosition;
             }
 
-				drawLineTo(position, width,
-					UBDrawingController::drawingController()->stylusTool() == UBStylusTool::Line);
+            if(dc->mActiveRuler){
+                dc->mActiveRuler->DrawLine(position, width);
+            }else{
+                drawLineTo(position, width, UBDrawingController::drawingController()->stylusTool() == UBStylusTool::Line);
             }
         }
         else if (currentTool == UBStylusTool::Eraser)
@@ -492,11 +511,33 @@ bool UBGraphicsScene::inputDeviceRelease()
     {
         if (mCurrentStroke)
         {
-            if (mCurrentStroke->polygons().empty())
+            if(eDrawingMode_Vector == dc->drawingMode()){
+                UBGraphicsStrokesGroup* pStrokes = new UBGraphicsStrokesGroup();
+
+                // Remove the strokes that were just drawn here and replace them by a stroke item
+                foreach(UBGraphicsPolygonItem* poly, mCurrentStroke->polygons()){
+                    mPreviousPolygonItems.removeAll(poly);
+                    removeItem(poly);
+                    UBCoreGraphicsScene::removeItemFromDeletion(poly);
+                    pStrokes->addToGroup(poly);
+                }
+
+                // TODO LATER : Generate well pressure-interpolated polygons and create the line group with them
+
+                mAddedItems.clear();
+
+                // Add the groupItem in mAddedItem
+                mAddedItems << pStrokes;
+
+                addItem(pStrokes);
+            }
+
+            if (mCurrentStroke->polygons().empty()){
                 delete mCurrentStroke;
                 mCurrentStroke = 0;
             }
         }
+    } 
    
     if (mRemovedItems.size() > 0 || mAddedItems.size() > 0)
     {
@@ -606,6 +647,9 @@ void UBGraphicsScene::drawLineTo(const QPointF &pEndPoint, const qreal &pWidth,
 
     if (!polygonItem->brush().isOpaque())
     {
+        // -------------------------------------------------------------------------------------
+        // Here we substract the polygons that are overlapping in order to keep the transparency
+        // -------------------------------------------------------------------------------------
         for (int i = 0; i < mPreviousPolygonItems.size(); i++)
         {
             UBGraphicsPolygonItem* previous = mPreviousPolygonItems.value(i);
@@ -625,15 +669,17 @@ void UBGraphicsScene::drawLineTo(const QPointF &pEndPoint, const qreal &pWidth,
         mAddedItems.clear();
     }
 
+    mpLastPolygon = polygonItem;
     mAddedItems.insert(polygonItem);
 
+    // Here we add the item to the scene
+    addItem(polygonItem);
+
     if (mCurrentStroke)
     {
         polygonItem->setStroke(mCurrentStroke);
     }
 
-    addItem(polygonItem);
-
     mPreviousPolygonItems.append(polygonItem);
 
 	if (!bLineStyle)

src/domain/UBGraphicsScene.h

@@ -395,6 +395,7 @@ public slots:
         UBMagnifier *magniferDisplayViewWidget;
 
         UBZLayerController *mZLayerController;
+        UBGraphicsPolygonItem* mpLastPolygon;
 
 };
 

src/domain/UBGraphicsStroke.cpp

@@ -86,3 +86,10 @@ bool UBGraphicsStroke::hasAlpha() const
     }
 }
 
+void UBGraphicsStroke::clear()
+{
+    if(!mPolygons.empty()){
+        mPolygons.clear();
+    }
+}
+

src/domain/UBGraphicsStroke.h

@@ -41,6 +41,8 @@ class UBGraphicsStroke
 
         bool hasAlpha() const;
 
+        void clear();
+
     protected:
         void addPolygon(UBGraphicsPolygonItem* pol);
 

src/domain/UBGraphicsStrokesGroup.cpp

@@ -0,0 +1,86 @@
+#include "UBGraphicsStrokesGroup.h"
+
+UBGraphicsStrokesGroup::UBGraphicsStrokesGroup(QGraphicsItem *parent):QGraphicsItemGroup(parent)
+{
+    mDelegate = new UBGraphicsItemDelegate(this, 0, true, true);
+    mDelegate->init();
+    mDelegate->setFlippable(true);
+    setData(UBGraphicsItemData::ItemLayerType, UBItemLayerType::Object);
+
+    setData(UBGraphicsItemData::itemLayerType, QVariant(itemLayerType::ObjectItem)); //Necessary to set if we want z value to be assigned correctly
+    setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
+    setFlag(QGraphicsItem::ItemIsSelectable, true);
+    setFlag(QGraphicsItem::ItemIsMovable, true);
+}
+
+UBGraphicsStrokesGroup::~UBGraphicsStrokesGroup()
+{
+    if(mDelegate){
+        delete mDelegate;
+    }
+}
+
+void UBGraphicsStrokesGroup::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (mDelegate->mousePressEvent(event))
+    {
+        //NOOP
+    }
+    else
+    {
+//        QGraphicsItemGroup::mousePressEvent(event);
+    }
+}
+
+void UBGraphicsStrokesGroup::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (mDelegate->mouseMoveEvent(event))
+    {
+        // NOOP;
+    }
+    else
+    {
+        QGraphicsItemGroup::mouseMoveEvent(event);
+    }
+}
+
+void UBGraphicsStrokesGroup::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    mDelegate->mouseReleaseEvent(event);
+    QGraphicsItemGroup::mouseReleaseEvent(event);
+}
+
+UBItem* UBGraphicsStrokesGroup::deepCopy() const
+{
+   UBGraphicsStrokesGroup* copy = new UBGraphicsStrokesGroup();
+
+   copy->setPos(this->pos());
+   copy->setTransform(this->transform());
+   copy->setFlag(QGraphicsItem::ItemIsMovable, true);
+   copy->setFlag(QGraphicsItem::ItemIsSelectable, true);
+   copy->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType));
+   copy->setData(UBGraphicsItemData::ItemLocked, this->data(UBGraphicsItemData::ItemLocked));
+
+   return copy;
+}
+
+void UBGraphicsStrokesGroup::remove()
+{
+    if (mDelegate)
+        mDelegate->remove(true);
+}
+
+void UBGraphicsStrokesGroup::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    // Never draw the rubber band, we draw our custom selection with the DelegateFrame
+    QStyleOptionGraphicsItem styleOption = QStyleOptionGraphicsItem(*option);
+    styleOption.state &= ~QStyle::State_Selected;
+
+    QGraphicsItemGroup::paint(painter, &styleOption, widget);
+}
+
+QVariant UBGraphicsStrokesGroup::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    QVariant newValue = mDelegate->itemChange(change, value);
+    return QGraphicsItemGroup::itemChange(change, newValue);
+}

src/domain/UBGraphicsStrokesGroup.h

@@ -0,0 +1,28 @@
+#ifndef UBGRAPHICSSTROKESGROUP_H
+#define UBGRAPHICSSTROKESGROUP_H
+
+#include <QGraphicsItemGroup>
+#include <QGraphicsSceneMouseEvent>
+
+#include "core/UB.h"
+#include "UBItem.h"
+
+class UBGraphicsStrokesGroup : public QObject, public QGraphicsItemGroup, public UBItem, public UBGraphicsItem
+{
+    Q_OBJECT
+public:
+    UBGraphicsStrokesGroup(QGraphicsItem* parent = 0);
+    ~UBGraphicsStrokesGroup();
+    virtual UBItem* deepCopy() const;
+    virtual void remove();
+    virtual UBGraphicsItemDelegate* Delegate() const {return mDelegate;}
+
+protected:
+    virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+};
+
+#endif // UBGRAPHICSSTROKESGROUP_H

src/domain/domain.pri

@@ -23,7 +23,8 @@ HEADERS      += src/domain/UBGraphicsScene.h \
     src/domain/UBGraphicsAudioItem.h \
     src/domain/UBGraphicsAudioItemDelegate.h \
     src/domain/UBAbstractUndoCommand.h\
-    src/domain/UBAngleWidget.h
+    src/domain/UBAngleWidget.h \
+    src/domain/UBGraphicsStrokesGroup.h
                 
 HEADERS      += src/domain/UBGraphicsItemDelegate.h \
 				src/domain/UBGraphicsVideoItemDelegate.h \
@@ -56,7 +57,8 @@ SOURCES      += src/domain/UBGraphicsScene.cpp \
     src/domain/UBGraphicsAudioItem.cpp \
     src/domain/UBGraphicsAudioItemDelegate.cpp \
     src/domain/UBAbstractUndoCommand.cpp \
-    src/domain/UBAngleWidget.cpp
+    src/domain/UBAngleWidget.cpp \
+    src/domain/UBGraphicsStrokesGroup.cpp
                 
 SOURCES      += src/domain/UBGraphicsItemDelegate.cpp \
 				src/domain/UBGraphicsVideoItemDelegate.cpp \

src/frameworks/UBCoreGraphicsScene.cpp

@@ -87,3 +87,9 @@ bool UBCoreGraphicsScene::deleteItem(QGraphicsItem* item)
         return false;
 }
 
+void UBCoreGraphicsScene::removeItemFromDeletion(QGraphicsItem *item)
+{
+    if(NULL != item){
+        mItemsToDelete.remove(item);
+    }
+}

src/frameworks/UBCoreGraphicsScene.h

@@ -30,6 +30,7 @@ class UBCoreGraphicsScene : public QGraphicsScene
 
         virtual bool deleteItem(QGraphicsItem* item);
 
+        void removeItemFromDeletion(QGraphicsItem* item);
 
     private:
         QSet<QGraphicsItem*> mItemsToDelete;

src/tools/UBGraphicsRuler.cpp

@@ -103,6 +103,7 @@ void UBGraphicsRuler::paint(QPainter *painter, const QStyleOptionGraphicsItem *s
 
 
     painter->setPen(drawColor());
+    painter->setRenderHint(QPainter::Antialiasing, true);
     painter->drawRoundedRect(rect(), sRoundingRadius, sRoundingRadius);
     fillBackground(painter);
     paintGraduations(painter);
@@ -478,9 +479,11 @@ void UBGraphicsRuler::DrawLine(const QPointF& scenePos, qreal width)
 	itemPos = mapToScene(itemPos);
 
 	// We have to use "pointed" line for marker tool
-	scene()->drawLineTo(itemPos, width, 
-		UBDrawingController::drawingController()->stylusTool() != UBStylusTool::Marker);
+    scene()->drawLineTo(itemPos, width, UBDrawingController::drawingController()->stylusTool() != UBStylusTool::Marker);
 }
 
 void UBGraphicsRuler::EndLine()
-{}
+{
+    // We never come to this place
+    scene()->inputDeviceRelease();
+}