compat_fix_doValidate.diff

Proposed patch - Alexander Bruy, 2010-11-13 01:24 PM

Download (2.56 KB)

View differences:

python/plugins/fTools/tools/doValidate.py (working copy)
24 24
    self.tblUnique.setSelectionBehavior(QAbstractItemView.SelectRows)
25 25
    # populate list of available layers
26 26
    myList = ftools_utils.getLayerNames( [ QGis.Point, QGis.Line, QGis.Polygon ] )
27
    self.connect(self.tblUnique, SIGNAL("currentItemChanged(QTableWidgetItem*, QTableWidgetItem*)" ), 
27
    self.connect(self.tblUnique, SIGNAL("currentItemChanged(QTableWidgetItem*, QTableWidgetItem*)" ),
28 28
    self.zoomToError)
29 29
    self.inShape.addItems( myList )
30 30
    self.cancel_close = self.buttonBox_2.button(QDialogButtonBox.Close)
31 31
    self.buttonOk = self.buttonBox_2.button(QDialogButtonBox.Ok)
32 32
    self.progressBar.setValue(0)
33 33
    self.storedScale = self.iface.mapCanvas().scale()
34
    
34

  
35 35
  def keyPressEvent( self, e ):
36 36
    if ( e.modifiers() == Qt.ControlModifier or \
37 37
         e.modifiers() == Qt.MetaModifier ) and \
......
54 54
      QMessageBox.information( self, self.tr("Error!"), self.tr( "Please specify input field" ) )
55 55
    else:
56 56
      self.validate( self.inShape.currentText(), self.useSelected.checkState() )
57
      
57

  
58 58
  def zoomToError(self, curr, prev):
59 59
      if curr is None:
60 60
        return
......
93 93
    self.testThread.stop()
94 94
    QApplication.restoreOverrideCursor()
95 95
    self.buttonOk.setEnabled( True )
96
    
96

  
97 97
  def runFinishedFromThread( self, output ):
98 98
    self.testThread.stop()
99 99
    QApplication.restoreOverrideCursor()
......
124 124
    self.cancel_close.setText( "Close" )
125 125
    QObject.disconnect( self.cancel_close, SIGNAL( "clicked()" ), self.cancelThread )
126 126
    return True
127
    
127

  
128 128
  def runStatusFromThread( self, status ):
129 129
    self.progressBar.setValue( status )
130
        
130

  
131 131
  def runRangeFromThread( self, range_vals ):
132 132
    self.progressBar.setRange( range_vals[ 0 ], range_vals[ 1 ] )
133 133

  
......
154 154
      layer = vlayer.selectedFeatures()
155 155
      nFeat = len(layer)
156 156
    else:
157
      layer = vlayer
158
      layer.select([]) # select all features, and ignore attributes
159
      nFeat = layer.featureCount()
157
      #layer = vlayer
158
      layer = []
159
      vlayer.select([]) # select all features, and ignore attributes
160
      ft = QgsFeature()
161
      while vlayer.nextFeature( ft ):
162
        layer.append( ft )
163
        ft = QgsFeature()
164
      nFeat = vlayer.featureCount()
160 165
    nElement = 0
161 166
    if nFeat > 0:
162 167
      self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), 0 )