sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

removes print to stdout in geoprocessing module - fixes crash when python print

Browse Source 
to stdout on vista machines


git-svn-id: http://svn.osgeo.org/qgis/trunk@9991 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
cfarmer 2009-01-20 23:03:13 +00:00
parent 813e17648e
commit 3c261c6e87
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
python/plugins/ftools/tools/doGeoprocessing.py
View File

@ -139,7 +139,6 @@ class GeoprocessingDialog( QDialog, Ui_Dialog ):
#8: Clip #8: Clip
def geoprocessing( self, myLayerA, myLayerB, myParam, myMerge ): def geoprocessing( self, myLayerA, myLayerB, myParam, myMerge ):
print "starting geoprocessing..."
self.testThread = geoprocessingThread( self.iface.mainWindow(), self, self.myFunction, myLayerA, self.testThread = geoprocessingThread( self.iface.mainWindow(), self, self.myFunction, myLayerA,
myLayerB, myParam, myMerge, self.shapefileName, self.encoding ) myLayerB, myParam, myMerge, self.shapefileName, self.encoding )
QObject.connect( self.testThread, SIGNAL( "runFinished(PyQt_PyObject)" ), self.runFinishedFromThread ) QObject.connect( self.testThread, SIGNAL( "runFinished(PyQt_PyObject)" ), self.runFinishedFromThread )
@ -148,7 +147,6 @@ class GeoprocessingDialog( QDialog, Ui_Dialog ):
self.cancel_close.setText( "Cancel" ) self.cancel_close.setText( "Cancel" )
QObject.connect( self.cancel_close, SIGNAL( "clicked()" ), self.cancelThread ) QObject.connect( self.cancel_close, SIGNAL( "clicked()" ), self.cancelThread )
self.testThread.start() self.testThread.start()
print "\n"
return True return True
def cancelThread( self ): def cancelThread( self ):
@ -239,8 +237,6 @@ class geoprocessingThread( QThread ):
while vproviderA.nextFeature( inFeat ): while vproviderA.nextFeature( inFeat ):
nElement += 1 nElement += 1
self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement ) self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement )
print '%s\r' % ''*20,
print '%d%%' % int( float( nElement ) / float( nFeat ) * 100.00 ),
atMap = inFeat.attributeMap() atMap = inFeat.attributeMap()
if useField: if useField:
value = atMap[ self.myParam ].toDouble()[ 0 ] value = atMap[ self.myParam ].toDouble()[ 0 ]
@ -260,8 +256,6 @@ class geoprocessingThread( QThread ):
while vproviderA.nextFeature( inFeat ): while vproviderA.nextFeature( inFeat ):
nElement += 1 nElement += 1
self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement ) self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement )
print '%s\r' % ''*20,
print '%d%%' % int( float( nElement ) / float( nFeat ) * 100.00 ),
atMap = inFeat.attributeMap() atMap = inFeat.attributeMap()
if useField: if useField:
value = atMap[ self.myParam ].toDouble()[ 0 ] value = atMap[ self.myParam ].toDouble()[ 0 ]
@ -300,8 +294,6 @@ class geoprocessingThread( QThread ):
while vproviderA.nextFeature( inFeat ): while vproviderA.nextFeature( inFeat ):
nElement += 1 nElement += 1
self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement ) self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement )
print '%s\r' % ''*20,
print '%d%%' % int( float( nElement ) / float( nFeat ) * 100.00 ),
atMap = inFeat.attributeMap() atMap = inFeat.attributeMap()
idVar = atMap[ self.myParam ] idVar = atMap[ self.myParam ]
if idVar.toString().trimmed() == i.toString().trimmed(): if idVar.toString().trimmed() == i.toString().trimmed():
@ -329,8 +321,6 @@ class geoprocessingThread( QThread ):
while vproviderA.nextFeature( inFeat ): while vproviderA.nextFeature( inFeat ):
nElement += 1 nElement += 1
self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement ) self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement )
print '%s\r' % ''*20,
print '%d%%' % int( float( nElement ) / float( nFeat ) * 100.00 ),
inGeom = inFeat.geometry() inGeom = inFeat.geometry()
points = ftools_utils.extractPoints( inGeom ) points = ftools_utils.extractPoints( inGeom )
hull.extend( points ) hull.extend( points )
@ -366,8 +356,6 @@ class geoprocessingThread( QThread ):
while vproviderA.nextFeature( inFeat ): while vproviderA.nextFeature( inFeat ):
nElement += 1 nElement += 1
self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement ) self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement )
print '%s\r' % ''*20,
print '%d%%' % int( float( nElement ) / float( nFeat ) * 100.00 ),
if not useField: if not useField:
if first: if first:
attrs = inFeat.attributeMap() attrs = inFeat.attributeMap()
@ -411,8 +399,6 @@ class geoprocessingThread( QThread ):
while vproviderA.nextFeature( inFeatA ): while vproviderA.nextFeature( inFeatA ):
nElement += 1 nElement += 1
self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement ) self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement )
print '%s\r' % ''*20,
print '%d%%' % int( float( nElement ) / float( nFeat ) * 100.00 ),
geom = inFeatA.geometry() geom = inFeatA.geometry()
atMap = inFeatA.attributeMap() atMap = inFeatA.attributeMap()
intersects = index.intersects( geom.boundingBox() ) intersects = index.intersects( geom.boundingBox() )
@ -449,8 +435,6 @@ class geoprocessingThread( QThread ):
while vproviderA.nextFeature( inFeatA ): while vproviderA.nextFeature( inFeatA ):
nElement += 1 nElement += 1
self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement ) self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement )
print '%s\r' % ''*20,
print '%d%%' % int( float( nElement ) / float( nFeat ) * 100.00 ),
geom = inFeatA.geometry() geom = inFeatA.geometry()
atMapA = inFeatA.attributeMap() atMapA = inFeatA.attributeMap()
intersects = index.intersects( geom.boundingBox() ) intersects = index.intersects( geom.boundingBox() )
@ -490,7 +474,6 @@ class geoprocessingThread( QThread ):
while vproviderA.nextFeature( inFeatA ): while vproviderA.nextFeature( inFeatA ):
nElement += 1 nElement += 1
self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement ) self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement )
print int( float( nElement ) / float( nFeat ) * 100.00 )
found = False found = False
geom = QgsGeometry( inFeatA.geometry() ) geom = QgsGeometry( inFeatA.geometry() )
diffGeom = QgsGeometry( inFeatA.geometry() ) diffGeom = QgsGeometry( inFeatA.geometry() )
@ -520,7 +503,6 @@ class geoprocessingThread( QThread ):
while vproviderB.nextFeature( inFeatA ): while vproviderB.nextFeature( inFeatA ):
nElement += 1 nElement += 1
self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement ) self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement )
print int( float( nElement ) / float( nFeat ) * 100.00 ),
geom = QgsGeometry( inFeatA.geometry() ) geom = QgsGeometry( inFeatA.geometry() )
atMap = inFeatA.attributeMap().values() atMap = inFeatA.attributeMap().values()
atMap = dict( zip( range( length, length + len( atMap ) ), atMap ) ) atMap = dict( zip( range( length, length + len( atMap ) ), atMap ) )
@ -565,8 +547,6 @@ class geoprocessingThread( QThread ):
while vproviderA.nextFeature( inFeatA ): while vproviderA.nextFeature( inFeatA ):
nElement += 1 nElement += 1
self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement ) self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement )
print '%s\r' % ''*20,
print '%d%%' % int( float( nElement ) / float( nFeat ) * 100.00 ),
geom = inFeatA.geometry() geom = inFeatA.geometry()
atMapA = inFeatA.attributeMap() atMapA = inFeatA.attributeMap()
intersects = indexA.intersects( geom.boundingBox() ) intersects = indexA.intersects( geom.boundingBox() )
@ -582,8 +562,6 @@ class geoprocessingThread( QThread ):
while vproviderB.nextFeature( inFeatA ): while vproviderB.nextFeature( inFeatA ):
nElement += 1 nElement += 1
self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement ) self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement )
print '%s\r' % ''*20,
print '%d%%' % int( float( nElement ) / float( nFeat ) * 100.00 ),
geom = inFeatA.geometry() geom = inFeatA.geometry()
atMap = inFeatA.attributeMap().values() atMap = inFeatA.attributeMap().values()
atMap = dict( zip( range( length, length + len( atMap ) ), atMap ) ) atMap = dict( zip( range( length, length + len( atMap ) ), atMap ) )
@ -622,8 +600,6 @@ class geoprocessingThread( QThread ):
while vproviderA.nextFeature( inFeatA ): while vproviderA.nextFeature( inFeatA ):
nElement += 1 nElement += 1
self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement ) self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), nElement )
print '%s\r' % ''*20,
print '%d%%' % int( float( nElement ) / float( nFeat ) * 100.00 ),
geom = inFeatA.geometry() geom = inFeatA.geometry()
atMap = inFeatA.attributeMap() atMap = inFeatA.attributeMap()
intersects = index.intersects( geom.boundingBox() ) intersects = index.intersects( geom.boundingBox() )