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

fix 62ea90c and globe plugin

Browse Source
This commit is contained in:
Juergen E. Fischer 2016-09-19 23:24:50 +02:00
parent 172c12bdc3
commit b91d93e7c8
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/qgisapp.cpp
View File

@ -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() ) );
}
}

2
src/core/qgsdatasourceuri.h
View File

@ -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;

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

@ -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 )
{

3
src/providers/grass/qgsgrassgislib.cpp
View File

@ -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 )