comparison layer/LinearNumericalScale.cpp @ 1281:fc9d9f1103fa horizontal-scale

Provide linear horizontal scale in spectrum as well as log; fix bin positioning and colour scale property box updating; ensure proper background colour and visibility of peak lines
author Chris Cannam
date Thu, 03 May 2018 15:15:15 +0100
parents b4cb11ca8233
children f2525e6cbdf1
comparison
equal deleted inserted replaced
1280:34394e8c2942 1281:fc9d9f1103fa
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 bool horizontal)
31 { 29 {
32 if (horizontal) { 30 return paint.fontMetrics().width("-000.00") + 10;
33 return paint.fontMetrics().height() + 10;
34 } else {
35 return paint.fontMetrics().width("-000.00") + 10;
36 }
37 } 31 }
38 32
39 void 33 void
40 LinearNumericalScale::paintVertical(LayerGeometryProvider *v, 34 LinearNumericalScale::paintVertical(LayerGeometryProvider *v,
41 const VerticalScaleLayer *layer, 35 const VerticalScaleLayer *layer,