Differential D2282 Diff 5489 src/lib/marble/layers/PlacemarkLayer.cpp

Changeset View

Standalone View

View Options

src/lib/marble/layers/PlacemarkLayer.cpp

Show All 38 Lines36{
39 39​
40 connect( &m_layout, SIGNAL(repaintNeeded()), SIGNAL(repaintNeeded()) ); 40​ connect( &m_layout, SIGNAL(repaintNeeded()), SIGNAL(repaintNeeded()) );
41} 41​}
42 42​
43PlacemarkLayer::~PlacemarkLayer() 43​PlacemarkLayer::~PlacemarkLayer()
44{ 44​{
45} 45​}
46 46​
47QStringList PlacemarkLayer::renderPosition() const 47​RenderPositions PlacemarkLayer::renderPositions() const
48{ 48​{
49 return QStringList() << "HOVERS_ABOVE_SURFACE"; 49​ return HoversAboveSurfaceRenderPosition;
50} 50​}
51 51​
52qreal PlacemarkLayer::zValue() const 52​qreal PlacemarkLayer::zValue() const
53{ 53​{
54 return 2.0; 54​ return 2.0;
55} 55​}
56 56​
57bool PlacemarkLayer::render( GeoPainter *geoPainter, ViewportParams *viewport, 57​bool PlacemarkLayer::render(GeoPainter *geoPainter, ViewportParams *viewport,
58 const QString &renderPos, GeoSceneLayer *layer ) 58​ RenderPosition renderPos, GeoSceneLayer *layer)
59{ 59​{
60 Q_UNUSED( renderPos ) 60​ Q_UNUSED( renderPos )
61 Q_UNUSED( layer ) 61​ Q_UNUSED( layer )
62 62​
63 QVector<VisiblePlacemark*> visiblePlacemarks = m_layout.generateLayout( viewport ); 63​ QVector<VisiblePlacemark*> visiblePlacemarks = m_layout.generateLayout( viewport );
64 // draw placemarks less important first 64​ // draw placemarks less important first
65 QVector<VisiblePlacemark*>::const_iterator visit = visiblePlacemarks.constEnd(); 65​ QVector<VisiblePlacemark*>::const_iterator visit = visiblePlacemarks.constEnd();
66 QVector<VisiblePlacemark*>::const_iterator itEnd = visiblePlacemarks.constBegin(); 66​ QVector<VisiblePlacemark*>::const_iterator itEnd = visiblePlacemarks.constBegin();
▲ Show 20 Lines • Show All 130 Lines • Show Last 20 Lines