Fix saving/loading of strokes' positions

Fixed issue that appeared with previous commit, where grouped strokes'
positions were sometimes saved and loaded incorrectly.

Strokes and their transforms should now be saved correctly whether they
are grouped or not

src/adaptors/UBSvgSubsetAdaptor.cpp

@@ -1145,11 +1145,6 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(UBDocumentProxy* proxy,
                 mXmlWriter.writeStartElement("g");
                 openStroke = currentStroke;
 
-                QMatrix matrix = item->sceneMatrix();
-
-                if (!matrix.isIdentity())
-                    mXmlWriter.writeAttribute("transform", toSvgTransform(matrix));
-
                 UBGraphicsStroke* stroke = dynamic_cast<UBGraphicsStroke* >(currentStroke);
 
                 if (stroke)
@@ -1170,6 +1165,10 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(UBDocumentProxy* proxy,
 
                         mXmlWriter.writeAttribute(UBSettings::uniboardDocumentNamespaceUri, "uuid", UBStringUtils::toCanonicalUuid(sg->uuid()));
 
+                        QMatrix matrix = sg->sceneMatrix();
+                        if (!matrix.isIdentity())
+                            mXmlWriter.writeAttribute("transform", toSvgTransform(matrix));
+
                         qDebug() << "Attributes written";
 
                         groupHoldsInfo = true;

src/domain/UBGraphicsStrokesGroup.cpp

@@ -173,7 +173,7 @@ UBItem* UBGraphicsStrokesGroup::deepCopy() const
         }
     }
     const_cast<UBGraphicsStrokesGroup*>(this)->setTransform(groupTransform);
-    copy->setTransform(sceneTransform());
+    copy->setTransform(groupTransform);
 
     return copy;
 }
@@ -184,6 +184,7 @@ void UBGraphicsStrokesGroup::copyItemParameters(UBItem *copy) const
     if(NULL != cp)
     {
         cp->setTransform(transform());
+        cp->setPos(pos());
 
         cp->setFlag(QGraphicsItem::ItemIsMovable, true);
         cp->setFlag(QGraphicsItem::ItemIsSelectable, true);