Mercurial > hg > svgui
diff 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 |
line wrap: on
line diff
--- a/layer/LinearNumericalScale.cpp Wed May 02 14:26:51 2018 +0100 +++ b/layer/LinearNumericalScale.cpp Thu May 03 15:24:14 2018 +0100 @@ -4,7 +4,7 @@ Sonic Visualiser An audio file viewer and annotation editor. Centre for Digital Music, Queen Mary, University of London. - This file copyright 2006-2013 Chris Cannam and QMUL. + This file copyright 2006-2018 Chris Cannam and QMUL. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -15,18 +15,17 @@ #include "LinearNumericalScale.h" #include "VerticalScaleLayer.h" +#include "LayerGeometryProvider.h" #include <QPainter> #include <cmath> -#include "LayerGeometryProvider.h" - #include "base/ScaleTickIntervals.h" int LinearNumericalScale::getWidth(LayerGeometryProvider *, - QPainter &paint) + QPainter &paint) { return paint.fontMetrics().width("-000.00") + 10; }