[QGIS Commit] r13846 - trunk/qgis/python/plugins/fTools/tools

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-06-30 00:02:45 +0000 (Wed, 30 Jun 2010)
New Revision: 13846

Modified:
   trunk/qgis/python/plugins/fTools/tools/doVisual.py
Log:
fix for #2833 and #2843

Modified: trunk/qgis/python/plugins/fTools/tools/doVisual.py
===================================================================
--- trunk/qgis/python/plugins/fTools/tools/doVisual.py	2010-06-29 20:21:18 UTC (rev 13845)
+++ trunk/qgis/python/plugins/fTools/tools/doVisual.py	2010-06-30 00:02:45 UTC (rev 13846)
@@ -112,6 +112,7 @@
     self.tblUnique.setRowCount( 0 )
     self.lstCount.clear()
     self.buttonOk.setEnabled( False )
+
     self.testThread = visualThread( self.iface.mainWindow(), self, self.myFunction, vlayer, myField, mySelection )
     QObject.connect( self.testThread, SIGNAL( "runFinished(PyQt_PyObject)" ), self.runFinishedFromThread )
     QObject.connect( self.testThread, SIGNAL( "runStatus(PyQt_PyObject)" ), self.runStatusFromThread )
@@ -120,15 +121,20 @@
     QObject.connect( self.testThread, SIGNAL( "runPartStatus(PyQt_PyObject)" ), self.runPartStatusFromThread )
     self.cancel_close.setText( self.tr("Cancel") )
     QObject.connect( self.cancel_close, SIGNAL( "clicked()" ), self.cancelThread )
+
+    QApplication.setOverrideCursor( Qt.WaitCursor )
     self.testThread.start()
     return True
 
   def cancelThread( self ):
     self.testThread.stop()
+    QApplication.restoreOverrideCursor()
     self.buttonOk.setEnabled( True )
+    QApplication.restoreOverrideCursor()
     
   def runFinishedFromThread( self, output ):
     self.testThread.stop()
+    QApplication.restoreOverrideCursor()
     self.buttonOk.setEnabled( True )
     result = output[ 0 ]
     numRows = len( result )
@@ -429,8 +435,8 @@
 
     while vprovider.nextFeature( feat ):
       geom = QgsGeometry( feat.geometry() )
+      self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement )
       nElement += 1
-      self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement )
       if geom.isMultipart():
         polygons = geom.asMultiPolygon()
         for polygon in polygons:
@@ -502,10 +508,11 @@
         self.emit( SIGNAL( "runPartStatus(PyQt_PyObject)" ), nPart )
 
         count = 0
-        for j in range( i, len(h)-1 ):
+        for j in range( i+1, len(h)-1 ):
           if QgsGeometry().fromPolyline( [ h[ i ], h[ i + 1 ] ] ).intersects( QgsGeometry().fromPolyline( [ h[ j ], h[ j + 1 ] ] ) ):
             count += 1
-        if count > 2:
+
+        if (i==0 and count>2) or (i>0 and count>1):
           self.emit( SIGNAL( "runPartStatus(PyQt_PyObject)" ), cPart )
           return True