Navigation Menu

Skip to content

Commit

Permalink
Coordinate operation widget: avoid repeating scope and remarks
Browse files Browse the repository at this point in the history
For coordinate operations that are not concatenated operations, we
currently display twice the scope and remarks. Let's strip a bit of
text to avoid confusing users even more :-)
  • Loading branch information
rouault authored and nyalldawson committed Sep 18, 2020
1 parent 9e654ca commit fbe5675
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/gui/qgscoordinateoperationwidget.cpp
Expand Up @@ -252,18 +252,22 @@ void QgsCoordinateOperationWidget::loadAvailableOperations()
QStringList authorityCodes;

QStringList opText;
QString lastSingleOpScope;
QString lastSingleOpRemarks;
for ( const QgsDatumTransform::SingleOperationDetails &singleOpDetails : transform.operationDetails )
{
QString text;
if ( !singleOpDetails.scope.isEmpty() )
{
text += QStringLiteral( "<b>%1</b>: %2" ).arg( tr( "Scope" ), formatScope( singleOpDetails.scope ) );
lastSingleOpScope = singleOpDetails.scope;
}
if ( !singleOpDetails.remarks.isEmpty() )
{
if ( !text.isEmpty() )
text += QStringLiteral( "<br>" );
text += QStringLiteral( "<b>%1</b>: %2" ).arg( tr( "Remarks" ), singleOpDetails.remarks );
lastSingleOpRemarks = singleOpDetails.remarks;
}
if ( !singleOpDetails.areaOfUse.isEmpty() )
{
Expand All @@ -284,11 +288,11 @@ void QgsCoordinateOperationWidget::loadAvailableOperations()
}

QString text;
if ( !transform.scope.isEmpty() )
if ( !transform.scope.isEmpty() && transform.scope != lastSingleOpScope )
{
text += QStringLiteral( "<b>%1</b>: %2" ).arg( tr( "Scope" ), transform.scope );
}
if ( !transform.remarks.isEmpty() )
if ( !transform.remarks.isEmpty() && transform.remarks != lastSingleOpRemarks )
{
if ( !text.isEmpty() )
text += QStringLiteral( "<br>" );
Expand Down

0 comments on commit fbe5675

Please sign in to comment.