sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

allowing unicode error messages

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@15051 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
brushtyler 2011-01-15 12:49:35 +00:00
parent 185ec5db69
commit 8133a995d1
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/plugins/GdalTools/GdalTools.py
View File

@ -32,7 +32,7 @@ try:
from osgeo import gdal
from osgeo import ogr
except ImportError, e:
error_str = str(e)
error_str = e.args[0]
error_mod = error_str.replace( "No module named ", "" )
if req_mods.has_key( error_mod ):
error_str = error_str.replace( error_mod, req_mods[error_mod] )

7
python/plugins/GdalTools/tools/GdalTools_utils.py
View File

@ -181,10 +181,15 @@ def fillVectorOutputFormat(aFilter = None, filename = None):
return shortName
class UnsupportedOGRFormat(Exception):
def __init__(self):
msg = QCoreApplication.translate( "GdalTools", "The selected file is not a supported OGR format" )
Exception.__init__(self, msg)
def getVectorFields(vectorFile):
hds = ogr.Open( unicode(vectorFile).encode('utf8') )
if hds == None:
raise Exception( QCoreApplication.translate( "GdalTools", "The selected file is not a supported OGR format" ) )
raise UnsupportedOGRFormat()
fields = []
names = []

4
python/plugins/GdalTools/tools/doGrid.py
View File

@ -183,8 +183,8 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget):
try:
(fields, names) = Utils.getVectorFields(vectorFile)
except Exception, e:
QErrorMessage(self).showMessage( str(e) )
except Utils.UnsupportedOGRFormat, e:
QErrorMessage(self).showMessage( e.args[0] )
self.inputLayerCombo.clearEditText()
self.inputLayerCombo.setCurrentIndex(-1)

4
python/plugins/GdalTools/tools/doRasterize.py
View File

@ -104,8 +104,8 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget):
try:
(fields, names) = Utils.getVectorFields(vectorFile)
except Exception, e:
QErrorMessage(self).showMessage( str(e) )
except Utils.UnsupportedOGRFormat, e:
QErrorMessage(self).showMessage( e.args[0] )
self.inputLayerCombo.clearEditText()
self.inputLayerCombo.setCurrentIndex(-1)