Mercurial > hg > svgui
diff layer/LogColourScale.cpp @ 1216:dc2af6616c83
Merge from branch 3.0-integration
author | Chris Cannam |
---|---|
date | Fri, 13 Jan 2017 10:29:50 +0000 |
parents | 5144d7185fb5 |
children | a34a2a25907c |
line wrap: on
line diff
--- a/layer/LogColourScale.cpp Fri Mar 04 12:23:31 2016 +0000 +++ b/layer/LogColourScale.cpp Fri Jan 13 10:29:50 2017 +0000 @@ -22,24 +22,24 @@ #include <cmath> -#include "view/View.h" +#include "LayerGeometryProvider.h" int -LogColourScale::getWidth(View *, +LogColourScale::getWidth(LayerGeometryProvider *, QPainter &paint) { return paint.fontMetrics().width("-000.00") + 15; } void -LogColourScale::paintVertical(View *v, +LogColourScale::paintVertical(LayerGeometryProvider *v, const ColourScaleLayer *layer, QPainter &paint, int /* x0 */, double minlog, double maxlog) { - int h = v->height(); + int h = v->getPaintHeight(); int n = 10;