|
|
@ -938,8 +938,6 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() |
|
|
|
if(mStrokesList.contains(id)) |
|
|
|
if(mStrokesList.contains(id)) |
|
|
|
shouldSkipSubElements = true; |
|
|
|
shouldSkipSubElements = true; |
|
|
|
|
|
|
|
|
|
|
|
QStringRef svgTransform = mXmlReader.attributes().value("transform"); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
mXmlReader.readNext(); |
|
|
|
mXmlReader.readNext(); |
|
|
|
while (!mXmlReader.atEnd()) |
|
|
|
while (!mXmlReader.atEnd()) |
|
|
|
{ |
|
|
|
{ |
|
|
@ -983,12 +981,6 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() |
|
|
|
group->destroy(false); |
|
|
|
group->destroy(false); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (!svgTransform.isNull()) { |
|
|
|
|
|
|
|
QMatrix itemMatrix = fromSvgTransform(svgTransform.toString()); |
|
|
|
|
|
|
|
group->setMatrix(itemMatrix); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return group; |
|
|
|
return group; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -1354,10 +1346,6 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(UBDocumentProxy* proxy, |
|
|
|
if(curElement.hasAttribute("locked")){ |
|
|
|
if(curElement.hasAttribute("locked")){ |
|
|
|
mXmlWriter.writeAttribute(UBSettings::uniboardDocumentNamespaceUri,"locked",curElement.attribute("locked")); |
|
|
|
mXmlWriter.writeAttribute(UBSettings::uniboardDocumentNamespaceUri,"locked",curElement.attribute("locked")); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (curElement.hasAttribute("transform")) |
|
|
|
|
|
|
|
mXmlWriter.writeAttribute("transform", curElement.attribute("transform")); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QDomElement curSubElement = curElement.firstChildElement(); |
|
|
|
QDomElement curSubElement = curElement.firstChildElement(); |
|
|
|
while (!curSubElement.isNull()) { |
|
|
|
while (!curSubElement.isNull()) { |
|
|
|
if (curSubElement.hasAttribute(aId)) { |
|
|
|
if (curSubElement.hasAttribute(aId)) { |
|
|
@ -1403,8 +1391,6 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistGroupToDom(QGraphicsItem *gro |
|
|
|
else |
|
|
|
else |
|
|
|
curGroupElement.setAttribute("locked", xmlFalse); |
|
|
|
curGroupElement.setAttribute("locked", xmlFalse); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
curGroupElement.setAttribute("transform", toSvgTransform(groupItem->sceneMatrix())); |
|
|
|
|
|
|
|
curParent->appendChild(curGroupElement); |
|
|
|
curParent->appendChild(curGroupElement); |
|
|
|
foreach (QGraphicsItem *item, groupItem->childItems()) { |
|
|
|
foreach (QGraphicsItem *item, groupItem->childItems()) { |
|
|
|
QUuid tmpUuid = UBGraphicsScene::getPersonalUuid(item); |
|
|
|
QUuid tmpUuid = UBGraphicsScene::getPersonalUuid(item); |
|
|
|