sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

some quick fixes to voronoi and delaunay tools

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@14758 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
cfarmer 2010-11-24 18:57:45 +00:00
parent 40fe49df98
commit 33ea700da4
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
python/plugins/fTools/tools/doGeometry.py
View File

@ -463,12 +463,16 @@ class geometryThread( QThread ):
inFeat = QgsFeature() inFeat = QgsFeature()
c = voronoi.Context() c = voronoi.Context()
pts = [] pts = []
ptDict = {}
ptNdx = -1
while vprovider.nextFeature(inFeat): while vprovider.nextFeature(inFeat):
geom = QgsGeometry(inFeat.geometry()) geom = QgsGeometry(inFeat.geometry())
point = geom.asPoint() point = geom.asPoint()
x = point.x() x = point.x()
y = point.y() y = point.y()
pts.append((x, y)) pts.append((x, y))
ptNdx +=1
ptDict[ptNdx] = inFeat.id()
if len(pts) < 3: if len(pts) < 3:
return False return False
uniqueSet = Set(item for item in pts) uniqueSet = Set(item for item in pts)
@ -488,7 +492,7 @@ class geometryThread( QThread ):
polygon = [] polygon = []
step = 0 step = 0
for index in indicies: for index in indicies:
vprovider.featureAtId( ids[index], inFeat, True, allAttrs ) vprovider.featureAtId(ptDict[ids[index]], inFeat, True, allAttrs)
geom = QgsGeometry(inFeat.geometry()) geom = QgsGeometry(inFeat.geometry())
point = QgsPoint(geom.asPoint()) point = QgsPoint(geom.asPoint())
polygon.append(point) polygon.append(point)
@ -517,18 +521,22 @@ class geometryThread( QThread ):
width = extent.width() width = extent.width()
c = voronoi.Context() c = voronoi.Context()
pts = [] pts = []
ptDict = {}
ptNdx = -1
while vprovider.nextFeature(inFeat): while vprovider.nextFeature(inFeat):
geom = QgsGeometry(inFeat.geometry()) geom = QgsGeometry(inFeat.geometry())
point = geom.asPoint() point = geom.asPoint()
x = point.x()-extent.xMinimum() x = point.x()-extent.xMinimum()
y = point.y()-extent.yMinimum() y = point.y()-extent.yMinimum()
pts.append((x, y)) pts.append((x, y))
ptNdx +=1
ptDict[ptNdx] = inFeat.id()
self.vlayer = None self.vlayer = None
if len(pts) < 3: if len(pts) < 3:
return False return False
uniqueSet = Set(item for item in pts) uniqueSet = Set(item for item in pts)
ids = [pts.index(item) for item in uniqueSet] ids = [pts.index(item) for item in uniqueSet]
sl = voronoi.SiteList([voronoi.Site(*i, sitenum=j) for j, i in enumerate(uniqueSet)]) sl = voronoi.SiteList([voronoi.Site(i[0], i[1], sitenum=j) for j, i in enumerate(uniqueSet)])
voronoi.voronoi(sl, c) voronoi.voronoi(sl, c)
inFeat = QgsFeature() inFeat = QgsFeature()
nFeat = len(c.polygons) nFeat = len(c.polygons)
@ -536,7 +544,7 @@ class geometryThread( QThread ):
self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), 0 ) self.emit( SIGNAL( "runStatus(PyQt_PyObject)" ), 0 )
self.emit( SIGNAL( "runRange(PyQt_PyObject)" ), ( 0, nFeat ) ) self.emit( SIGNAL( "runRange(PyQt_PyObject)" ), ( 0, nFeat ) )
for site, edges in c.polygons.iteritems(): for site, edges in c.polygons.iteritems():
vprovider.featureAtId(ids[site], inFeat, True, allAttrs) vprovider.featureAtId(ptDict[ids[site]], inFeat, True, allAttrs)
lines = self.clip_voronoi(edges, c, width, height, extent, extraX, extraY) lines = self.clip_voronoi(edges, c, width, height, extent, extraX, extraY)
geom = QgsGeometry.fromMultiPoint(lines) geom = QgsGeometry.fromMultiPoint(lines)
geom = QgsGeometry(geom.convexHull()) geom = QgsGeometry(geom.convexHull())