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

Remove "used" operation from handler

Browse Source 
We can't populate this, because it's not a singular proj operation
This commit is contained in:
Nyall Dawson 2020-02-14 11:19:39 +10:00
parent 890fe57648
commit 9883e18e21
4 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/qgsappcoordinateoperationhandlers.cpp
View File

@ -58,10 +58,9 @@ QgsAppMissingGridHandler::QgsAppMissingGridHandler( QObject *parent )
QgsCoordinateTransform::setFallbackOperationOccurredHandler( [ = ]( const QgsCoordinateReferenceSystem & sourceCrs,
const QgsCoordinateReferenceSystem & destinationCrs,
const QgsDatumTransform::TransformDetails & desired,
const QgsDatumTransform::TransformDetails & used )
const QgsDatumTransform::TransformDetails & desired )
{
emit fallbackOperationOccurred( sourceCrs, destinationCrs, desired, used );
emit fallbackOperationOccurred( sourceCrs, destinationCrs, desired );
} );
connect( this, &QgsAppMissingGridHandler::missingRequiredGrid, this, &QgsAppMissingGridHandler::onMissingRequiredGrid, Qt::QueuedConnection );
@ -274,7 +273,7 @@ void QgsAppMissingGridHandler::onMissingGridUsedByContextHandler( const QgsCoord
bar->pushWidget( widget, Qgis::Critical, 0 );
}
void QgsAppMissingGridHandler::onFallbackOperationOccurred( const QgsCoordinateReferenceSystem &sourceCrs, const QgsCoordinateReferenceSystem &destinationCrs, const QgsDatumTransform::TransformDetails &desired, const QgsDatumTransform::TransformDetails &used )
void QgsAppMissingGridHandler::onFallbackOperationOccurred( const QgsCoordinateReferenceSystem &sourceCrs, const QgsCoordinateReferenceSystem &destinationCrs, const QgsDatumTransform::TransformDetails &desired )
{
// if ( !shouldWarnAboutPairForCurrentProject( sourceCrs, destinationCrs ) )
// return;

9
src/app/qgsappcoordinateoperationhandlers.h
View File

@ -51,8 +51,7 @@ class QgsAppMissingGridHandler : public QObject
void fallbackOperationOccurred( const QgsCoordinateReferenceSystem &sourceCrs,
const QgsCoordinateReferenceSystem &destinationCrs,
const QgsDatumTransform::TransformDetails &desired,
const QgsDatumTransform::TransformDetails &used );
const QgsDatumTransform::TransformDetails &desired );
private slots:
@ -75,17 +74,17 @@ class QgsAppMissingGridHandler : public QObject
void onFallbackOperationOccurred( const QgsCoordinateReferenceSystem &sourceCrs,
const QgsCoordinateReferenceSystem &destinationCrs,
const QgsDatumTransform::TransformDetails &desired,
const QgsDatumTransform::TransformDetails &used );
const QgsDatumTransform::TransformDetails &desired );
private:
bool shouldWarnAboutPair( const QgsCoordinateReferenceSystem &source, const QgsCoordinateReferenceSystem &dest );
bool shouldWarnAboutPairForCurrentProject( const QgsCoordinateReferenceSystem &source, const QgsCoordinateReferenceSystem &dest );
bool shouldWarnAboutBallparkPairForCurrentProject( const QgsCoordinateReferenceSystem &source, const QgsCoordinateReferenceSystem &dest );
QList< QPair< QgsCoordinateReferenceSystem, QgsCoordinateReferenceSystem > > mAlreadyWarnedPairs;
QList< QPair< QgsCoordinateReferenceSystem, QgsCoordinateReferenceSystem > > mAlreadyWarnedPairsForProject;
QList< QPair< QgsCoordinateReferenceSystem, QgsCoordinateReferenceSystem > > mAlreadyWarnedBallparkPairsForProject;
};
#endif // QGSAPPCOORDINATEOPERATIONHANDLERS_H

8
src/core/qgscoordinatetransform.cpp
View File

@ -54,8 +54,7 @@ bool QgsCoordinateTransform::sDisableCache = false;
std::function< void( const QgsCoordinateReferenceSystem &sourceCrs,
const QgsCoordinateReferenceSystem &destinationCrs,
const QgsDatumTransform::TransformDetails &desiredOperation,
const QgsDatumTransform::TransformDetails &usedOperation )> QgsCoordinateTransform::sFallbackOperationOccurredHandler = nullptr;
const QgsDatumTransform::TransformDetails &desiredOperation )> QgsCoordinateTransform::sFallbackOperationOccurredHandler = nullptr;
QgsCoordinateTransform::QgsCoordinateTransform()
{
@ -778,8 +777,7 @@ void QgsCoordinateTransform::transformCoords( int numPoints, double *x, double *
if ( !mBallparkTransformsAreAppropriate && sFallbackOperationOccurredHandler )
{
QgsDatumTransform::TransformDetails desired = instantiatedCoordinateOperationDetails();
QgsDatumTransform::TransformDetails used = QgsDatumTransform::transformDetailsFromPj( transform );
sFallbackOperationOccurredHandler( d->mSourceCRS, d->mDestCRS, desired, used );
sFallbackOperationOccurredHandler( d->mSourceCRS, d->mDestCRS, desired );
const QString warning = QStringLiteral( "A fallback coordinate operation was used between %1 and %2" ).arg( d->mSourceCRS.authid(),
d->mDestCRS.authid() );
qWarning( "%s", warning.toLatin1().constData() );
@ -1125,7 +1123,7 @@ void QgsCoordinateTransform::setCustomMissingGridUsedByContextHandler( const std
QgsCoordinateTransformPrivate::setCustomMissingGridUsedByContextHandler( handler );
}
void QgsCoordinateTransform::setFallbackOperationOccurredHandler( const std::function<void ( const QgsCoordinateReferenceSystem &, const QgsCoordinateReferenceSystem &, const QgsDatumTransform::TransformDetails &, const QgsDatumTransform::TransformDetails & )> &handler )
void QgsCoordinateTransform::setFallbackOperationOccurredHandler( const std::function<void ( const QgsCoordinateReferenceSystem &, const QgsCoordinateReferenceSystem &, const QgsDatumTransform::TransformDetails & )> &handler )
{
sFallbackOperationOccurredHandler = handler;
}

8
src/core/qgscoordinatetransform.h
View File

@ -587,14 +587,13 @@ class CORE_EXPORT QgsCoordinateTransform
/**
* Sets a custom \a handler to use when the desired coordinate operation for use between \a sourceCrs and
* \a destinationCrs failed and an alternative fallback \a usedOperation was utilised instead.
* \a destinationCrs failed and an alternative fallback operation was utilised instead.
*
* \since QGIS 3.10.3
*/
static void setFallbackOperationOccurredHandler( const std::function< void( const QgsCoordinateReferenceSystem &sourceCrs,
const QgsCoordinateReferenceSystem &destinationCrs,
const QgsDatumTransform::TransformDetails &desiredOperation,
const QgsDatumTransform::TransformDetails &usedOperation )> &handler );
const QgsDatumTransform::TransformDetails &desiredOperation )> &handler );
#endif
@ -641,8 +640,7 @@ class CORE_EXPORT QgsCoordinateTransform
static std::function< void( const QgsCoordinateReferenceSystem &sourceCrs,
const QgsCoordinateReferenceSystem &destinationCrs,
const QgsDatumTransform::TransformDetails &desiredOperation,
const QgsDatumTransform::TransformDetails &usedOperation )> sFallbackOperationOccurredHandler;
const QgsDatumTransform::TransformDetails &desiredOperation )> sFallbackOperationOccurredHandler;
};