[FEATURE] Add dX, dY and residual on GCP Points (#8513)

fanevanjanahary · nyalldawson · commit 7a9ba25e80ac · 2018-11-26T10:44:55.000+10:00
* add dX, dY and residual on GCP Points
* add option to automatically save GCP Points in the raster-modified path
diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -341,7 +341,7 @@ bool QgsGeorefPluginGui::getTransformSettings()
   }
 
   d.getTransformSettings( mTransformParam, mResamplingMethod, mCompressionMethod,
-                          mModifiedRasterFileName, mProjection, mPdfOutputMapFile, mPdfOutputFile, mUseZeroForTrans, mLoadInQgis, mUserResX, mUserResY );
+                          mModifiedRasterFileName, mProjection, mPdfOutputMapFile, mPdfOutputFile, mSaveGcp, mUseZeroForTrans, mLoadInQgis, mUserResX, mUserResY );
   mTransformParamLabel->setText( tr( "Transform: " ) + convertTransformEnumToString( mTransformParam ) );
   mGeorefTransform.selectTransformParametrisation( mTransformParam );
   mGCPListWidget->setGeorefTransform( &mGeorefTransform );
@@ -1250,7 +1250,7 @@ bool QgsGeorefPluginGui::loadGCPs( /*bool verbose*/ )
 
     QgsPointXY mapCoords( ls.at( 0 ).toDouble(), ls.at( 1 ).toDouble() ); // map x,y
     QgsPointXY pixelCoords( ls.at( 2 ).toDouble(), ls.at( 3 ).toDouble() ); // pixel x,y
-    if ( ls.count() == 5 )
+    if ( ls.count() == 5 || ls.count() == 8 )
     {
       bool enable = ls.at( 4 ).toInt();
       addPoint( pixelCoords, mapCoords, enable, false );
@@ -1280,15 +1280,19 @@ void QgsGeorefPluginGui::saveGCPs()
   if ( pointFile.open( QIODevice::WriteOnly | QIODevice::Truncate ) )
   {
     QTextStream points( &pointFile );
-    points << "mapX,mapY,pixelX,pixelY,enable" << endl;
+    points << "mapX,mapY,pixelX,pixelY,enable,dX,dY,residual" << endl;
     Q_FOREACH ( QgsGeorefDataPoint *pt, mPoints )
     {
-      points << QStringLiteral( "%1,%2,%3,%4,%5" )
+      points << QStringLiteral( "%1,%2,%3,%4,%5,%6,%7,%8" )
              .arg( qgsDoubleToString( pt->mapCoords().x() ),
                    qgsDoubleToString( pt->mapCoords().y() ),
                    qgsDoubleToString( pt->pixelCoords().x() ),
                    qgsDoubleToString( pt->pixelCoords().y() ) )
-             .arg( pt->isEnabled() ) << endl;
+             .arg( pt->isEnabled() )
+             .arg( qgsDoubleToString( pt->residual().x() ),
+                   qgsDoubleToString( pt->residual().y() ),
+                   qgsDoubleToString( std::sqrt( pt->residual().x() * pt->residual().x() + pt->residual().y() * pt->residual().y() ) ) )
+             << endl;
     }
 
     mInitialPoints = mPoints;
@@ -1410,6 +1414,11 @@ bool QgsGeorefPluginGui::georeference()
       {
         writePDFMapFile( mPdfOutputMapFile, mGeorefTransform );
       }
+      if ( !mSaveGcp.isEmpty() )
+      {
+        mGCPpointsFileName = mModifiedRasterFileName + QLatin1String( ".points" );
+        saveGCPs();
+      }
       return true;
     }
   }
diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.h b/src/plugins/georeferencer/qgsgeorefplugingui.h
@@ -228,6 +228,7 @@ class QgsGeorefPluginGui : public QMainWindow, private Ui::QgsGeorefPluginGuiBas
     QgsCoordinateReferenceSystem mProjection;
     QString mPdfOutputFile;
     QString mPdfOutputMapFile;
+    QString mSaveGcp;
     double  mUserResX, mUserResY;  // User specified target scale
 
     QgsGeorefTransform::TransformParametrisation mTransformParam;
@@ -260,6 +261,7 @@ class QgsGeorefPluginGui : public QMainWindow, private Ui::QgsGeorefPluginGuiBas
     bool mGCPsDirty;
     bool mLoadInQgis;
 
+
     QgsDockWidget *mDock = nullptr;
     int messageTimeout();
 };
diff --git a/src/plugins/georeferencer/qgstransformsettingsdialog.cpp b/src/plugins/georeferencer/qgstransformsettingsdialog.cpp
@@ -121,6 +121,8 @@ QgsTransformSettingsDialog::QgsTransformSettingsDialog( const QString &raster, c
 
   cbxZeroAsTrans->setChecked( settings.value( QStringLiteral( "/Plugin-GeoReferencer/zeroastrans" ), false ).toBool() );
   cbxLoadInQgisWhenDone->setChecked( settings.value( QStringLiteral( "/Plugin-GeoReferencer/loadinqgis" ), false ).toBool() );
+  saveGcpCheckBox->setChecked( settings.value( QStringLiteral( "/Plugin-GeoReferencer/save_gcp_points" ), false ).toBool() );
+
 }
 
 QgsTransformSettingsDialog::~QgsTransformSettingsDialog()
@@ -132,7 +134,7 @@ QgsTransformSettingsDialog::~QgsTransformSettingsDialog()
 void QgsTransformSettingsDialog::getTransformSettings( QgsGeorefTransform::TransformParametrisation &tp,
     QgsImageWarper::ResamplingMethod &rm,
     QString &comprMethod, QString &raster,
-    QgsCoordinateReferenceSystem &proj, QString &pdfMapFile, QString &pdfReportFile, bool &zt, bool &loadInQgis,
+    QgsCoordinateReferenceSystem &proj, QString &pdfMapFile, QString &pdfReportFile, QString &gcpPoints, bool &zt, bool &loadInQgis,
     double &resX, double &resY )
 {
   if ( cmbTransformType->currentIndex() == -1 )
@@ -162,6 +164,10 @@ void QgsTransformSettingsDialog::getTransformSettings( QgsGeorefTransform::Trans
     resX = dsbHorizRes->value();
     resY = dsbVerticalRes->value();
   }
+  if ( saveGcpCheckBox->isChecked() )
+  {
+    gcpPoints = mOutputRaster->filePath();
+  }
 }
 
 void QgsTransformSettingsDialog::resetSettings()
@@ -173,6 +179,7 @@ void QgsTransformSettingsDialog::resetSettings()
   s.setValue( QStringLiteral( "/Plugin-GeoReferencer/targetsrs" ), QString() );
   s.setValue( QStringLiteral( "/Plugin-GeoReferencer/zeroastrans" ), false );
   s.setValue( QStringLiteral( "/Plugin-GeoReferencer/loadinqgis" ), false );
+  s.setValue( QStringLiteral( "/Plugin-GeoReferencer/save_gcp_points" ), false );
   s.setValue( QStringLiteral( "/Plugin-GeoReferencer/user_specified_resolution" ), false );
   s.setValue( QStringLiteral( "/Plugin-GeoReferencer/user_specified_resx" ),  1.0 );
   s.setValue( QStringLiteral( "/Plugin-GeoReferencer/user_specified_resy" ), -1.0 );
@@ -227,6 +234,8 @@ void QgsTransformSettingsDialog::accept()
   settings.setValue( QStringLiteral( "/Plugin-GeoReferencer/user_specified_resx" ), dsbHorizRes->value() );
   settings.setValue( QStringLiteral( "/Plugin-GeoReferencer/user_specified_resy" ), dsbVerticalRes->value() );
   settings.setValue( QStringLiteral( "/Plugin-GeoReferencer/word_file_checkbox" ), mWorldFileCheckBox->isChecked() );
+  settings.setValue( QStringLiteral( "/Plugin-GeoReferencer/save_gcp_points" ), saveGcpCheckBox->isChecked() );
+
 
   QDialog::accept();
 }
diff --git a/src/plugins/georeferencer/qgstransformsettingsdialog.h b/src/plugins/georeferencer/qgstransformsettingsdialog.h
@@ -33,7 +33,7 @@ class QgsTransformSettingsDialog : public QDialog, private Ui::QgsTransformSetti
     ~QgsTransformSettingsDialog() override;
     void getTransformSettings( QgsGeorefTransform::TransformParametrisation &tp,
                                QgsImageWarper::ResamplingMethod &rm, QString &comprMethod,
-                               QString &raster, QgsCoordinateReferenceSystem &proj, QString &pdfMapFile, QString &pdfReportFile, bool &zt, bool &loadInQgis,
+                               QString &raster, QgsCoordinateReferenceSystem &proj, QString &pdfMapFile, QString &pdfReportFile, QString &gcpPoints, bool &zt, bool &loadInQgis,
                                double &resX, double &resY );
     static void resetSettings();
 
diff --git a/src/plugins/georeferencer/qgstransformsettingsdialogbase.ui b/src/plugins/georeferencer/qgstransformsettingsdialogbase.ui

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ bool QgsGeorefPluginGui::getTransformSettings()`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	`d.getTransformSettings( mTransformParam, mResamplingMethod, mCompressionMethod,`
`344`		`- mModifiedRasterFileName, mProjection, mPdfOutputMapFile, mPdfOutputFile, mUseZeroForTrans, mLoadInQgis, mUserResX, mUserResY );`
	`344`	`+ mModifiedRasterFileName, mProjection, mPdfOutputMapFile, mPdfOutputFile, mSaveGcp, mUseZeroForTrans, mLoadInQgis, mUserResX, mUserResY );`
`345`	`345`	`mTransformParamLabel->setText( tr( "Transform: " ) + convertTransformEnumToString( mTransformParam ) );`
`346`	`346`	`mGeorefTransform.selectTransformParametrisation( mTransformParam );`
`347`	`347`	`mGCPListWidget->setGeorefTransform( &mGeorefTransform );`
`@@ -1250,7 +1250,7 @@ bool QgsGeorefPluginGui::loadGCPs( /bool verbose/ )`
`1250`	`1250`
`1251`	`1251`	`QgsPointXY mapCoords( ls.at( 0 ).toDouble(), ls.at( 1 ).toDouble() ); // map x,y`
`1252`	`1252`	`QgsPointXY pixelCoords( ls.at( 2 ).toDouble(), ls.at( 3 ).toDouble() ); // pixel x,y`
`1253`		`- if ( ls.count() == 5 )`
	`1253`	`+ if ( ls.count() == 5 \|\| ls.count() == 8 )`
`1254`	`1254`	`{`
`1255`	`1255`	`bool enable = ls.at( 4 ).toInt();`
`1256`	`1256`	`addPoint( pixelCoords, mapCoords, enable, false );`
`@@ -1280,15 +1280,19 @@ void QgsGeorefPluginGui::saveGCPs()`
`1280`	`1280`	`if ( pointFile.open( QIODevice::WriteOnly \| QIODevice::Truncate ) )`
`1281`	`1281`	`{`
`1282`	`1282`	`QTextStream points( &pointFile );`
`1283`		`- points << "mapX,mapY,pixelX,pixelY,enable" << endl;`
	`1283`	`+ points << "mapX,mapY,pixelX,pixelY,enable,dX,dY,residual" << endl;`
`1284`	`1284`	`Q_FOREACH ( QgsGeorefDataPoint *pt, mPoints )`
`1285`	`1285`	`{`
`1286`		`- points << QStringLiteral( "%1,%2,%3,%4,%5" )`
	`1286`	`+ points << QStringLiteral( "%1,%2,%3,%4,%5,%6,%7,%8" )`
`1287`	`1287`	`.arg( qgsDoubleToString( pt->mapCoords().x() ),`
`1288`	`1288`	`qgsDoubleToString( pt->mapCoords().y() ),`
`1289`	`1289`	`qgsDoubleToString( pt->pixelCoords().x() ),`
`1290`	`1290`	`qgsDoubleToString( pt->pixelCoords().y() ) )`
`1291`		`- .arg( pt->isEnabled() ) << endl;`
	`1291`	`+ .arg( pt->isEnabled() )`
	`1292`	`+ .arg( qgsDoubleToString( pt->residual().x() ),`
	`1293`	`+ qgsDoubleToString( pt->residual().y() ),`
	`1294`	`+ qgsDoubleToString( std::sqrt( pt->residual().x() * pt->residual().x() + pt->residual().y() * pt->residual().y() ) ) )`
	`1295`	`+ << endl;`
`1292`	`1296`	`}`
`1293`	`1297`
`1294`	`1298`	`mInitialPoints = mPoints;`
`@@ -1410,6 +1414,11 @@ bool QgsGeorefPluginGui::georeference()`
`1410`	`1414`	`{`
`1411`	`1415`	`writePDFMapFile( mPdfOutputMapFile, mGeorefTransform );`
`1412`	`1416`	`}`
	`1417`	`+ if ( !mSaveGcp.isEmpty() )`
	`1418`	`+ {`
	`1419`	`+ mGCPpointsFileName = mModifiedRasterFileName + QLatin1String( ".points" );`
	`1420`	`+ saveGCPs();`
	`1421`	`+ }`
`1413`	`1422`	`return true;`
`1414`	`1423`	`}`
`1415`	`1424`	`}`