src/canvas.cpp

changeset 1313
4baed9f54de3
parent 1283
3c3a5eb965f7
child 1318
568fcfc6da71
--- a/src/canvas.cpp	Fri Mar 23 19:30:53 2018 +0200
+++ b/src/canvas.cpp	Fri Mar 23 21:30:24 2018 +0200
@@ -96,8 +96,8 @@
 	{
 	case Grid::Cartesian:
 		{
-			qreal x0 = sign(topLeft.x()) * (fabs(topLeft.x()) - fmod(fabs(topLeft.x()), gridSize));
-			qreal y0 = sign(topLeft.y()) * (fabs(topLeft.y()) - fmod(fabs(topLeft.y()), gridSize));
+			qreal x0 = sign(topLeft.x) * (fabs(topLeft.x) - fmod(fabs(topLeft.x), gridSize));
+			qreal y0 = sign(topLeft.y) * (fabs(topLeft.y) - fmod(fabs(topLeft.y), gridSize));
 
 			static const auto prepareGridLine = [](qreal value) -> bool
 			{
@@ -116,7 +116,7 @@
 				}
 			};
 
-			for (qreal x = x0; x < bottomRight.x(); x += gridSize)
+			for (qreal x = x0; x < bottomRight.x; x += gridSize)
 			{
 				if (prepareGridLine(x))
 				{
@@ -125,7 +125,7 @@
 				}
 			}
 
-			for (qreal y = y0; y < bottomRight.y(); y += gridSize)
+			for (qreal y = y0; y < bottomRight.y; y += gridSize)
 			{
 				if (prepareGridLine(y))
 				{
@@ -142,10 +142,10 @@
 			const qreal size = grid()->coordinateSnap();
 			Vertex topLeft = currentCamera().idealize(currentCamera().convert2dTo3d({0, 0}));
 			Vertex bottomRight = currentCamera().idealize(currentCamera().convert2dTo3d({width(), height()}));
-			QPointF topLeft2d {topLeft.x(), topLeft.y()};
-			QPointF bottomLeft2d {topLeft.x(), bottomRight.y()};
-			QPointF bottomRight2d {bottomRight.x(), bottomRight.y()};
-			QPointF topRight2d {bottomRight.x(), topLeft.y()};
+			QPointF topLeft2d {topLeft.x, topLeft.y};
+			QPointF bottomLeft2d {topLeft.x, bottomRight.y};
+			QPointF bottomRight2d {bottomRight.x, bottomRight.y};
+			QPointF topRight2d {bottomRight.x, topLeft.y};
 			qreal smallestRadius = distanceFromPointToRectangle(pole, QRectF{topLeft2d, bottomRight2d});
 			qreal largestRadius = max(QLineF {topLeft2d, pole}.length(),
 			                          QLineF {bottomLeft2d, pole}.length(),

mercurial