|
|
@ -1025,6 +1025,8 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() |
|
|
|
UBGraphicsGroupContainerItem *curGroup = readGroup(); |
|
|
|
UBGraphicsGroupContainerItem *curGroup = readGroup(); |
|
|
|
if (curGroup) |
|
|
|
if (curGroup) |
|
|
|
groupContainer.append(curGroup); |
|
|
|
groupContainer.append(curGroup); |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
qDebug() << "this is an error"; |
|
|
|
} |
|
|
|
} |
|
|
|
else if (mXmlReader.name() == tElement) |
|
|
|
else if (mXmlReader.name() == tElement) |
|
|
|
{ |
|
|
|
{ |
|
|
@ -1042,7 +1044,10 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() |
|
|
|
} |
|
|
|
} |
|
|
|
else // item
|
|
|
|
else // item
|
|
|
|
{ |
|
|
|
{ |
|
|
|
groupContainer.append(curItem); |
|
|
|
if(curItem) |
|
|
|
|
|
|
|
groupContainer.append(curItem); |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
qDebug() << "this is an error"; |
|
|
|
} |
|
|
|
} |
|
|
|
}else { |
|
|
|
}else { |
|
|
|
mXmlReader.skipCurrentElement(); |
|
|
|
mXmlReader.skipCurrentElement(); |
|
|
@ -1078,7 +1083,10 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() |
|
|
|
if (pStrokesGroup) |
|
|
|
if (pStrokesGroup) |
|
|
|
{ |
|
|
|
{ |
|
|
|
QGraphicsItem *strokeGroup = qgraphicsitem_cast<QGraphicsItem *>(pStrokesGroup); |
|
|
|
QGraphicsItem *strokeGroup = qgraphicsitem_cast<QGraphicsItem *>(pStrokesGroup); |
|
|
|
groupContainer.append(strokeGroup); |
|
|
|
if(strokeGroup) |
|
|
|
|
|
|
|
groupContainer.append(strokeGroup); |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
qDebug() << "this is an error"; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -1126,6 +1134,9 @@ QGraphicsItem *UBSvgSubsetAdaptor::UBSvgSubsetReader::readElementFromGroup() |
|
|
|
QString uuid = id.right(QUuid().toString().size()); |
|
|
|
QString uuid = id.right(QUuid().toString().size()); |
|
|
|
result = mScene->itemForUuid(QUuid(uuid)); |
|
|
|
result = mScene->itemForUuid(QUuid(uuid)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(!result) |
|
|
|
|
|
|
|
qDebug() << "uuid " << uuid; |
|
|
|
|
|
|
|
|
|
|
|
mXmlReader.skipCurrentElement(); |
|
|
|
mXmlReader.skipCurrentElement(); |
|
|
|
mXmlReader.readNext(); |
|
|
|
mXmlReader.readNext(); |
|
|
|
|
|
|
|
|
|
|
|