Skip to content
Permalink
Browse files

fix build

  • Loading branch information
jef-n committed Jul 22, 2016
1 parent 2fbb617 commit aa0b94a7c84ea62c9792c0296c26399337169b4c
@@ -95,13 +95,13 @@ osgEarth::Features::Geometry::Type QgsGlobeFeatureSource::getGeometryType() cons
{
switch ( mLayer->geometryType() )
{
case QGis::Point:
case Qgis::Point:
return osgEarth::Features::Geometry::TYPE_POINTSET;

case QGis::Line:
case Qgis::Line:
return osgEarth::Features::Geometry::TYPE_LINESTRING;

case QGis::Polygon:
case Qgis::Polygon:
return osgEarth::Features::Geometry::TYPE_POLYGON;

default:
@@ -101,7 +101,7 @@ class QgsGlobeFeatureUtils
return pointSet;
}

case QGis::WKBMultiPoint:
case Qgis::WKBMultiPoint:
{
osgEarth::Features::PointSet* pointSet = new osgEarth::Features::PointSet();
QgsMultiPointV2* multiPoint = static_cast<QgsMultiPointV2*>( geom.geometry() );
@@ -25,7 +25,7 @@
#include <osgEarth/Registry>

QgsGlobeFeatureIdentifyCallback::QgsGlobeFeatureIdentifyCallback( QgsMapCanvas* mapCanvas )
: mCanvas( mapCanvas ), mRubberBand( new QgsRubberBand( mapCanvas, QGis::Polygon ) )
: mCanvas( mapCanvas ), mRubberBand( new QgsRubberBand( mapCanvas, Qgis::Polygon ) )
{
QColor color( Qt::green );
color.setAlpha( 190 );
@@ -66,7 +66,7 @@ void QgsGlobeFeatureIdentifyCallback::onHit( osgEarth::ObjectID id )
if ( feat.isValid() )
mRubberBand->setToGeometry( feat.geometry(), lyr );
else
mRubberBand->reset( QGis::Polygon );
mRubberBand->reset( Qgis::Polygon );
}
}
else
@@ -82,5 +82,5 @@ void QgsGlobeFeatureIdentifyCallback::onMiss( const EventArgs &/*args*/ )
void QgsGlobeFeatureIdentifyCallback::onMiss()
#endif
{
mRubberBand->reset( QGis::Polygon );
mRubberBand->reset( Qgis::Polygon );
}
@@ -26,7 +26,7 @@ QgsGlobeFrustumHighlightCallback::QgsGlobeFrustumHighlightCallback( osg::View* v
: osg::NodeCallback()
, mView( view )
, mTerrain( terrain )
, mRubberBand( new QgsRubberBand( mapCanvas, QGis::Polygon ) )
, mRubberBand( new QgsRubberBand( mapCanvas, Qgis::Polygon ) )
, mSrs( osgEarth::SpatialReference::create( mapCanvas->mapRenderer()->destinationCrs().toWkt().toStdString() ) )
{
mRubberBand->setColor( color );
@@ -49,7 +49,7 @@ void QgsGlobeFrustumHighlightCallback::operator()( osg::Node*, osg::NodeVisitor*
mTerrain->getWorldCoordsUnderMouse( mView, width - 1, height - 1, corners[2] );
mTerrain->getWorldCoordsUnderMouse( mView, width - 1, 0, corners[3] );

mRubberBand->reset( QGis::Polygon );
mRubberBand->reset( Qgis::Polygon );
for ( int i = 0; i < 4; i++ )
{
osg::Vec3d localCoords;
@@ -99,14 +99,14 @@ QgsMapSettings QgsGlobeTileImage::createSettings( int dpi , const QStringList &l
{
QgsMapSettings settings;
settings.setBackgroundColor( QColor( Qt::transparent ) );
settings.setDestinationCrs( QgsCRSCache::instance()->crsByAuthId( GEO_EPSG_CRS_AUTHID ) );
settings.setDestinationCrs( QgsCrsCache::instance()->crsByAuthId( GEO_EPSG_CRS_AUTHID ) );
settings.setCrsTransformEnabled( true );
settings.setExtent( mTileExtent );
settings.setLayers( layerSet );
settings.setFlag( QgsMapSettings::DrawEditingInfo, false );
settings.setFlag( QgsMapSettings::DrawLabeling, false );
settings.setFlag( QgsMapSettings::DrawSelection, false );
settings.setMapUnits( QGis::Degrees );
settings.setMapUnits( Qgis::Degrees );
settings.setOutputSize( QSize( mTileSize, mTileSize ) );
settings.setOutputImageFormat( QImage::Format_ARGB32_Premultiplied );
settings.setOutputDpi( dpi );
@@ -25,6 +25,7 @@

class QgsGlobeVectorLayerConfig;
class QgsMapLayer;
class QgsVectorLayer;
class QDomDocument;
class QDomElement;
class QListWidgetItem;

0 comments on commit aa0b94a

Please sign in to comment.
You can’t perform that action at this time.