Fixed issue 862

src/board/UBBoardController.cpp

@@ -533,7 +533,7 @@ void UBBoardController::duplicateScene()
     duplicateScene(mActiveSceneIndex);
 }
 
-void UBBoardController::duplicateItem(UBItem *item)
+void UBBoardController::duplicateItem(UBItem *item, QTransform trf)
 {    
     if (!item)
         return;
@@ -553,6 +553,7 @@ void UBBoardController::duplicateItem(UBItem *item)
         qreal shifting = UBSettings::settings()->objectFrameWidth;
         itemPos = commonItem->pos() + QPointF(shifting,shifting);
         itemSize = commonItem->boundingRect().size();
+        commonItem->setSelected(false);
     }
 
     UBMimeType::Enum itemMimeType;
@@ -611,18 +612,28 @@ void UBBoardController::duplicateItem(UBItem *item)
     {
     	UBGraphicsGroupContainerItem* groupItem = dynamic_cast<UBGraphicsGroupContainerItem*>(item);
     	if(groupItem){
+    		QTransform groupTransform = groupItem->transform();
+    		groupItem->resetTransform();
+
     		QList<QGraphicsItem*> children = groupItem->childItems();
     		foreach(QGraphicsItem* pIt, children){
     			UBItem* pItem = dynamic_cast<UBItem*>(pIt);
     			if(NULL != pItem){
-    				duplicateItem(pItem);	// The duplication already copies the item parameters
+    				duplicateItem(pItem, groupItem->transform());	// The duplication already copies the item parameters
-    				if(NULL != mLastCreatedItem){
-    					mLastCreatedItem->setSelected(true);
-    				}
     			}
     		}
+    		groupItem->setTransform(groupTransform);
     		groupItem->setSelected(false);
     		UBApplication::mainWindow->actionGroupItems->trigger();
+    		QList<QGraphicsItem*> selItems =  mActiveScene->selectedItems();
+    		if(!selItems.empty()){
+    			// I don't like this solution but for now this is the only way I found.
+    			// Normally, at this state, only the duplicated group should be selected
+    			UBGraphicsGroupContainerItem* duplicatedGroup = dynamic_cast<UBGraphicsGroupContainerItem*>(selItems.at(0));
+    			if(NULL != duplicatedGroup){
+    				duplicatedGroup->setTransform(groupTransform);
+    			}
+    		}
     	}
     	return;
     	break;
@@ -633,10 +644,11 @@ 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;
+
+                gitem->setSelected(true);
             }
             return;
         }break;
@@ -652,6 +664,7 @@ void UBBoardController::duplicateItem(UBItem *item)
         if (createdGitem)
             createdGitem->setPos(itemPos);
         mLastCreatedItem = dynamic_cast<QGraphicsItem*>(createdItem);
+        mLastCreatedItem->setSelected(true);
     }
 }
 
@@ -2175,7 +2188,10 @@ void UBBoardController::processMimeData(const QMimeData* pMimeData, const QPoint
         {
             foreach(UBItem* item, mimeData->items())
             {
-                duplicateItem(item);
+            	QGraphicsItem* pItem = dynamic_cast<QGraphicsItem*>(item);
+            	if(NULL != pItem){
+            		duplicateItem(item, pItem->transform());
+            	}
             }
 
             return;

src/board/UBBoardController.h

@@ -158,7 +158,7 @@ class UBBoardController : public UBDocumentContainer
 
         void moveSceneToIndex(int source, int target);
         void duplicateScene(int index);
-        void duplicateItem(UBItem *item);
+        void duplicateItem(UBItem *item, QTransform trf);
         void deleteScene(int index);
 
         bool cacheIsVisible() {return mCacheWidgetIsEnabled;}

src/domain/UBGraphicsItemDelegate.cpp

@@ -417,7 +417,7 @@ bool UBGraphicsItemDelegate::isLocked() const
 
 void UBGraphicsItemDelegate::duplicate()
 {
-    UBApplication::boardController->duplicateItem(dynamic_cast<UBItem*>(delegated()));
+    UBApplication::boardController->duplicateItem(dynamic_cast<UBItem*>(delegated()), delegated()->transform());
 }
 
 void UBGraphicsItemDelegate::increaseZLevelUp()

src/domain/UBGraphicsPolygonItem.cpp

@@ -173,6 +173,7 @@ void UBGraphicsPolygonItem::copyItemParameters(UBItem *copy) const
 
         cp->setColorOnDarkBackground(this->colorOnDarkBackground());
         cp->setColorOnLightBackground(this->colorOnLightBackground());
+        //cp->setTransform(transform());
 
         cp->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType));
     }

src/domain/UBGraphicsStrokesGroup.cpp

@@ -67,15 +67,22 @@ UBItem* UBGraphicsStrokesGroup::deepCopy() const
 {
 	UBGraphicsStrokesGroup* copy = new UBGraphicsStrokesGroup();
 
+	QTransform groupTransform = transform();
+	const_cast<UBGraphicsStrokesGroup*>(this)->resetTransform();
 
 	QList<QGraphicsItem*> chl = childItems();
 
 	foreach(QGraphicsItem *child, chl)
 	{
 		UBGraphicsPolygonItem *polygon = dynamic_cast<UBGraphicsPolygonItem*>(child);
-        if (polygon)
+
-            copy->addToGroup(dynamic_cast<QGraphicsItem*>(polygon->deepCopy()));
+		if (polygon){
+			QGraphicsItem* pItem = dynamic_cast<QGraphicsItem*>(polygon->deepCopy());
+			copy->addToGroup(pItem);
+		}
+
 	}
+	const_cast<UBGraphicsStrokesGroup*>(this)->setTransform(groupTransform);
 	copyItemParameters(copy);
 
 	return copy;
@@ -83,7 +90,8 @@ UBItem* UBGraphicsStrokesGroup::deepCopy() const
 
 void UBGraphicsStrokesGroup::copyItemParameters(UBItem *copy) const
 {
-    UBGraphicsStrokesGroup *cp = dynamic_cast<UBGraphicsStrokesGroup*>(copy);
+	QGraphicsItem *cp = dynamic_cast<QGraphicsItem*>(copy);
+    if(NULL != cp)
     {
         cp->setPos(this->pos());