[georef] Show messages when georeferencer creates a world file

(fix #7429). Also fix raster not loaded into main canvas when creating a world file (fix #10018).
qgis · Jun 21, 2015 · 759d85a · 759d85a
1 parent 9041950
commit 759d85a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
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>