Mercurial > hg > svgui

comparison layer/LinearColourScale.cpp @ 1216:dc2af6616c83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch 3.0-integration
author Chris Cannam
date Fri, 13 Jan 2017 10:29:50 +0000
parents 5144d7185fb5
children a34a2a25907c
comparison
equal deleted inserted replaced
1048:e8102ff5573b 1216:dc2af6616c83
18 18
19 #include <QPainter> 19 #include <QPainter>
20 20
21 #include <cmath> 21 #include <cmath>
22 22
23 #include "view/View.h" 23 #include "LayerGeometryProvider.h"
24 24
25 int 25 int
26 LinearColourScale::getWidth(View *, 26 LinearColourScale::getWidth(LayerGeometryProvider *,
27 QPainter &paint) 27 QPainter &paint)
28 { 28 {
29 return paint.fontMetrics().width("-000.00") + 15; 29 return paint.fontMetrics().width("-000.00") + 15;
30 } 30 }
31 31
32 void 32 void
33 LinearColourScale::paintVertical(View *v, 33 LinearColourScale::paintVertical(LayerGeometryProvider *v,
34 const ColourScaleLayer *layer, 34 const ColourScaleLayer *layer,
35 QPainter &paint, 35 QPainter &paint,
36 int /* x0 */, 36 int /* x0 */,
37 double min, 37 double min,
38 double max) 38 double max)
39 { 39 {
40 int h = v->height(); 40 int h = v->getPaintHeight();
41 41
42 int n = 10; 42 int n = 10;
43 43
44 double val = min; 44 double val = min;
45 double inc = (max - val) / n; 45 double inc = (max - val) / n;