Differential D6303 Diff 16118 src/lib/marble/geodata/graphicsitem/AbstractGeoPolygonGraphicsItem.cpp

Changeset View

Standalone View

View Options

src/lib/marble/geodata/graphicsitem/AbstractGeoPolygonGraphicsItem.cpp

Context not available.
12 12​
13#include "GeoDataLinearRing.h" 13​#include "GeoDataLinearRing.h"
14#include "GeoDataPolygon.h" 14​#include "GeoDataPolygon.h"
15​#include "GeoDataBuilding.h"
15#include "GeoPainter.h" 16​#include "GeoPainter.h"
16#include "GeoDataLatLonAltBox.h" 17​#include "GeoDataLatLonAltBox.h"
17#include "GeoDataStyle.h" 18​#include "GeoDataStyle.h"
Context not available.
36AbstractGeoPolygonGraphicsItem::AbstractGeoPolygonGraphicsItem(const GeoDataPlacemark *placemark, const GeoDataPolygon *polygon) : 37​AbstractGeoPolygonGraphicsItem::AbstractGeoPolygonGraphicsItem(const GeoDataPlacemark *placemark, const GeoDataPolygon *polygon) :
37 GeoGraphicsItem(placemark), 38​ GeoGraphicsItem(placemark),
38 m_polygon(polygon), 39​ m_polygon(polygon),
39 m_ring(0) 40​ m_ring(0),
41​ m_building(0)
40{ 42​{
41} 43​}
42 44​
43AbstractGeoPolygonGraphicsItem::AbstractGeoPolygonGraphicsItem(const GeoDataPlacemark *placemark, const GeoDataLinearRing *ring) : 45​AbstractGeoPolygonGraphicsItem::AbstractGeoPolygonGraphicsItem(const GeoDataPlacemark *placemark, const GeoDataLinearRing *ring) :
44 GeoGraphicsItem(placemark), 46​ GeoGraphicsItem(placemark),
45 m_polygon(0), 47​ m_polygon(0),
46 m_ring(ring) 48​ m_ring(ring),
49​ m_building(0)
50​{
51​}
52​
53​AbstractGeoPolygonGraphicsItem::AbstractGeoPolygonGraphicsItem(const GeoDataPlacemark *placemark, const GeoDataBuilding *building) :
54​ GeoGraphicsItem(placemark),
55​ m_polygon(0),
56​ m_ring(0),
57​ m_building(building)
47{ 58​{
48} 59​}
49 60​
Context not available.
53 64​
54const GeoDataLatLonAltBox& AbstractGeoPolygonGraphicsItem::latLonAltBox() const 65​const GeoDataLatLonAltBox& AbstractGeoPolygonGraphicsItem::latLonAltBox() const
55{ 66​{
56 if( m_polygon ) { 67​ if(m_polygon) {
57 return m_polygon->latLonAltBox(); 68​ return m_polygon->latLonAltBox();
69​ } else if (m_ring) {
70​ return m_ring->latLonAltBox();
58 } 71​ }
59 72​
60 return m_ring->latLonAltBox(); 73​ return m_building->latLonAltBox();
61} 74​}
62 75​
63void AbstractGeoPolygonGraphicsItem::paint( GeoPainter* painter, const ViewportParams* viewport, const QString &layer, int tileZoomLevel) 76​void AbstractGeoPolygonGraphicsItem::paint( GeoPainter* painter, const ViewportParams* viewport, const QString &layer, int tileZoomLevel)
Context not available.
210 return texture; 223​ return texture;
211} 224​}
212 225​
226​void AbstractGeoPolygonGraphicsItem::setLinearRing(GeoDataLinearRing *ring)
227​{
228​ Q_ASSERT(m_building);
nienhueserUnsubmitted
Done

Do we need to care (e.g. Q_ASSERT on) the value of m_polygon, m_building here? Same in setPolygon.

nienhueser: Do we need to care (e.g. Q_ASSERT on) the value of m_polygon, m_building here? Same in…
229​ Q_ASSERT(!m_polygon);
230​ m_ring = ring;
231​}
232​
233​void AbstractGeoPolygonGraphicsItem::setPolygon(GeoDataPolygon *polygon)
234​{
235​ Q_ASSERT(m_building);
236​ Q_ASSERT(!m_ring);
237​ m_polygon = polygon;
238​}
239​
213} 240​}
Context not available.