Added AGG output format to mapserver export

Please enter the commit message for your changes. git-svn-id: http://svn.osgeo.org/qgis/trunk@12286 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 29, 2009 · 0fc6e31 · 0fc6e31
1 parent 4adbbd3
commit 0fc6e31
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/python/plugins/mapserver_export/mapserverexport.py b/python/plugins/mapserver_export/mapserverexport.py
@@ -108,7 +108,7 @@ def run(self):
     if settings.contains("/MapserverExport/mapHeight"):
       self.dlg.ui.txtMapHeight.setText(settings.value("/MapserverExport/mapHeight").toString ())
     # MapServer IMAGETYPE's [gif|png|jpeg|wbmp|gtiff|swf|userdefined]
-    self.dlg.ui.cmbMapImageType.addItems(QStringList(["png","gif","jpeg","wbmp","gtiff","swf","userdefined"]))
+    self.dlg.ui.cmbMapImageType.addItems(QStringList(["agg","png","gif","jpeg","wbmp","gtiff","swf","userdefined"]))
     if settings.contains("/MapserverExport/imageType"):
       idx = self.dlg.ui.cmbMapImageType.findText(settings.value("/MapserverExport/imageType").toString ())
       self.dlg.ui.cmbMapImageType.setCurrentIndex(idx)

diff --git a/python/plugins/mapserver_export/ms_export.py b/python/plugins/mapserver_export/ms_export.py
@@ -294,11 +294,15 @@ def writeOutputFormat(self):
     self.outFile.write("\n")
     self.outFile.write("  OUTPUTFORMAT\n")
     self.outFile.write("    NAME " + self.imageType + "\n")
-    self.outFile.write("    DRIVER 'GD/" + self.imageType.upper() + "'\n")
-    self.outFile.write("    MIMETYPE 'image/" + lower(self.imageType) + "'\n")
-    if self.imageType.lower() != "gif":
-      self.outFile.write("    IMAGEMODE RGBA\n")
-    self.outFile.write("    EXTENSION '" + lower(self.imageType) + "'\n")
+    if self.imageType == 'agg':
+        self.outFile.write("    DRIVER AGG/PNG\n")
+        self.outFile.write("    IMAGEMODE RGB\n")
+    else:
+        self.outFile.write("    DRIVER 'GD/" + self.imageType.upper() + "'\n")
+        self.outFile.write("    MIMETYPE 'image/" + lower(self.imageType) + "'\n")
+        if self.imageType.lower() != "gif":
+          self.outFile.write("    IMAGEMODE RGBA\n")
+        self.outFile.write("    EXTENSION '" + lower(self.imageType) + "'\n")
     self.outFile.write("  END\n")