Threaded tiled rendring
This commit is contained in:
Komяpa
parent
8d1778f23f
commit
b4ca7e7049
1 changed files with 93 additions and 48 deletions
|
|
@ -17,6 +17,7 @@
|
|||
import pygtk
|
||||
pygtk.require('2.0')
|
||||
import gtk
|
||||
import gobject
|
||||
import cairo
|
||||
import math
|
||||
import string
|
||||
|
|
@ -26,6 +27,8 @@ import Queue
|
|||
import os
|
||||
from render import RasterTile
|
||||
from debug import debug, Timer
|
||||
import twms.bbox
|
||||
from twms import projections
|
||||
|
||||
class KothicWidget(gtk.DrawingArea):
|
||||
def __init__(self, data, style):
|
||||
|
|
@ -33,7 +36,7 @@ class KothicWidget(gtk.DrawingArea):
|
|||
self.data_backend = data
|
||||
self.style_backend = style
|
||||
self.request_d = (0,0)
|
||||
|
||||
self.tiles = TileSource(data,style, callback=self.redraw)
|
||||
self.dx = 0
|
||||
self.dy = 0
|
||||
self.drag_x = 0
|
||||
|
|
@ -43,9 +46,15 @@ class KothicWidget(gtk.DrawingArea):
|
|||
self.f = True
|
||||
self.width = 0
|
||||
self.height = 0
|
||||
|
||||
self.center_coord = (0.0,0.0)
|
||||
self.max_zoom = 25
|
||||
|
||||
self.zoom = 0
|
||||
self.center_coord = (0.0,0.0)
|
||||
self.old_zoom = 1
|
||||
self.old_center_coord = (0.0,0.1)
|
||||
self.tilebox = [] # bbox of currently seen tiles
|
||||
self.bbox = []
|
||||
|
||||
|
||||
self.add_events(gtk.gdk.BUTTON1_MOTION_MASK)
|
||||
self.add_events(gtk.gdk.POINTER_MOTION_MASK)
|
||||
|
|
@ -58,6 +67,7 @@ class KothicWidget(gtk.DrawingArea):
|
|||
self.connect("button_press_event",self.press_ev)
|
||||
self.connect("button_release_event",self.release_ev)
|
||||
self.connect("scroll_event",self.scroll_ev)
|
||||
|
||||
# self.surface = cairo.ImageSurfaceicreate(gtk.RGB24, self.width, self.height)
|
||||
|
||||
|
||||
|
|
@ -67,7 +77,12 @@ class KothicWidget(gtk.DrawingArea):
|
|||
def jump_to(self, lonlat):
|
||||
self.center_coord = lonlat
|
||||
self.queue_draw()
|
||||
|
||||
def zoom_to(self, bbox):
|
||||
self.zoom = twms.bbox.zoom_for_bbox (bbox, (self.width,self.height), {"proj":"EPSG:3857","max_zoom":self.max_zoom})-1
|
||||
print "Zoom:", self.zoom
|
||||
self.center_coord = ((bbox[0]+bbox[2])/2,(bbox[1]+bbox[3])/2)
|
||||
print self.center_coord
|
||||
self.redraw()
|
||||
|
||||
|
||||
def motion_ev(self, widget, event):
|
||||
|
|
@ -75,7 +90,12 @@ class KothicWidget(gtk.DrawingArea):
|
|||
if self.drag:
|
||||
self.dx = event.x - self.drag_x
|
||||
self.dy = event.y - self.drag_y
|
||||
if((abs(self.dx) > 3 or abs(self.dy) > 3) and self.f):
|
||||
#if((abs(self.dx) > 3 or abs(self.dy) > 3) and self.f):
|
||||
if True:
|
||||
# x = event.x
|
||||
# y = event.y
|
||||
# lo1, la1, lo2, la2 = self.tilebox
|
||||
# self.center_coord = projections.coords_by_tile(self.zoom,1.*x/self.width*(lo2-lo1)+lo1, la1+(1.*y/(self.height)*(la2-la1)),"EPSG:3857")
|
||||
widget.queue_draw()
|
||||
def press_ev(self, widget, event):
|
||||
if event.button == 1:
|
||||
|
|
@ -94,77 +114,102 @@ class KothicWidget(gtk.DrawingArea):
|
|||
self.drag = False
|
||||
self.timer.stop()
|
||||
#debug("dd: %s,%s "%(self.dx, self.dy))
|
||||
self.center_coord = self.rastertile.screen2lonlat(self.rastertile.w/2 - self.dx, self.rastertile.h/2 - self.dy);
|
||||
self.f = True
|
||||
x = event.x
|
||||
y = event.y
|
||||
lo1, la1, lo2, la2 = projections.from4326(self.bbox, "EPSG:3857")
|
||||
print lo1, la1, lo2, la2
|
||||
self.center_coord = projections.to4326((0.5*(self.width+self.dx)/self.width*(lo1-lo2)+lo2, la1+(0.5*(self.height+self.dy)/self.height*(la2-la1))),"EPSG:3857")
|
||||
#self.rastertile.screen2lonlat(self.rastertile.w/2 - self.dx, self.rastertile.h/2 - self.dy);
|
||||
self.dx = 0
|
||||
self.dy = 0
|
||||
self.redraw()
|
||||
|
||||
def scroll_ev(self, widget, event):
|
||||
if event.direction == gtk.gdk.SCROLL_UP:
|
||||
self.zoom += 0.5
|
||||
if self.zoom+0.5 <= self.max_zoom:
|
||||
self.zoom += 0.5
|
||||
#debug("Zoom in")
|
||||
elif event.direction == gtk.gdk.SCROLL_DOWN:
|
||||
if self.zoom >= 0: ## negative zooms are nonsense
|
||||
self.zoom -= 0.5
|
||||
# debug("Zoom out")
|
||||
self.redraw()
|
||||
# widget.queue_draw()
|
||||
#self.redraw()
|
||||
debug("new zoom: %s"%(self.zoom))
|
||||
widget.queue_draw()
|
||||
def redraw(self):
|
||||
"""
|
||||
Force screen redraw.
|
||||
"""
|
||||
res = RasterTile(3*self.width, 3*self.height, self.zoom, self.data_backend)
|
||||
res.update_surface_by_center(self.center_coord, self.zoom, self.style_backend)
|
||||
self.rastertile = res
|
||||
#res = RasterTile(3*self.width, 3*self.height, self.zoom, self.data_backend)
|
||||
#res.update_surface_by_center(self.center_coord, self.zoom, self.style_backend)
|
||||
#self.rastertile = res
|
||||
self.queue_draw()
|
||||
|
||||
|
||||
def expose_ev(self, widget, event):
|
||||
# debug("Expose")
|
||||
|
||||
|
||||
if(widget.allocation.width != self.width or widget.allocation.height != self.height ):
|
||||
#debug("Rrresize!")
|
||||
self.width = widget.allocation.width
|
||||
self.height = widget.allocation.height
|
||||
self.rastertile = None
|
||||
if self.rastertile is None:
|
||||
self.rastertile = RasterTile(self.width*3, self.height*3, self.zoom, self.data_backend)
|
||||
self.rastertile.update_surface_by_center(self.center_coord, self.zoom, self.style_backend, None)
|
||||
#nrt = None
|
||||
#while(not self.comm[1].empty()):
|
||||
#nrt = self.comm[1].get()
|
||||
#self.comm[1].task_done()
|
||||
#if nrt is not None:
|
||||
#ort = self.rastertile
|
||||
##nrt = self.comm[1].get()
|
||||
#lonlat = ort.screen2lonlat(ort.w/2, ort.h/2)
|
||||
#debug(lonlat)
|
||||
#debug(self.center_coord)
|
||||
#ox, oy = nrt.lonlat2screen(lonlat, epsg4326=True)
|
||||
#ox, oy = int(ox),int(oy)
|
||||
#ox -= nrt.w/2
|
||||
#oy -= nrt.h/2
|
||||
#debug(ox)
|
||||
#debug(oy)
|
||||
|
||||
#self.drag_x += ox
|
||||
#self.drag_y += oy
|
||||
#self.dx -= ox
|
||||
#self.dy -= oy
|
||||
##debug( (lat, lon, ox, oy) )
|
||||
#self.rastertile.offset_x = -ox
|
||||
#self.rastertile.offset_y = -oy
|
||||
#self.f = True
|
||||
#self.rastertile = nrt
|
||||
|
||||
cr = widget.window.cairo_create()
|
||||
cr.set_source_surface(self.rastertile.surface, self.dx-self.width + self.rastertile.offset_x, self.dy - self.height + self.rastertile.offset_y)
|
||||
cr.paint()
|
||||
if self.old_center_coord != self.center_coord or self.old_zoom != self.zoom:
|
||||
#print "Recentered!"
|
||||
xy = projections.from4326(self.center_coord,"EPSG:3857")
|
||||
xy1 = projections.to4326((xy[0]-40075016.*(0.5**(self.zoom))/256*self.width, xy[1]-40075016.*(0.5**(self.zoom))/256*self.height), "EPSG:3857")
|
||||
xy2 = projections.to4326((xy[0]+40075016.*(0.5**(self.zoom))/256*self.width, xy[1]+40075016.*(0.5**(self.zoom))/256*self.height), "EPSG:3857")
|
||||
self.bbox = (xy1[0],xy1[1],xy2[0],xy2[1])
|
||||
self.tilebox = projections.tile_by_bbox(self.bbox, self.zoom, "EPSG:3857")
|
||||
self.old_center_coord = self.center_coord
|
||||
self.old_zoom = self.zoom
|
||||
from_tile_x, from_tile_y, to_tile_x, to_tile_y = self.tilebox
|
||||
dx = (from_tile_x - int(from_tile_x))*self.tiles.tilewidth
|
||||
dy = (from_tile_y - int(from_tile_y))*self.tiles.tileheight
|
||||
print dx,dy
|
||||
print self.dx, self.dy
|
||||
|
||||
for x in range (int(from_tile_x), int(to_tile_x)+1):
|
||||
for y in range (int(to_tile_y), int(from_tile_y)+1):
|
||||
tile = self.tiles[(self.zoom,x,y)]
|
||||
#print dx+(x-from_tile_x)*self.tiles.tilewidth-self.width
|
||||
#print dy+(y-from_tile_y)*self.tiles.tileheight-self.height
|
||||
cr.set_source_surface(tile, int(self.dx-dx+(x-int(from_tile_x))*self.tiles.tilewidth-self.width), int(self.dy-dy-(int(from_tile_y)-y)*self.tiles.tileheight+self.height))
|
||||
cr.paint()
|
||||
#cr.set_source_surface(self.rastertile.surface, self.dx-self.width + self.rastertile.offset_x, self.dy - self.height + self.rastertile.offset_y)
|
||||
|
||||
#self.comm[3].release()
|
||||
|
||||
|
||||
class TileSource:
|
||||
def __init__(self,data,style, callback = lambda: None):
|
||||
self.tiles = {}
|
||||
self.tilewidth = 512
|
||||
self.tileheight = 512
|
||||
self.data_backend = data
|
||||
self.style_backend = style
|
||||
self.callback = callback
|
||||
def __getitem__(self,(z,x,y)):
|
||||
try:
|
||||
return self.tiles[(z,x,y)]["surface"]
|
||||
except:
|
||||
self.tiles[(z,x,y)] = {"tile": RasterTile(self.tilewidth, self.tileheight, z, self.data_backend)}
|
||||
self.tiles[(z,x,y)]["surface"] = self.tiles[(z,x,y)]["tile"].surface.create_similar(cairo.CONTENT_COLOR_ALPHA, self.tilewidth, self.tileheight)
|
||||
self.tiles[(z,x,y)]["thread"] = threading.Thread(None, self.tiles[(z,x,y)]["tile"].update_surface,None, (projections.bbox_by_tile(z,x,y,"EPSG:3857"), z, self.style_backend, lambda: self._callback((z,x,y))))
|
||||
self.tiles[(z,x,y)]["thread"].start()
|
||||
return self.tiles[(z,x,y)]["surface"]
|
||||
def _callback (self, (z,x,y)):
|
||||
cr = cairo.Context(self.tiles[(z,x,y)]["surface"])
|
||||
cr.set_source_surface(self.tiles[(z,x,y)]["tile"].surface,0,0)
|
||||
cr.paint()
|
||||
gobject.idle_add(self.callback)
|
||||
#def screen2lonlat(self, x, y):
|
||||
#lo1, la1, lo2, la2 = self.bbox_p
|
||||
|
||||
#debug ("%s %s - %s %s"%(x,y,self.w, self.h))
|
||||
#debug(self.bbox_p)
|
||||
|
||||
#return projections.to4326( (1.*x/self.w*(lo2-lo1)+lo1, la2+(1.*y/(self.h)*(la1-la2))),self.proj)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue