Show formatted WKT definitions in custom projection dialog

Because an unformatted WKT string is just a huge barely decipherable blob...
qgis · Feb 25, 2020 · 489124d · 489124d
1 parent f547049
commit 489124d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/src/app/qgscustomprojectiondialog.cpp b/src/app/qgscustomprojectiondialog.cpp
@@ -133,6 +133,7 @@ void QgsCustomProjectionDialog::populateList()
 
       mExistingCRSnames[id] = name;
       const QString actualWkt = crs.toWkt( QgsCoordinateReferenceSystem::WKT2_2018, false );
+      const QString actualWktFormatted = crs.toWkt( QgsCoordinateReferenceSystem::WKT2_2018, true );
       const QString actualProj = crs.toProj();
       mExistingCRSwkt[id] = wkt.isEmpty() ? QString() : actualWkt;
       mExistingCRSproj[id] = wkt.isEmpty() ? actualProj : QString();
@@ -141,6 +142,7 @@ void QgsCustomProjectionDialog::populateList()
       newItem->setText( QgisCrsNameColumn, name );
       newItem->setText( QgisCrsIdColumn, id );
       newItem->setText( QgisCrsParametersColumn, wkt.isEmpty() ? actualProj : actualWkt );
+      newItem->setData( 0, FormattedWktRole, actualWktFormatted );
     }
   }
   else
@@ -321,6 +323,7 @@ void QgsCustomProjectionDialog::pbnAdd_clicked()
   newItem->setText( QgisCrsNameColumn, name );
   newItem->setText( QgisCrsIdColumn, QString() );
   newItem->setText( QgisCrsParametersColumn, QString() );
+  newItem->setData( 0, FormattedWktRole, QString() );
 
   Definition def;
   def.name = name;
@@ -388,14 +391,15 @@ void QgsCustomProjectionDialog::leNameList_currentItemChanged( QTreeWidgetItem *
     }
 
     previous->setText( QgisCrsNameColumn, leName->text() );
-    previous->setText( QgisCrsParametersColumn, teParameters->toPlainText() );
+    previous->setText( QgisCrsParametersColumn, multiLineWktToSingleLine( teParameters->toPlainText() ) );
+    previous->setData( 0, FormattedWktRole, teParameters->toPlainText() );
   }
 
   if ( current )
   {
     currentIndex = leNameList->indexOfTopLevelItem( current );
     whileBlocking( leName )->setText( mDefinitions[currentIndex].name );
-    whileBlocking( teParameters )->setPlainText( !mDefinitions[currentIndex].wkt.isEmpty() ? mDefinitions[currentIndex].wkt : mDefinitions[currentIndex].proj );
+    whileBlocking( teParameters )->setPlainText( !mDefinitions[currentIndex].wkt.isEmpty() ? current->data( 0, FormattedWktRole ).toString() : mDefinitions[currentIndex].proj );
     whileBlocking( mFormatComboBox )->setCurrentIndex( mFormatComboBox->findData( static_cast< int >( mDefinitions[currentIndex].wkt.isEmpty() ? QgsCoordinateReferenceSystem::FormatProj : QgsCoordinateReferenceSystem::FormatWkt ) ) );
   }
   else
@@ -425,6 +429,7 @@ void QgsCustomProjectionDialog::pbnCopyCRS_clicked()
     mDefinitions[leNameList->currentIndex().row()].proj.clear();
 
     leNameList->currentItem()->setText( QgisCrsParametersColumn, srs.toWkt( QgsCoordinateReferenceSystem::WKT2_2018, false ) );
+    leNameList->currentItem()->setData( 0, FormattedWktRole, srs.toWkt( QgsCoordinateReferenceSystem::WKT2_2018, true ) );
   }
 }
 
@@ -554,7 +559,8 @@ void QgsCustomProjectionDialog::updateListFromCurrentItem()
   }
 
   item->setText( QgisCrsNameColumn, leName->text() );
-  item->setText( QgisCrsParametersColumn, teParameters->toPlainText() );
+  item->setText( QgisCrsParametersColumn, multiLineWktToSingleLine( teParameters->toPlainText() ) );
+  item->setData( 0, FormattedWktRole, teParameters->toPlainText() );
 }
 
 #if PROJ_VERSION_MAJOR>=6
@@ -686,7 +692,7 @@ void QgsCustomProjectionDialog::formatChanged()
   {
     case QgsCoordinateReferenceSystem::FormatProj:
     {
-      crs.createFromWkt( teParameters->toPlainText() );
+      crs.createFromWkt( multiLineWktToSingleLine( teParameters->toPlainText() ) );
       if ( crs.isValid() )
         newFormatString = crs.toProj();
       break;
@@ -703,7 +709,7 @@ void QgsCustomProjectionDialog::formatChanged()
         QgsProjUtils::proj_pj_unique_ptr crs( proj_create( QgsProjContext::get(), proj.toLatin1().constData() ) );
         if ( crs )
         {
-          const QByteArray multiLineOption = QStringLiteral( "MULTILINE=NO" ).toLocal8Bit();
+          const QByteArray multiLineOption = QStringLiteral( "MULTILINE=YES" ).toLocal8Bit();
           const char *const options[] = {multiLineOption.constData(), nullptr};
           newFormatString = QString( proj_as_wkt( pjContext, crs.get(), PJ_WKT2_2018, options ) );
         }
@@ -871,3 +877,12 @@ void QgsCustomProjectionDialog::showHelp()
   QgsHelp::openHelp( QStringLiteral( "working_with_projections/working_with_projections.html" ) );
 }
 
+QString QgsCustomProjectionDialog::multiLineWktToSingleLine( const QString &wkt )
+{
+  QString res = wkt;
+  QRegularExpression re( QStringLiteral( "\\s*\\n\\s*" ) );
+  re.setPatternOptions( QRegularExpression::MultilineOption );
+  res.replace( re, QString() );
+  return res;
+}
+
diff --git a/src/app/qgscustomprojectiondialog.h b/src/app/qgscustomprojectiondialog.h
@@ -56,6 +56,7 @@ class APP_EXPORT QgsCustomProjectionDialog : public QDialog, private Ui::QgsCust
     bool saveCrs( QgsCoordinateReferenceSystem crs, const QString &name, const QString &id, bool newEntry, QgsCoordinateReferenceSystem::Format format );
     void insertProjection( const QString &projectionAcronym );
     void showHelp();
+    QString multiLineWktToSingleLine( const QString &wkt );
 
     //These two QMap store the values as they are on the database when loading
     QMap <QString, QString> mExistingCRSproj;
@@ -70,6 +71,11 @@ class APP_EXPORT QgsCustomProjectionDialog : public QDialog, private Ui::QgsCust
       QString proj;
     };
 
+    enum Roles
+    {
+      FormattedWktRole = Qt::UserRole + 1,
+    };
+
     QList< Definition > mDefinitions;
 
     //vector saving the CRS to be deleted