Expose world file option in image settings dialog

nyalldawson · nyalldawson · commit 0f9aaf4c44b5 · 2017-12-17T14:14:31.000+10:00
diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -1456,6 +1456,7 @@ void QgsLayoutDesignerDialog::exportToRaster()
   imageDlg.setResolution( dpi );
   imageDlg.setCropToContents( cropToContents );
   imageDlg.setCropMargins( marginTop, marginRight, marginBottom, marginLeft );
+  imageDlg.setGenerateWorldFile( mLayout->customProperty( QStringLiteral( "exportWorldFile" ), false ).toBool() );
 
 #if 0 //TODO
   QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
@@ -1505,7 +1506,7 @@ void QgsLayoutDesignerDialog::exportToRaster()
   {
     settings.imageSize = QSize( imageDlg.imageWidth(), imageDlg.imageHeight() );
   }
-  settings.generateWorldFile = mLayout->customProperty( QStringLiteral( "exportWorldFile" ), false ).toBool();
+  settings.generateWorldFile = imageDlg.generateWorldFile();
 
   switch ( exporter.exportToImage( fileNExt.first, settings ) )
   {
diff --git a/src/app/layout/qgslayoutimageexportoptionsdialog.cpp b/src/app/layout/qgslayoutimageexportoptionsdialog.cpp
@@ -95,6 +95,16 @@ bool QgsLayoutImageExportOptionsDialog::cropToContents() const
   return mClipToContentGroupBox->isChecked();
 }
 
+void QgsLayoutImageExportOptionsDialog::setGenerateWorldFile( bool generate )
+{
+  mGenerateWorldFile->setChecked( generate );
+}
+
+bool QgsLayoutImageExportOptionsDialog::generateWorldFile() const
+{
+  return mGenerateWorldFile->isChecked();
+}
+
 void QgsLayoutImageExportOptionsDialog::getCropMargins( int &topMargin, int &rightMargin, int &bottomMargin, int &leftMargin ) const
 {
   topMargin = mTopMarginSpinBox->value();
diff --git a/src/app/layout/qgslayoutimageexportoptionsdialog.h b/src/app/layout/qgslayoutimageexportoptionsdialog.h
@@ -84,6 +84,18 @@ class QgsLayoutImageExportOptionsDialog: public QDialog, private Ui::QgsLayoutIm
      */
     bool cropToContents() const;
 
+    /**
+     * Sets whether the generate world file option should be checked.
+     * \see generateWorldFile()
+     */
+    void setGenerateWorldFile( bool generate );
+
+    /**
+     * Returns whether the generate world file option is checked in the dialog.
+     * \see setGenerateWorldFile()
+     */
+    bool generateWorldFile() const;
+
     /**
      * Fetches the current crop to contents margin values, in pixels.
      * \param topMargin destination for top margin
diff --git a/src/ui/layout/qgslayoutimageexportoptions.ui b/src/ui/layout/qgslayoutimageexportoptions.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>533</width>
-    <height>651</height>
+    <height>394</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -234,6 +234,16 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QCheckBox" name="mGenerateWorldFile">
+     <property name="toolTip">
+      <string>If checked, a separate world file which georeferences exported images will be created</string>
+     </property>
+     <property name="text">
+      <string>Generate world file</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">

Original file line number	Diff line number	Diff line change
`@@ -1456,6 +1456,7 @@ void QgsLayoutDesignerDialog::exportToRaster()`
`1456`	`1456`	`imageDlg.setResolution( dpi );`
`1457`	`1457`	`imageDlg.setCropToContents( cropToContents );`
`1458`	`1458`	`imageDlg.setCropMargins( marginTop, marginRight, marginBottom, marginLeft );`
	`1459`	`+ imageDlg.setGenerateWorldFile( mLayout->customProperty( QStringLiteral( "exportWorldFile" ), false ).toBool() );`
`1459`	`1460`
`1460`	`1461`	`#if 0 //TODO`
`1461`	`1462`	`QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();`
`@@ -1505,7 +1506,7 @@ void QgsLayoutDesignerDialog::exportToRaster()`
`1505`	`1506`	`{`
`1506`	`1507`	`settings.imageSize = QSize( imageDlg.imageWidth(), imageDlg.imageHeight() );`
`1507`	`1508`	`}`
`1508`		`- settings.generateWorldFile = mLayout->customProperty( QStringLiteral( "exportWorldFile" ), false ).toBool();`
	`1509`	`+ settings.generateWorldFile = imageDlg.generateWorldFile();`
`1509`	`1510`
`1510`	`1511`	`switch ( exporter.exportToImage( fileNExt.first, settings ) )`
`1511`	`1512`	`{`