Mercurial > hg > svgui
comparison layer/Colour3DPlotLayer.cpp @ 1077:5144d7185fb5 spectrogram-minor-refactor
Move LayerGeometryProvider from view to layer
author | Chris Cannam |
---|---|
date | Thu, 30 Jun 2016 10:59:11 +0100 |
parents | 38a53c7b81f6 |
children | ee01a4062747 |
comparison
equal
deleted
inserted
replaced
1076:e536dfc6b250 | 1077:5144d7185fb5 |
---|---|
13 COPYING included with this distribution for more information. | 13 COPYING included with this distribution for more information. |
14 */ | 14 */ |
15 | 15 |
16 #include "Colour3DPlotLayer.h" | 16 #include "Colour3DPlotLayer.h" |
17 | 17 |
18 #include "view/View.h" | |
19 #include "base/Profiler.h" | 18 #include "base/Profiler.h" |
20 #include "base/LogRange.h" | 19 #include "base/LogRange.h" |
21 #include "base/RangeMapper.h" | 20 #include "base/RangeMapper.h" |
21 | |
22 #include "ColourMapper.h" | 22 #include "ColourMapper.h" |
23 #include "LayerGeometryProvider.h" | |
24 | |
25 #include "view/ViewManager.h" | |
23 | 26 |
24 #include <QPainter> | 27 #include <QPainter> |
25 #include <QImage> | 28 #include <QImage> |
26 #include <QRect> | 29 #include <QRect> |
27 #include <QTextStream> | 30 #include <QTextStream> |
862 m.translate(cw - 6, ch + 10); | 865 m.translate(cw - 6, ch + 10); |
863 m.rotate(-90); | 866 m.rotate(-90); |
864 | 867 |
865 paint.setWorldMatrix(m); | 868 paint.setWorldMatrix(m); |
866 | 869 |
867 v->drawVisibleText(paint, 2, 0, minstr, View::OutlinedText); | 870 v->drawVisibleText(paint, 2, 0, minstr, LayerGeometryProvider::OutlinedText); |
868 | 871 |
869 m.translate(ch - msw - 2, 0); | 872 m.translate(ch - msw - 2, 0); |
870 paint.setWorldMatrix(m); | 873 paint.setWorldMatrix(m); |
871 | 874 |
872 v->drawVisibleText(paint, 0, 0, maxstr, View::OutlinedText); | 875 v->drawVisibleText(paint, 0, 0, maxstr, LayerGeometryProvider::OutlinedText); |
873 | 876 |
874 paint.restore(); | 877 paint.restore(); |
875 } | 878 } |
876 | 879 |
877 paint.setPen(v->getForeground()); | 880 paint.setPen(v->getForeground()); |
1440 v->drawVisibleText | 1443 v->drawVisibleText |
1441 (paint, | 1444 (paint, |
1442 rx0 + 2, | 1445 rx0 + 2, |
1443 ry0 - h / sh - 1 + 2 + paint.fontMetrics().ascent(), | 1446 ry0 - h / sh - 1 + 2 + paint.fontMetrics().ascent(), |
1444 text, | 1447 text, |
1445 View::OutlinedText); | 1448 LayerGeometryProvider::OutlinedText); |
1446 } | 1449 } |
1447 } | 1450 } |
1448 } | 1451 } |
1449 } | 1452 } |
1450 } | 1453 } |