Merge remote-tracking branch 'origin/master' into claudio-dev

src/board/UBBoardController.cpp

@@ -54,6 +54,8 @@
 #include "domain/UBGraphicsGroupContainerItem.h"
 #include "domain/UBItem.h"
 #include "board/UBFeaturesController.h"
+#include "domain/UBGraphicsStrokesGroup.h"
+
 #include "gui/UBFeaturesWidget.h"
 
 #include "tools/UBToolsManager.h"
@@ -536,6 +538,8 @@ void UBBoardController::duplicateItem(UBItem *item)
     if (!item)
         return;
 
+    mLastCreatedItem = NULL;
+
     QUrl sourceUrl;
     QByteArray pData;
 
@@ -612,9 +616,8 @@ void UBBoardController::duplicateItem(UBItem *item)
     			UBItem* pItem = dynamic_cast<UBItem*>(pIt);
     			if(NULL != pItem){
     				duplicateItem(pItem);	// The duplication already copies the item parameters
-    				QGraphicsItem* pDuplicatedItem = dynamic_cast<QGraphicsItem*>((mActiveScene->children().last()));
-    				if(NULL != pDuplicatedItem){
-    					pDuplicatedItem->setSelected(true);
+    				if(NULL != mLastCreatedItem){
+    					mLastCreatedItem->setSelected(true);
     				}
     			}
     		}
@@ -630,8 +633,10 @@ void UBBoardController::duplicateItem(UBItem *item)
             QGraphicsItem *gitem = dynamic_cast<QGraphicsItem*>(item->deepCopy());
             if (gitem)
             {   
+            	qDebug() << "Adding a stroke: " << gitem;
                 mActiveScene->addItem(gitem);
                 gitem->setPos(itemPos);
+                mLastCreatedItem = gitem;
             }
             return;
         }break;
@@ -646,6 +651,7 @@ void UBBoardController::duplicateItem(UBItem *item)
         QGraphicsItem *createdGitem = dynamic_cast<QGraphicsItem*>(createdItem);
         if (createdGitem)
             createdGitem->setPos(itemPos);
+        mLastCreatedItem = dynamic_cast<QGraphicsItem*>(createdItem);
     }
 }
 

src/board/UBBoardController.h

@@ -279,6 +279,7 @@ class UBBoardController : public UBDocumentContainer
         bool mCleanupDone;
         QMap<QAction*, QPair<QString, QString> > mActionTexts;
         bool mCacheWidgetIsEnabled;
+        QGraphicsItem* mLastCreatedItem;
 
     private slots:
         void stylusToolDoubleClicked(int tool);

src/domain/UBGraphicsScene.cpp

@@ -844,8 +844,11 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth)
                             // UBGraphicsPolygonItems and added to the scene
                             foreach(const QPolygonF &pol, croppedPathSimplified.toFillPolygons())
                             {
-                                UBGraphicsPolygonItem* croppedPolygonItem = collidingPolygonItem->deepCopy(pol);
+                                UBGraphicsPolygonItem* croppedPolygonItem;
     #pragma omp critical
+                                {
+                                    croppedPolygonItem = collidingPolygonItem->deepCopy(pol);
+    
                                     if(NULL != pGroup){
                                         croppedPolygonItem->setStrokesGroup(pGroup);
                                         //pGroup->addToGroup(croppedPolygonItem);
@@ -853,6 +856,7 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth)
                                     // Add this new polygon to the 'added' list
                                     toBeAddedItems << croppedPolygonItem;
                                 }
+                            }
     #pragma omp critical
                             // Remove the original polygonitem because it has been replaced by many smaller polygons
                             toBeRemovedItems << collidingPolygonItem;