sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

mapserver export fix:

Browse Source 
- use double quotation marks for postgres layers (fixes #1104)
- export original instead of localized unit names


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9782 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2008-12-13 13:19:26 +00:00
parent 54ff08a3c3
commit b523c12030
5 changed files with 8 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/plugins/mapserver_export/mapserverexport.py
View File

@ -81,7 +81,7 @@ class MapServerExport:
exporter = Qgis2Map(str(self.dlg.ui.txtQgisFilePath.text()), str(self.dlg.ui.txtMapFilePath.text()))
print "Setting options"
exporter.setOptions(
self.dlg.ui.cmbMapUnits.currentText(),
self.dlg.ui.cmbMapUnits.itemData( self.dlg.ui.cmbMapUnits.currentIndex() ).toString(),
self.dlg.ui.cmbMapImageType.currentText(),
self.dlg.ui.txtMapName.text(),
self.dlg.ui.txtMapWidth.text(),

4
python/plugins/mapserver_export/mapserverexportdialog.py
View File

@ -27,3 +27,7 @@ class MapServerExportDialog(QtGui.QDialog):
self.ui = Ui_QgsMapserverExportBase()
self.ui.setupUi(self)
for unit in ["dd", "feet", "meters", "miles", "inches", "kilometers"]:
self.ui.cmbMapUnits.addItem( QtGui.QApplication.translate("QgsMapserverExportBase", unit, None, QtGui.QApplication.UnicodeUTF8), QtCore.QVariant(unit) )

6
python/plugins/mapserver_export/ms_export.py
View File

@ -323,11 +323,11 @@ class Qgis2Map:
# it's a postgis layer
(pgConnString, sqlData, sqlFilter) = self.parsePostgisConnection(dataString)
layer_def += " CONNECTIONTYPE postgis\n"
layer_def += " CONNECTION '" + pgConnString + "'\n"
layer_def += " DATA '" + sqlData + "'\n"
layer_def += " CONNECTION \"" + pgConnString + "\"\n"
layer_def += " DATA \"" + sqlData + "\"\n"
# don't write the filter keyword if there isn't one
if sqlFilter:
layer_def += " FILTER '" + sqlFilter + "'\n"
layer_def += " FILTER \"" + sqlFilter + "\"\n"
elif providerString == 'wms' and lyr.getAttribute("type").encode('utf-8').upper() == 'RASTER':
# it's a WMS layer

30
python/plugins/mapserver_export/qgsmapserverexportbase.ui
View File

@ -257,36 +257,6 @@
</item>
<item>
<widget class="QComboBox" name="cmbMapUnits" >
<item>
<property name="text" >
<string>dd</string>
</property>
</item>
<item>
<property name="text" >
<string>feet</string>
</property>
</item>
<item>
<property name="text" >
<string>meters</string>
</property>
</item>
<item>
<property name="text" >
<string>miles</string>
</property>
</item>
<item>
<property name="text" >
<string>inches</string>
</property>
</item>
<item>
<property name="text" >
<string>kilometers</string>
</property>
</item>
</widget>
</item>
<item>

6
python/plugins/mapserver_export/ui_mapserverexport.py
View File

@ -230,12 +230,6 @@ class Ui_QgsMapserverExportBase(object):
self.btnChooseFooterFile.setText(QtGui.QApplication.translate("QgsMapserverExportBase", "Browse...", None, QtGui.QApplication.UnicodeUTF8))
self.grpMap.setTitle(QtGui.QApplication.translate("QgsMapserverExportBase", "Map", None, QtGui.QApplication.UnicodeUTF8))
self.textLabel3.setText(QtGui.QApplication.translate("QgsMapserverExportBase", "Units", None, QtGui.QApplication.UnicodeUTF8))
self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "dd", None, QtGui.QApplication.UnicodeUTF8))
self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "feet", None, QtGui.QApplication.UnicodeUTF8))
self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "meters", None, QtGui.QApplication.UnicodeUTF8))
self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "miles", None, QtGui.QApplication.UnicodeUTF8))
self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "inches", None, QtGui.QApplication.UnicodeUTF8))
self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "kilometers", None, QtGui.QApplication.UnicodeUTF8))
self.textLabel4.setText(QtGui.QApplication.translate("QgsMapserverExportBase", "Image type", None, QtGui.QApplication.UnicodeUTF8))
self.cmbMapImageType.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "gif", None, QtGui.QApplication.UnicodeUTF8))
self.cmbMapImageType.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "gtiff", None, QtGui.QApplication.UnicodeUTF8))