fix_2260.diff

Proposed patch - Alexander Bruy, 2010-05-06 11:05 AM

Download (1.28 KB)

View differences:

python/plugins/fTools/tools/doGeometry.py (working copy)
169 169
      QMessageBox.warning( self, self.tr("Geometry"), self.tr("Error processing specified tolerance!\nPlease choose larger tolerance...") )
170 170
      if not QgsVectorFileWriter.deleteShapeFile( self.shapefileName ):
171 171
        QMessageBox.warning( self, self.tr("Geometry"), self.tr( "Unable to delete incomplete shapefile." ) )
172
    elif success == "attr_error":
173
      QMessageBox.warning( self, self.tr("Geometry"), self.tr("At least two features must have same attribute value!\nPlease choose another field...") )
174
      if not QgsVectorFileWriter.deleteShapeFile( self.shapefileName ):
175
        QMessageBox.warning( self, self.tr("Geometry"), self.tr( "Unable to delete incomplete shapefile." ) )
172 176
    else:
173 177
      self.cancel_close.setText( "Close" )
174 178
      QObject.disconnect( self.cancel_close, SIGNAL( "clicked()" ), self.cancelThread )
......
267 271
        outFeat.setGeometry( outGeom )
268 272
        writer.addFeature( outFeat )
269 273
      del writer
274
    else:
275
      return "attr_error"
270 276
    return True
271 277
  def multi_to_single( self ):