Skip to content
Permalink
Browse files

fix 62ea90c and globe plugin

  • Loading branch information
jef-n committed Sep 19, 2016
1 parent 172c12b commit b91d93e7c8705e38e308dcb6b81061e60608afff
@@ -5090,7 +5090,8 @@ void QgisApp::dxfExport()
//extent
if ( d.exportMapExtent() )
{
dxfExport.setExtent( mapCanvas()->extent() );
QgsCoordinateTransform t( mapCanvas()->mapSettings().destinationCrs(), QgsCoordinateReferenceSystem( d.crs(), QgsCoordinateReferenceSystem::InternalCrsId ) );
dxfExport.setExtent( t.transformBoundingBox( mapCanvas()->extent() ) );
}
}

@@ -238,7 +238,7 @@ class CORE_EXPORT QgsDataSourceUri
bool mUseEstimatedMetadata;
//! Disable SelectAtId capability (eg. to trigger the attribute table memory model for expensive views)
bool mSelectAtIdDisabled;
//! geometry type (or QGis::WKBUnknown if not specified)
//! geometry type (or QgsWkbTypes::Unknown if not specified)
QgsWkbTypes::Type mWkbType;
//! SRID or a null string if not specified
QString mSrid;
@@ -51,7 +51,7 @@ class CORE_EXPORT QgsProperty
QgsProperty()
{}

virtual ~ QgsProperty()
virtual ~QgsProperty()
{}

/** Dumps out the keys and values
@@ -190,7 +190,7 @@ class CORE_EXPORT QgsPropertyKey : public QgsProperty
{
public:
QgsPropertyKey( const QString &name = "" );
virtual ~ QgsPropertyKey();
virtual ~QgsPropertyKey();

/// every key has a name
// @{
@@ -213,7 +213,7 @@ class CORE_EXPORT QgsFeatureRenderer
* @param context render context
* @note added in QGIS 2.12
*/
virtual QgsSymbolList symbols( QgsRenderContext& context ) { Q_UNUSED( context ); return QgsSymbolList(); }
virtual QgsSymbolList symbols( QgsRenderContext& context ) { Q_UNUSED( context ); return QgsSymbolList(); }

bool usingSymbolLevels() const { return mUsingSymbolLevels; }
void setUsingSymbolLevels( bool usingSymbolLevels ) { mUsingSymbolLevels = usingSymbolLevels; }
@@ -777,9 +777,10 @@ void GlobePlugin::addModelLayer( QgsVectorLayer* vLayer, QgsGlobeVectorLayerConf
featureOpt.setLayer( vLayer );
osgEarth::Style style;

if ( !vLayer->renderer()->symbols().isEmpty() )
QgsRenderContext ctx;
if ( !vLayer->renderer()->symbols( ctx ).isEmpty() )
{
Q_FOREACH ( QgsSymbol* sym, vLayer->renderer()->symbols() )
Q_FOREACH ( QgsSymbol* sym, vLayer->renderer()->symbols( ctx ) )
{
if ( sym->type() == QgsSymbol::Line )
{
@@ -40,6 +40,7 @@ extern "C"
#include "qgsgeometry.h"
#include "qgsrectangle.h"
#include "qgsconfig.h"
#include "qgsunittypes.h"

#include <QByteArray>
#include <QFileDialog>
@@ -1060,7 +1061,7 @@ int GRASS_LIB_EXPORT G_get_cellhd( const char *name, const char *mapset, struct

double QgsGrassGisLib::G_database_units_to_meters_factor( void )
{
return QGis::fromUnitToUnitFactor( mCrs.mapUnits(), Qgis::Meters );
return QgsUnitTypes::fromUnitToUnitFactor( mCrs.mapUnits(), QgsUnitTypes::DistanceMeters );
}

double QgsGrassGisLib::G_area_of_cell_at_row( int row )

0 comments on commit b91d93e

Please sign in to comment.