Mercurial > hg > svgui
comparison layer/LogNumericalScale.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 "LogNumericalScale.h" | 16 #include "LogNumericalScale.h" |
17 #include "VerticalScaleLayer.h" | 17 #include "VerticalScaleLayer.h" |
18 #include "LayerGeometryProvider.h" | |
18 | 19 |
19 #include "base/LogRange.h" | 20 #include "base/LogRange.h" |
21 #include "base/ScaleTickIntervals.h" | |
20 | 22 |
21 #include <QPainter> | 23 #include <QPainter> |
22 | 24 |
23 #include <cmath> | 25 #include <cmath> |
24 | |
25 #include "LayerGeometryProvider.h" | |
26 | |
27 #include "base/ScaleTickIntervals.h" | |
28 | 26 |
29 int | 27 int |
30 LogNumericalScale::getWidth(LayerGeometryProvider *, | 28 LogNumericalScale::getWidth(LayerGeometryProvider *, |
31 QPainter &paint) | 29 QPainter &paint) |
32 { | 30 { |
78 } | 76 } |
79 | 77 |
80 prevy = y; | 78 prevy = y; |
81 } | 79 } |
82 } | 80 } |
81 |