sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-08 00:05:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #15829 georeferencer - resolve logical error during loadGCPs

Browse Source
This commit is contained in:
mj10777 2016-11-11 18:07:40 +01:00 committed by Nyall Dawson
parent be4c8156c6
commit 59a0e2fb88
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/georeferencer/qgsgeorefplugingui.cpp
View File

@ -1258,20 +1258,31 @@ bool QgsGeorefPluginGui::loadGCPs( /*bool verbose*/ )
QgsPoint mapCoords( ls.at( 0 ).toDouble(), ls.at( 1 ).toDouble() ); // map x,y QgsPoint mapCoords( ls.at( 0 ).toDouble(), ls.at( 1 ).toDouble() ); // map x,y
QgsPoint pixelCoords( ls.at( 2 ).toDouble(), ls.at( 3 ).toDouble() ); // pixel x,y QgsPoint pixelCoords( ls.at( 2 ).toDouble(), ls.at( 3 ).toDouble() ); // pixel x,y
QgsGeorefDataPoint* pnt;
if ( ls.count() == 5 ) if ( ls.count() == 5 )
{ {
bool enable = ls.at( 4 ).toInt(); bool enable = ls.at( 4 ).toInt();
addPoint( pixelCoords, mapCoords, enable, false/*, verbose*/ ); // enabled pnt = new QgsGeorefDataPoint( mCanvas, mIface->mapCanvas(), pixelCoords, mapCoords, enable );
} }
else else
addPoint( pixelCoords, mapCoords, true, false ); pnt = new QgsGeorefDataPoint( mCanvas, mIface->mapCanvas(), pixelCoords, mapCoords, true );
mPoints.append( pnt );
connect( mCanvas, SIGNAL( extentsChanged() ), pnt, SLOT( updateCoords() ) );
mGCPsDirty = true;
++i; ++i;
} }
mInitialPoints = mPoints; mInitialPoints = mPoints;
// showMessageInLog(tr("GCP points loaded from"), mGCPpointsFileName); // showMessageInLog(tr("GCP points loaded from"), mGCPpointsFileName);
mCanvas->refresh(); if ( mGCPsDirty )
{
mGCPListWidget->setGCPList( &mPoints );
updateGeorefTransform();
mCanvas->refresh();
mIface->mapCanvas()->refresh();
}
return true; return true;
} }