[georef] Show messages when georeferencer creates a world file

nyalldawson · nyalldawson · commit 759d85a2f2d8 · 2015-06-21T21:45:14.000+10:00
(fix #7429). Also fix raster not loaded into main canvas when creating a world file (fix #10018).
diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -1333,17 +1333,20 @@ bool QgsGeorefPluginGui::georeference()
       return false;
     }
 
-    bool success = writeWorldFile( origin, pixelXSize, pixelYSize, rotation );
-    if ( success && !mPdfOutputFile.isEmpty() )
+    if ( !writeWorldFile( origin, pixelXSize, pixelYSize, rotation ) )
+    {
+      return false;
+    }
+
+    if ( !mPdfOutputFile.isEmpty() )
     {
       writePDFReportFile( mPdfOutputFile, mGeorefTransform );
     }
-    if ( success && !mPdfOutputMapFile.isEmpty() )
+    if ( !mPdfOutputMapFile.isEmpty() )
     {
       writePDFMapFile( mPdfOutputMapFile, mGeorefTransform );
     }
-
-
+    return true;
   }
   else // Helmert, Polinom 1, Polinom 2, Polinom 3
   {
diff --git a/src/plugins/georeferencer/qgstransformsettingsdialogbase.ui b/src/plugins/georeferencer/qgstransformsettingsdialogbase.ui
@@ -226,7 +226,7 @@
       <item row="2" column="0" colspan="2">
        <widget class="QCheckBox" name="mWorldFileCheckBox">
         <property name="text">
-         <string>Create world file</string>
+         <string>Create world file only (linear transforms)</string>
         </property>
        </widget>
       </item>

Original file line number	Diff line number	Diff line change
`@@ -1333,17 +1333,20 @@ bool QgsGeorefPluginGui::georeference()`
`1333`	`1333`	`return false;`
`1334`	`1334`	`}`
`1335`	`1335`
`1336`		`- bool success = writeWorldFile( origin, pixelXSize, pixelYSize, rotation );`
`1337`		`- if ( success && !mPdfOutputFile.isEmpty() )`
	`1336`	`+ if ( !writeWorldFile( origin, pixelXSize, pixelYSize, rotation ) )`
	`1337`	`+ {`
	`1338`	`+ return false;`
	`1339`	`+ }`
	`1340`	`+`
	`1341`	`+ if ( !mPdfOutputFile.isEmpty() )`
`1338`	`1342`	`{`
`1339`	`1343`	`writePDFReportFile( mPdfOutputFile, mGeorefTransform );`
`1340`	`1344`	`}`
`1341`		`- if ( success && !mPdfOutputMapFile.isEmpty() )`
	`1345`	`+ if ( !mPdfOutputMapFile.isEmpty() )`
`1342`	`1346`	`{`
`1343`	`1347`	`writePDFMapFile( mPdfOutputMapFile, mGeorefTransform );`
`1344`	`1348`	`}`
`1345`		`-`
`1346`		`-`
	`1349`	`+ return true;`
`1347`	`1350`	`}`
`1348`	`1351`	`else // Helmert, Polinom 1, Polinom 2, Polinom 3`
`1349`	`1352`	`{`