diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index 6054573b..3aa28859 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -574,7 +574,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() else group = mStrokesList.value(parentId); - polygonItem->setTransform(group->transform()); + if(polygonItem->transform().isIdentity()) + polygonItem->setTransform(group->transform()); group->addToGroup(polygonItem); polygonItem->setStrokesGroup(group); polygonItem->setStroke(currentStroke); @@ -604,7 +605,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() else group = mStrokesList.value(parentId); - polygonItem->setTransform(group->transform()); + if(polygonItem->transform().isIdentity()) + polygonItem->setTransform(group->transform()); group->addToGroup(polygonItem); polygonItem->setStrokesGroup(group); polygonItem->setStroke(currentStroke); @@ -1700,18 +1702,6 @@ UBGraphicsPolygonItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::polygonItemFromPol if (!svgPoints.isNull()) { -// int lenght = strlen(svgPoints.toUtf8().constData()) + 1; -// char pippo[lenght]; -// memcpy(pippo,svgPoints.toUtf8().constData(),lenght); -// char* localPosition = (char*) &pippo[0]; -// do{ -// float x = atof(localPosition); -// localPosition = strchr(localPosition,',') + 1; -// float y = atof(localPosition); -// localPosition = strchrnul(localPosition,' '); -// polygon << QPointF(x,y); -// }while(localPosition - pippo > lenght - 5); - QStringList ts = svgPoints.toString().split(QLatin1Char(' '), QString::SkipEmptyParts); diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp index b358b32c..c4d7cfc2 100644 --- a/src/core/UBApplicationController.cpp +++ b/src/core/UBApplicationController.cpp @@ -68,9 +68,9 @@ #include "core/memcheck.h" -UBApplicationController::UBApplicationController(UBBoardView *pControlView, +UBApplicationController::UBApplicationController(UBBoardView *pControlView, UBBoardView *pDisplayView, - UBMainWindow* pMainWindow, + UBMainWindow* pMainWindow, QObject* parent, UBRightPalette* rightPalette) : QObject(parent) @@ -371,7 +371,7 @@ void UBApplicationController::showBoard() UBPlatformUtils::setDesktopMode(false); mUninoteController->hideWindow(); - + mMainWindow->show(); emit mainModeChanged(Board); @@ -543,12 +543,12 @@ void UBApplicationController::showSankoreEditor() void UBApplicationController::checkUpdate() { - if(mHttp) - delete mHttp; - QUrl url("http://ftp.open-sankore.org/update.json"); - mHttp = new QHttp(url.host()); - connect(mHttp, SIGNAL(requestFinished(int,bool)), this, SLOT(updateRequestFinished(int,bool))); - mHttp->get(url.path()); +// if(mHttp) +// delete mHttp; +// QUrl url("http://ftp.open-sankore.org/update.json"); +// mHttp = new QHttp(url.host()); +// connect(mHttp, SIGNAL(requestFinished(int,bool)), this, SLOT(updateRequestFinished(int,bool))); +// mHttp->get(url.path()); } void UBApplicationController::updateRequestFinished(int id, bool error)