gdaltools_path.diff

Minoru Akagi, 2012-12-17 08:17 PM

Download (3.32 KB)

View differences:

python/plugins/GdalTools/tools/GdalTools_utils.py
798 798
def setProcessEnvironment(process):
799 799
    envvar_list = {
800 800
        "PATH" : getGdalBinPath(),
801
        "PYTHONPATH" : getGdalPymodPath()
801
        "PYTHONPATH" : getGdalPymodPath(),
802
        "GDAL_FILENAME_IS_UTF8" : "NO"
802 803
    }
803 804

  
804 805
    sep = os.pathsep
python/plugins/GdalTools/tools/dialogBase.py
205 205
        return
206 206

  
207 207
      # show the error message if there's one, otherwise show the process output message
208
      msg = QString(self.process.readAllStandardError())
208
      msg = QString.fromLocal8Bit(self.process.readAllStandardError())
209 209
      if msg.isEmpty():
210
        outMessages = QString(self.process.readAllStandardOutput()).split( "\n" )
210
        outMessages = QString.fromLocal8Bit(self.process.readAllStandardOutput()).split( "\n" )
211 211

  
212 212
        # make sure to not show the help
213 213
        for m in outMessages:
python/plugins/GdalTools/tools/doInfo.py
101 101
      arr = QByteArray()
102 102
      arr = self.base.process.readAllStandardOutput()
103 103
      if platform.system() == "Windows":
104
        info = QString( arr ).trimmed().split( "\r\n" )
104
        info = QString.fromLocal8Bit( arr ).trimmed().split( "\r\n" )
105 105
      else:
106 106
        info = QString( arr ).trimmed().split( "\n" )
107 107
      self.rasterInfoList.addItems( info )
python/plugins/GdalTools/tools/doOverview.py
160 160
        BasePluginWidget.onFinished(self, exitCode, status)
161 161
        return
162 162

  
163
      msg = QString( self.base.process.readAllStandardError() )
163
      msg = QString.fromLocal8Bit( self.base.process.readAllStandardError() )
164 164
      if not msg.isEmpty():
165 165
        self.errors.append( ">> " + self.inFiles[self.batchIndex] + "<br>" + msg.replace( "\n", "<br>" ) )
166 166

  
python/plugins/GdalTools/tools/widgetBatchBase.py
112 112
        BasePluginWidget.onFinished(self, exitCode, status)
113 113
        return
114 114

  
115
      msg = QString( self.base.process.readAllStandardError() )
115
      msg = QString.fromLocal8Bit( self.base.process.readAllStandardError() )
116 116
      if not msg.isEmpty():
117 117
        self.errors.append( ">> " + self.inFiles[self.batchIndex] + "<br>" + msg.replace( "\n", "<br>" ) )
118 118