From 05fc799d649e0662ac78d02d552a8a3c9cf57f9e Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Mon, 29 Aug 2011 12:11:05 +0300 Subject: [PATCH 1/2] UBZ file import-export: MAC OS fix --- src/adaptors/UBSvgSubsetAdaptor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index 692cba14..aee459d8 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -1896,7 +1896,7 @@ void UBSvgSubsetAdaptor::UBSvgSubsetReader::graphicsItemFromSvg(QGraphicsItem* g { if (!svgX.isNull() && !svgY.isNull()) { - #ifndef Q_WS_X11 + #ifdef Q_WS_WIN gItem->setPos(svgX.toString().toFloat(), svgY.toString().toFloat()); #endif } From 00f1f768d3d28352072467a428b2d1f04509a7e5 Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Mon, 29 Aug 2011 12:15:48 +0300 Subject: [PATCH 2/2] SANKORE-229: Internal application:Compass :Degree label image isn't displayed --- src/tools/UBGraphicsCompass.cpp | 2 +- src/tools/UBGraphicsProtractor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/UBGraphicsCompass.cpp b/src/tools/UBGraphicsCompass.cpp index 644f9a40..d0374c11 100644 --- a/src/tools/UBGraphicsCompass.cpp +++ b/src/tools/UBGraphicsCompass.cpp @@ -361,7 +361,7 @@ void UBGraphicsCompass::paintAngleDisplay(QPainter *painter) qreal angle = angleInDegrees(); qreal angleValue = mDrawing ? - mSpanAngleInDegrees : angle; - QString angleText = QString("%1").arg(angleValue, 0, 'f', 1) + "°"; + QString angleText = QString("%1").arg(angleValue, 0, 'f', 1) + "°"; painter->save(); painter->setFont(font()); diff --git a/src/tools/UBGraphicsProtractor.cpp b/src/tools/UBGraphicsProtractor.cpp index b970b0b5..b75c2689 100644 --- a/src/tools/UBGraphicsProtractor.cpp +++ b/src/tools/UBGraphicsProtractor.cpp @@ -508,7 +508,7 @@ void UBGraphicsProtractor::paintAngleMarker(QPainter *painter) if (angle != 0) { - QString ang = QString("%1°").arg(angle,0, 'f', 1); + QString ang = QString("%1?°").arg(angle,0, 'f', 1); QFont font2 = painter->font(); font2.setBold(true); QFontMetricsF fm2(font2);