From 43407ddd0cc2bde79261c90e2dbc34e1b45277f1 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Tue, 20 Nov 2012 14:31:28 +0100 Subject: [PATCH] fixed url for label --- resources/etc/Tutorial/tutorial_en/index.html | 2 +- resources/etc/Tutorial/tutorial_fr/index.html | 2 +- src/adaptors/UBSvgSubsetAdaptor.cpp | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/resources/etc/Tutorial/tutorial_en/index.html b/resources/etc/Tutorial/tutorial_en/index.html index 014d6229..c47a787d 100644 --- a/resources/etc/Tutorial/tutorial_en/index.html +++ b/resources/etc/Tutorial/tutorial_en/index.html @@ -45,7 +45,7 @@ body {
-

+

The user manual
diff --git a/resources/etc/Tutorial/tutorial_fr/index.html b/resources/etc/Tutorial/tutorial_fr/index.html index b644c48a..66467cf7 100644 --- a/resources/etc/Tutorial/tutorial_fr/index.html +++ b/resources/etc/Tutorial/tutorial_fr/index.html @@ -45,7 +45,7 @@ body {
-

+

Le manuel d'utilisation
diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index de43189f..5435b8e9 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -1025,6 +1025,8 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() UBGraphicsGroupContainerItem *curGroup = readGroup(); if (curGroup) groupContainer.append(curGroup); + else + qDebug() << "this is an error"; } else if (mXmlReader.name() == tElement) { @@ -1042,7 +1044,10 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() } else // item { - groupContainer.append(curItem); + if(curItem) + groupContainer.append(curItem); + else + qDebug() << "this is an error"; } }else { mXmlReader.skipCurrentElement(); @@ -1078,7 +1083,10 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() if (pStrokesGroup) { QGraphicsItem *strokeGroup = qgraphicsitem_cast(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()); result = mScene->itemForUuid(QUuid(uuid)); + if(!result) + qDebug() << "uuid " << uuid; + mXmlReader.skipCurrentElement(); mXmlReader.readNext();