comparison layer/LinearNumericalScale.cpp @ 1282:f90a3c2f2930

Merge from branch horizontal-scale
author Chris Cannam
date Thu, 03 May 2018 15:24:14 +0100
parents fc9d9f1103fa
children f2525e6cbdf1
comparison
equal deleted inserted replaced
1279:a04f1012fca2 1282:f90a3c2f2930
2 2
3 /* 3 /*
4 Sonic Visualiser 4 Sonic Visualiser
5 An audio file viewer and annotation editor. 5 An audio file viewer and annotation editor.
6 Centre for Digital Music, Queen Mary, University of London. 6 Centre for Digital Music, Queen Mary, University of London.
7 This file copyright 2006-2013 Chris Cannam and QMUL. 7 This file copyright 2006-2018 Chris Cannam and QMUL.
8 8
9 This program is free software; you can redistribute it and/or 9 This program is free software; you can redistribute it and/or
10 modify it under the terms of the GNU General Public License as 10 modify it under the terms of the GNU General Public License as
11 published by the Free Software Foundation; either version 2 of the 11 published by the Free Software Foundation; either version 2 of the
12 License, or (at your option) any later version. See the file 12 License, or (at your option) any later version. See the file
13 COPYING included with this distribution for more information. 13 COPYING included with this distribution for more information.
14 */ 14 */
15 15
16 #include "LinearNumericalScale.h" 16 #include "LinearNumericalScale.h"
17 #include "VerticalScaleLayer.h" 17 #include "VerticalScaleLayer.h"
18 #include "LayerGeometryProvider.h"
18 19
19 #include <QPainter> 20 #include <QPainter>
20 21
21 #include <cmath> 22 #include <cmath>
22 23
23 #include "LayerGeometryProvider.h"
24
25 #include "base/ScaleTickIntervals.h" 24 #include "base/ScaleTickIntervals.h"
26 25
27 int 26 int
28 LinearNumericalScale::getWidth(LayerGeometryProvider *, 27 LinearNumericalScale::getWidth(LayerGeometryProvider *,
29 QPainter &paint) 28 QPainter &paint)
30 { 29 {
31 return paint.fontMetrics().width("-000.00") + 10; 30 return paint.fontMetrics().width("-000.00") + 10;
32 } 31 }
33 32
34 void 33 void