Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/rouault/Quantum-GIS

  • Loading branch information
jef-n committed Oct 5, 2012
2 parents 189b066 + 603f35c commit ec5ed50c843f9d065cd2269b01563e9272c6ba5c
@@ -81,6 +81,7 @@ QgsLegend::QgsLegend( QgsMapCanvas *canvas, QWidget * parent, const char *name )
, mMapCanvas( canvas )
, mMinimumIconSize( 20, 20 )
, mChanging( false )
, mUpdateDrawingOrder( false )
{
setObjectName( name );

@@ -66,11 +66,14 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *pa
QGis::UnitType myUnit = myRenderer->mapUnits();
setMapUnits( myUnit );

// we need to initialize it, since the on_cbxProjectionEnabled_stateChanged()
// callback triggered by setChecked() might use it.
mProjectSrsId = myRenderer->destinationCrs().srsid();

//see if the user wants on the fly projection enabled
bool myProjectionEnabled = myRenderer->hasCrsTransformEnabled();
cbxProjectionEnabled->setChecked( myProjectionEnabled );

mProjectSrsId = myRenderer->destinationCrs().srsid();
QgsDebugMsg( "Read project CRSID: " + QString::number( mProjectSrsId ) );
projectionSelector->setSelectedCrsId( mProjectSrsId );
projectionSelector->setEnabled( myProjectionEnabled );
@@ -47,27 +47,39 @@ CUSTOM_CRS_VALIDATION QgsCoordinateReferenceSystem::mCustomSrsValidation = NULL;
//--------------------------

QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem()
: mMapUnits( QGis::UnknownUnit )
: mSrsId( 0 )
, mGeoFlag( false )
, mMapUnits( QGis::UnknownUnit )
, mSRID( 0 )
, mIsValidFlag( 0 )
, mValidationHint( "" )
, mAxisInverted( false)
{
mCRS = OSRNewSpatialReference( NULL );
}

QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem( QString theDefinition )
: mMapUnits( QGis::UnknownUnit )
: mSrsId( 0 )
, mGeoFlag( false )
, mMapUnits( QGis::UnknownUnit )
, mSRID( 0 )
, mIsValidFlag( 0 )
, mValidationHint( "" )
, mAxisInverted( false)
{
mCRS = OSRNewSpatialReference( NULL );
createFromString( theDefinition );
}


QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem( const long theId, CrsType theType )
: mMapUnits( QGis::UnknownUnit )
: mSrsId( 0 )
, mGeoFlag( false )
, mMapUnits( QGis::UnknownUnit )
, mSRID( 0 )
, mIsValidFlag( 0 )
, mValidationHint( "" )
, mAxisInverted( false)
{
mCRS = OSRNewSpatialReference( NULL );
createFromId( theId, theType );
@@ -43,6 +43,7 @@

QgsMapRenderer::QgsMapRenderer()
{
mScale = 1;
mScaleCalculator = new QgsScaleCalculator;
mDistArea = new QgsDistanceArea;
mCachedTrForLayer = 0;
@@ -26,6 +26,7 @@ QgsRenderContext::QgsRenderContext()
mRenderingStopped( false ),
mScaleFactor( 1.0 ),
mRasterScaleFactor( 1.0 ),
mRendererScale( 1.0 ),
mLabelingEngine( NULL )
{

@@ -24,7 +24,7 @@
#include <QSettings>
#include <QLineEdit>

QgsScaleComboBox::QgsScaleComboBox( QWidget* parent ) : QComboBox( parent )
QgsScaleComboBox::QgsScaleComboBox( QWidget* parent ) : QComboBox( parent ), mScale( 1.0 )
{
updateScales();

0 comments on commit ec5ed50

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