Mercurial > hg > svgui

diff layer/LogNumericalScale.cpp @ 997:296ccd36f626 tony-2.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge through to branch for Tony 2.0
author Chris Cannam
date Thu, 20 Aug 2015 14:54:21 +0100
parents 4fe7a09be0fe
children 5144d7185fb5
line wrap: on
line diff
--- a/layer/LogNumericalScale.cpp	Mon Apr 13 13:52:05 2015 +0100
+++ b/layer/LogNumericalScale.cpp	Thu Aug 20 14:54:21 2015 +0100
@@ -27,14 +27,14 @@
 //#define DEBUG_TIME_VALUE_LAYER 1
 
 int
-LogNumericalScale::getWidth(View *,
+LogNumericalScale::getWidth(LayerGeometryProvider *,
 			    QPainter &paint)
 {
     return paint.fontMetrics().width("-000.00") + 10;
 }
 
 void
-LogNumericalScale::paintVertical(View *v,
+LogNumericalScale::paintVertical(LayerGeometryProvider *v,
 				 const VerticalScaleLayer *layer,
 				 QPainter &paint,
 				 int x0,
@@ -79,7 +79,7 @@
         bool drawText = true;
 
 	if (i == n-1 &&
-	    v->height() < paint.fontMetrics().height() * (n*2)) {
+	    v->getPaintHeight() < paint.fontMetrics().height() * (n*2)) {
 	    if (layer->getScaleUnits() != "") drawText = false;
 	}