|
|
@ -428,7 +428,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() |
|
|
|
} |
|
|
|
} |
|
|
|
else if (mXmlReader.name() == "g") |
|
|
|
else if (mXmlReader.name() == "g") |
|
|
|
{ |
|
|
|
{ |
|
|
|
// Create new stroke, if its NULL or already has poligons
|
|
|
|
// Create new stroke, if its NULL or already has polygons
|
|
|
|
if (annotationGroup) |
|
|
|
if (annotationGroup) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (!annotationGroup->polygons().empty()) |
|
|
|
if (!annotationGroup->polygons().empty()) |
|
|
@ -439,6 +439,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() |
|
|
|
|
|
|
|
|
|
|
|
if(eDrawingMode_Vector == dc->drawingMode()){ |
|
|
|
if(eDrawingMode_Vector == dc->drawingMode()){ |
|
|
|
strokesGroup = new UBGraphicsStrokesGroup(); |
|
|
|
strokesGroup = new UBGraphicsStrokesGroup(); |
|
|
|
|
|
|
|
graphicsItemFromSvg(strokesGroup); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
QStringRef ubZValue = mXmlReader.attributes().value(mNamespaceUri, "z-value"); |
|
|
|
QStringRef ubZValue = mXmlReader.attributes().value(mNamespaceUri, "z-value"); |
|
|
@ -485,6 +486,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() |
|
|
|
|
|
|
|
|
|
|
|
if(eDrawingMode_Vector == dc->drawingMode()){ |
|
|
|
if(eDrawingMode_Vector == dc->drawingMode()){ |
|
|
|
if(strokesGroup){ |
|
|
|
if(strokesGroup){ |
|
|
|
|
|
|
|
polygonItem->setTransform(strokesGroup->transform()); |
|
|
|
strokesGroup->addToGroup(polygonItem); |
|
|
|
strokesGroup->addToGroup(polygonItem); |
|
|
|
} |
|
|
|
} |
|
|
|
}else{ |
|
|
|
}else{ |
|
|
@ -510,6 +512,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() |
|
|
|
|
|
|
|
|
|
|
|
if(eDrawingMode_Vector == dc->drawingMode()){ |
|
|
|
if(eDrawingMode_Vector == dc->drawingMode()){ |
|
|
|
if(strokesGroup){ |
|
|
|
if(strokesGroup){ |
|
|
|
|
|
|
|
polygonItem->setTransform(strokesGroup->transform()); |
|
|
|
strokesGroup->addToGroup(polygonItem); |
|
|
|
strokesGroup->addToGroup(polygonItem); |
|
|
|
} |
|
|
|
} |
|
|
|
}else{ |
|
|
|
}else{ |
|
|
@ -838,6 +841,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() |
|
|
|
{ |
|
|
|
{ |
|
|
|
if(strokesGroup && scene){ |
|
|
|
if(strokesGroup && scene){ |
|
|
|
scene->addItem(strokesGroup); |
|
|
|
scene->addItem(strokesGroup); |
|
|
|
|
|
|
|
//graphicsItemFromSvg(strokesGroup);
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (annotationGroup) |
|
|
|
if (annotationGroup) |
|
|
|