sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't cache context along with QgsCoordinateTransforms

Browse Source 
This information should not be restored from the cache, since
it's project specific yet the cache is not
This commit is contained in:
Nyall Dawson 2017-12-18 18:39:49 +10:00
parent 25c3e135b0
commit 9ba1d28aa4
5 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/core/qgscoordinatetransform.cpp
View File

@ -65,9 +65,10 @@ QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSyst
QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSystem &source, const QgsCoordinateReferenceSystem &destination, const QgsCoordinateTransformContext &context )
{
d = new QgsCoordinateTransformPrivate( source, destination, context );
mContext = context;
d = new QgsCoordinateTransformPrivate( source, destination, mContext );
#ifdef QGISDEBUG
d->mHasContext = true;
mHasContext = true;
#endif
if ( !d->checkValidity() )
@ -82,9 +83,11 @@ QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSyst
QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSystem &source, const QgsCoordinateReferenceSystem &destination, const QgsProject *project )
{
d = new QgsCoordinateTransformPrivate( source, destination, project ? project->transformContext() : QgsCoordinateTransformContext() );
mContext = project ? project->transformContext() : QgsCoordinateTransformContext();
d = new QgsCoordinateTransformPrivate( source, destination, mContext );
#ifdef QGISDEBUG
d->mHasContext = true;
if ( project )
mHasContext = true;
#endif
if ( !d->checkValidity() )
@ -101,7 +104,7 @@ QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSyst
{
d = new QgsCoordinateTransformPrivate( source, destination, sourceDatumTransform, destinationDatumTransform );
#ifdef QGISDEBUG
d->mHasContext = true; // not strictly true, but we don't need to worry if datums have been explicitly set
mHasContext = true; // not strictly true, but we don't need to worry if datums have been explicitly set
#endif
if ( !d->checkValidity() )
@ -115,6 +118,10 @@ QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSyst
}
QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateTransform &o )
: mContext( o.mContext )
#ifdef QGISDEBUG
, mHasContext( o.mHasContext )
#endif
{
d = o.d;
}
@ -122,6 +129,10 @@ QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateTransform &o
QgsCoordinateTransform &QgsCoordinateTransform::operator=( const QgsCoordinateTransform &o ) //NOLINT
{
d = o.d;
#ifdef QGISDEBUG
mHasContext = o.mHasContext;
#endif
mContext = o.mContext;
return *this;
}
@ -134,7 +145,7 @@ void QgsCoordinateTransform::setSourceCrs( const QgsCoordinateReferenceSystem &c
if ( !d->checkValidity() )
return;
d->calculateTransforms();
d->calculateTransforms( mContext );
if ( !setFromCache( d->mSourceCRS, d->mDestCRS, d->mSourceDatumTransform, d->mDestinationDatumTransform ) )
{
d->initialize();
@ -148,7 +159,7 @@ void QgsCoordinateTransform::setDestinationCrs( const QgsCoordinateReferenceSyst
if ( !d->checkValidity() )
return;
d->calculateTransforms();
d->calculateTransforms( mContext );
if ( !setFromCache( d->mSourceCRS, d->mDestCRS, d->mSourceDatumTransform, d->mDestinationDatumTransform ) )
{
d->initialize();
@ -159,14 +170,14 @@ void QgsCoordinateTransform::setDestinationCrs( const QgsCoordinateReferenceSyst
void QgsCoordinateTransform::setContext( const QgsCoordinateTransformContext &context )
{
d.detach();
d->mContext = context;
mContext = context;
#ifdef QGISDEBUG
d->mHasContext = true;
mHasContext = true;
#endif
if ( !d->checkValidity() )
return;
d->calculateTransforms();
d->calculateTransforms( mContext );
if ( !setFromCache( d->mSourceCRS, d->mDestCRS, d->mSourceDatumTransform, d->mDestinationDatumTransform ) )
{
d->initialize();
@ -575,7 +586,7 @@ void QgsCoordinateTransform::transformCoords( int numPoints, double *x, double *
#endif
#ifdef QGISDEBUG
if ( !d->mHasContext )
if ( !mHasContext )
qWarning( "No QgsCoordinateTransformContext context set for transform" );
#endif
@ -792,8 +803,19 @@ bool QgsCoordinateTransform::setFromCache( const QgsCoordinateReferenceSystem &s
if ( ( *valIt ).sourceDatumTransformId() == srcDatumTransform &&
( *valIt ).destinationDatumTransformId() == destDatumTransform )
{
// need to save, and then restore the context... we don't want this to be cached or to use the values from the cache
QgsCoordinateTransformContext context = mContext;
#ifdef QGISDEBUG
bool hasContext = mHasContext;
#endif
*this = *valIt;
sCacheLock.unlock();
mContext = context;
#ifdef QGISDEBUG
mHasContext = hasContext;
#endif
return true;
}
}

9
src/core/qgscoordinatetransform.h
View File

@ -22,12 +22,12 @@
#include "qgis_core.h"
#include "qgis_sip.h"
#include "qgscoordinatereferencesystem.h"
#include "qgscoordinatetransformcontext.h"
class QgsCoordinateTransformPrivate;
class QgsPointXY;
class QgsRectangle;
class QPolygonF;
class QgsCoordinateTransformContext;
class QgsProject;
/**
@ -410,6 +410,13 @@ class CORE_EXPORT QgsCoordinateTransform
mutable QExplicitlySharedDataPointer<QgsCoordinateTransformPrivate> d;
//! Transform context
QgsCoordinateTransformContext mContext;
#ifdef QGISDEBUG
bool mHasContext = false;
#endif
bool setFromCache( const QgsCoordinateReferenceSystem &src,
const QgsCoordinateReferenceSystem &dest,
int srcDatumTransform,

7
src/core/qgscoordinatetransform_p.cpp
View File

@ -55,10 +55,9 @@ QgsCoordinateTransformPrivate::QgsCoordinateTransformPrivate( const QgsCoordinat
const QgsCoordinateTransformContext &context )
: mSourceCRS( source )
, mDestCRS( destination )
, mContext( context )
{
setFinder();
calculateTransforms();
calculateTransforms( context );
}
QgsCoordinateTransformPrivate::QgsCoordinateTransformPrivate( const QgsCoordinateReferenceSystem &source, const QgsCoordinateReferenceSystem &destination, int sourceDatumTransform, int destDatumTransform )
@ -76,10 +75,6 @@ QgsCoordinateTransformPrivate::QgsCoordinateTransformPrivate( const QgsCoordinat
, mShortCircuit( other.mShortCircuit )
, mSourceCRS( other.mSourceCRS )
, mDestCRS( other.mDestCRS )
, mContext( other.mContext )
#ifdef QGISDEBUG
, mHasContext( other.mHasContext )
#endif
, mSourceDatumTransform( other.mSourceDatumTransform )
, mDestinationDatumTransform( other.mDestinationDatumTransform )
{

9
src/core/qgscoordinatetransform_p.h
View File

@ -87,7 +87,7 @@ class QgsCoordinateTransformPrivate : public QSharedData
bool initialize();
void calculateTransforms();
void calculateTransforms( const QgsCoordinateTransformContext &context );
QPair< projPJ, projPJ > threadLocalProjData();
@ -109,13 +109,6 @@ class QgsCoordinateTransformPrivate : public QSharedData
//! QgsCoordinateReferenceSystem of the destination (map canvas) coordinate system
QgsCoordinateReferenceSystem mDestCRS;
//! Transform context
QgsCoordinateTransformContext mContext;
#ifdef QGISDEBUG
bool mHasContext = false;
#endif
QString mSourceProjString;
QString mDestProjString;

1
src/core/qgscoordinatetransformcontext.cpp
View File

@ -17,6 +17,7 @@
#include "qgscoordinatetransformcontext.h"
#include "qgscoordinatetransformcontext_p.h"
#include "qgscoordinatetransform.h"
#include "qgssettings.h"
QgsCoordinateTransformContext::QgsCoordinateTransformContext()