Merge branch 'release-candidate' of github.com:Sankore/Sankore-3.1 into release-candidate

src/board/UBBoardView.cpp

@@ -733,7 +733,13 @@ void UBBoardView::handleItemMousePress(QMouseEvent *event)
     else
     {
         if (movingItem)
+        {
+            UBGraphicsItem *graphicsItem = dynamic_cast<UBGraphicsItem*>(movingItem);
+            if (graphicsItem)
+                graphicsItem->Delegate()->startUndoStep();
+
             movingItem->clearFocus();
+        }
 
         if (suspendedMousePressEvent)
         {
@@ -1115,6 +1121,10 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event)
           return;
       }
 
+      UBGraphicsItem *graphicsItem = dynamic_cast<UBGraphicsItem*>(movingItem);
+      if (graphicsItem)
+          graphicsItem->Delegate()->commitUndoStep();
+
       bool bReleaseIsNeed = true;
       if (movingItem != determineItemToPress(scene()->itemAt(this->mapToScene(event->posF().toPoint()))))
       {

src/domain/UBGraphicsItemUndoCommand.cpp

@@ -25,6 +25,7 @@
 
 #include "core/memcheck.h"
 #include "domain/UBGraphicsGroupContainerItem.h"
+#include "domain/UBGraphicsPolygonItem.h"
 
 UBGraphicsItemUndoCommand::UBGraphicsItemUndoCommand(UBGraphicsScene* pScene, const QSet<QGraphicsItem*>& pRemovedItems,
                                                      const QSet<QGraphicsItem*>& pAddedItems, const GroupDataTable &groupsMap)
@@ -107,6 +108,13 @@ void UBGraphicsItemUndoCommand::undo()
             else
                 mScene->addItem(item);
 
+            if (UBGraphicsPolygonItem::Type == item->type())
+            {
+                UBGraphicsPolygonItem *polygonItem = qgraphicsitem_cast<UBGraphicsPolygonItem*>(item);
+                if (polygonItem)
+                    polygonItem->strokesGroup()->addToGroup(polygonItem);
+            }
+
             UBApplication::boardController->freezeW3CWidget(item, false);
         }
     }
@@ -206,6 +214,10 @@ void UBGraphicsItemUndoCommand::redo()
                     mScene->setAsBackgroundObject(item);
                 else
                     mScene->addItem(item);
+
+                UBGraphicsPolygonItem *polygonItem = qgraphicsitem_cast<UBGraphicsPolygonItem*>(item);
+                if (polygonItem)
+                    polygonItem->strokesGroup()->addToGroup(polygonItem);
             }
         }
 

src/domain/UBGraphicsScene.cpp

@@ -629,9 +629,9 @@ bool UBGraphicsScene::inputDeviceRelease()
 
     if (mCurrentStroke && mCurrentStroke->polygons().empty()){
         delete mCurrentStroke;
-        mCurrentStroke = NULL;
     }
 
+    mCurrentStroke = NULL;
     return accepted;
 }
 
@@ -794,7 +794,7 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth)
         {
             #pragma omp critical
             {
-                // Compele remove item
+                // Compete remove item
                 intersectedItems << pi;
                 intersectedPolygons << QList<QPolygonF>();
             }
@@ -813,30 +813,29 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth)
 
     for(int i=0; i<intersectedItems.size(); i++)
     {
-        if (intersectedPolygons[i].empty())
+        // item who intersects with eraser
-        {
+        UBGraphicsPolygonItem *intersectedPolygonItem = intersectedItems[i];
-            removeItem(intersectedItems[i]);
-        }
-        else
-        {
-            UBGraphicsPolygonItem *pi = intersectedItems[i];
 
+        if (!intersectedPolygons[i].empty())
+        {
+            // intersected polygons generated as QList<QPolygon> QPainterPath::toFillPolygons(), 
+            // so each intersectedPolygonItem has one or couple of QPolygons who should be removed from it. 
             for(int j = 0; j < intersectedPolygons[i].size(); j++)
             {
-                QPolygonF p = intersectedPolygons[i][j];
+                // create small polygon from couple of polygons to replace particular erased polygon
-                if (j==0)
+                UBGraphicsPolygonItem* polygonItem = new UBGraphicsPolygonItem(intersectedPolygons[i][j], intersectedPolygonItem->parentItem());
-                    pi->setPolygon(intersectedPolygons[i][j]);
+
-                else
+                intersectedPolygonItem->copyItemParameters(polygonItem);  
-                {
+                polygonItem->setStroke(intersectedPolygonItem->stroke());
-                    UBGraphicsPolygonItem* polygonItem = new UBGraphicsPolygonItem(intersectedPolygons[i][j], pi->parentItem());
+                polygonItem->setStrokesGroup(intersectedPolygonItem->strokesGroup());
-                    pi->copyItemParameters(polygonItem);
+                intersectedPolygonItem->strokesGroup()->addToGroup(polygonItem);
-
+                mAddedItems << polygonItem;
-                    polygonItem->setStroke(pi->stroke());
-                    polygonItem->setStrokesGroup(pi->strokesGroup());
-                    pi->strokesGroup()->addToGroup(polygonItem);
-                }
             }
         }
+
+        //remove full polygon item for replace it by couple of polygons who creates the same stroke without a part which intersects with eraser
+        mRemovedItems << intersectedPolygonItem;
+        removeItem(intersectedPolygonItem);
     }
 
     if (!intersectedItems.empty())