sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-06-19 00:02:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
Juergen E. Fischer 2016-07-24 23:04:36 +02:00
parent 0974f0b81b
commit 2b8b979216
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/globe/globe_plugin.cpp
View File

@ -363,7 +363,7 @@ void GlobePlugin::run()
osgEarth::TileSourceOptions opts;
opts.L2CacheSize() = 0;
opts.tileSize() = 128;
mTileSource = new QgsGlobeTileSource( mQGisIface->mapCanvas(), opts );
mTileSource = new QgsGlobeTileSource( opts );
osgEarth::ImageLayerOptions options( "QGIS" );
options.driver()->L2CacheSize() = 0;
@ -1024,7 +1024,7 @@ void GlobePlugin::rebuildQGISLayer()
osgEarth::TileSourceOptions opts;
opts.L2CacheSize() = 0;
opts.tileSize() = 128;
mTileSource = new QgsGlobeTileSource( mQGisIface->mapCanvas(), opts );
mTileSource = new QgsGlobeTileSource( opts );
osgEarth::ImageLayerOptions options( "QGIS" );
options.driver()->L2CacheSize() = 0;

3
src/plugins/globe/qgsglobefrustumhighlight.cpp
View File

@ -15,7 +15,6 @@
#include <qgsrubberband.h>
#include <qgsmapcanvas.h>
#include <qgsmaprenderer.h>
#include <osg/View>
#include <osgEarth/SpatialReference>
#include <osgEarth/Terrain>
@ -27,7 +26,7 @@ QgsGlobeFrustumHighlightCallback::QgsGlobeFrustumHighlightCallback( osg::View* v
, mView( view )
, mTerrain( terrain )
, mRubberBand( new QgsRubberBand( mapCanvas, Qgis::Polygon ) )
, mSrs( osgEarth::SpatialReference::create( mapCanvas->mapRenderer()->destinationCrs().toWkt().toStdString() ) )
, mSrs( osgEarth::SpatialReference::create( mapCanvas->mapSettings().destinationCrs().toWkt().toStdString() ) )
{
mRubberBand->setColor( color );
}

4
src/plugins/globe/qgsglobetilesource.cpp
View File

@ -22,7 +22,6 @@
#include "qgsglobetilesource.h"
#include "qgscoordinatetransform.h"
#include "qgslogger.h"
#include "qgsmapcanvas.h"
#include "qgsmaprenderercustompainterjob.h"
#include "qgsmaprendererparalleljob.h"
@ -215,9 +214,8 @@ void QgsGlobeTileUpdateManager::renderingFinished()
///////////////////////////////////////////////////////////////////////////////
QgsGlobeTileSource::QgsGlobeTileSource( QgsMapCanvas* canvas, const osgEarth::TileSourceOptions& options )
QgsGlobeTileSource::QgsGlobeTileSource( const osgEarth::TileSourceOptions& options )
: TileSource( options )
, mCanvas( canvas )
{
osgEarth::GeoExtent geoextent( osgEarth::SpatialReference::get( "wgs84" ), -180., -90., 180., 90. );
osgEarth::DataExtentList extents;

3
src/plugins/globe/qgsglobetilesource.h
View File

@ -109,7 +109,7 @@ class QgsGlobeTileUpdateManager : public QObject
class QgsGlobeTileSource : public osgEarth::TileSource
{
public:
QgsGlobeTileSource( QgsMapCanvas* canvas, const osgEarth::TileSourceOptions& options = osgEarth::TileSourceOptions() );
QgsGlobeTileSource( const osgEarth::TileSourceOptions& options = osgEarth::TileSourceOptions() );
Status initialize( const osgDB::Options *dbOptions ) override;
osg::Image* createImage( const osgEarth::TileKey& key, osgEarth::ProgressCallback* progress ) override;
osg::HeightField* createHeightField( const osgEarth::TileKey &/*key*/, osgEarth::ProgressCallback* /*progress*/ ) override { return 0; }
@ -125,7 +125,6 @@ class QgsGlobeTileSource : public osgEarth::TileSource
QMutex mTileListLock;
QList<QgsGlobeTileImage*> mTiles;
QgsMapCanvas* mCanvas;
QStringList mLayerSet;
QgsGlobeTileUpdateManager mTileUpdateManager;