Fixed jumpy map. Some locking to fake priority.
--HG-- branch : semi-stable
This commit is contained in:
Dmitry Platonov
parent
425a2a7471
commit
f797689cd8
1 changed files with 61 additions and 31 deletions
|
|
@ -45,12 +45,12 @@ class Renderer(threading.Thread):
|
|||
request = self.comm[0].get()
|
||||
if(self.comm[0].empty):
|
||||
break
|
||||
print (" got request:", request)
|
||||
print (" got request:", request[:-1])
|
||||
res = RasterTile(request[2][0], request[2][1])
|
||||
res.update_surface(request[0][0], request[0][1], request[1], self.tc, request[3])
|
||||
res.update_surface(request[0][0], request[0][1], request[1], self.tc, request[3], self.comm[3])
|
||||
print (" render complete")
|
||||
comm[1].put(res)
|
||||
# comm[2].get_window().invalidate_rect(None, True)
|
||||
comm[0].task_done()
|
||||
comm[2].queue_draw()
|
||||
|
||||
class Navigator:
|
||||
|
|
@ -87,6 +87,8 @@ class Navigator:
|
|||
[[0, [0.72, 0.51, 0.32]], undef, undef, 14],
|
||||
[[0, [1, 0.0, 0.0]], undef, undef, 0] #unknown landuse
|
||||
]
|
||||
self.style_light = list(self.style)
|
||||
self.style_light[6] = [None, None, None, 0]
|
||||
da = gtk.DrawingArea()
|
||||
da.add_events(gtk.gdk.BUTTON1_MOTION_MASK)
|
||||
da.add_events(gtk.gdk.POINTER_MOTION_MASK)
|
||||
|
|
@ -103,14 +105,15 @@ class Navigator:
|
|||
self.window.add(da)
|
||||
self.window.connect("delete_event", self.delete_ev)
|
||||
self.comm.append(da)
|
||||
self.comm.append(threading.Lock())
|
||||
def motion_ev(self, widget, event):
|
||||
# print("Motion")
|
||||
if self.drag:
|
||||
self.dx = event.x - self.drag_x
|
||||
self.dy = event.y - self.drag_y
|
||||
if((abs(self.dx) > 100 or abs(self.dy) > 100) and self.f):
|
||||
self.comm[0].put((self.rastertile.screen2latlon(self.rastertile.w/2 - self.dx, self.rastertile.h/2 - self.dy), self.zoom, (self.width + self.border*2, self.height + self.border*2), self.style))
|
||||
self.request_d = (self.dx, self.dy)
|
||||
if((abs(self.dx) > 150 or abs(self.dy) > 150) and self.f):
|
||||
self.comm[0].put((self.rastertile.screen2latlon(self.rastertile.w/2 - self.dx, self.rastertile.h/2 - self.dy), self.zoom, (self.width + self.border*2, self.height + self.border*2), self.style_light))
|
||||
# self.request_d = (self.dx, self.dy)
|
||||
self.f = False
|
||||
widget.queue_draw()
|
||||
def delete_ev(self, widget, event):
|
||||
|
|
@ -130,35 +133,48 @@ class Navigator:
|
|||
# self.dx = self.dy = 0
|
||||
self.f = True
|
||||
print("LL after: ",self.lat_c, self.lon_c)
|
||||
# self.rastertile.update_surface( self.lat_c, self.lon_c, self.zoom, self.tilecache, self.style)
|
||||
self.comm[0].put(((self.lat_c, self.lon_c), self.zoom, (self.width + self.border*2, self.height + self.border*2), self.style))
|
||||
widget.queue_draw()
|
||||
# widget.queue_draw()
|
||||
def expose_ev(self, widget, event):
|
||||
# print("Expose")
|
||||
if(widget.allocation.width != self.width):
|
||||
time_start = time.time()
|
||||
self.comm[3].acquire()
|
||||
if(widget.allocation.width != self.width or widget.allocation.height != self.height ):
|
||||
print("Rrresize!")
|
||||
self.width = widget.allocation.width
|
||||
self.height = widget.allocation.height
|
||||
self.rastertile = None
|
||||
if self.rastertile is None:
|
||||
self.rastertile = RasterTile(self.width + self.border*2, self.height + self.border*2)
|
||||
self.rastertile.update_surface(self.lat_c, self.lon_c, self.zoom, self.tilecache, self.style)
|
||||
if not self.comm[1].empty():
|
||||
ort = self.rastertile
|
||||
self.rastertile.update_surface(self.lat_c, self.lon_c, self.zoom, self.tilecache, self.style, None)
|
||||
nrt = None
|
||||
while(not self.comm[1].empty()):
|
||||
nrt = self.comm[1].get()
|
||||
lat, lon = ort.screen2latlon(ort.w/2 - self.dx, ort.h/2 - self.dy)
|
||||
ox, oy = nrt.latlon2screen(lat, lon, nrt.zoom)
|
||||
self.comm[1].task_done()
|
||||
if nrt is not None:
|
||||
ort = self.rastertile
|
||||
# nrt = self.comm[1].get()
|
||||
lat, lon = ort.screen2latlon(ort.w/2, ort.h/2)
|
||||
ox, oy = nrt.latlon2screen(lat, lon)
|
||||
ox -= nrt.w/2
|
||||
oy -= nrt.h/2
|
||||
print (ox, oy)
|
||||
self.rastertile.offset_x = ox
|
||||
self.rastertile.offset_y = oy
|
||||
self.drag_x += ox
|
||||
self.drag_y += oy
|
||||
self.dx -= ox
|
||||
self.dy -= oy
|
||||
print (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.border + self.rastertile.offset_x, self.dy - self.border + self.rastertile.offset_y)
|
||||
time_before_paint = time.time()
|
||||
cr.paint()
|
||||
time_end = time.time()
|
||||
print ("EXPOSE REDRAW: ", -time_start + time_end, "(paint: ", time_end - time_before_paint, ")" )
|
||||
self.comm[3].release()
|
||||
|
||||
def main(self):
|
||||
self.window.show_all()
|
||||
|
|
@ -183,11 +199,14 @@ def ways(t):
|
|||
r.update(i)
|
||||
return r.values()
|
||||
|
||||
def load_tile(k):
|
||||
print("loading tile: ", k)
|
||||
def load_tile(k, lock):
|
||||
# print("loading tile: ", k)
|
||||
f = open(key_to_filename(k))
|
||||
t = {}
|
||||
while True:
|
||||
if lock is not None:
|
||||
lock.acquire()
|
||||
lock.release()
|
||||
str = f.readline()
|
||||
if str is None or str == "":
|
||||
break
|
||||
|
|
@ -210,51 +229,62 @@ class RasterTile:
|
|||
self.zoom = None
|
||||
def screen2latlon(self, x, y):
|
||||
return -(y - self.h/2)/self.zoom + self.lat_c, (x - self.w/2)/(math.cos(self.lat_c*math.pi/180)*self.zoom) + self.lon_c
|
||||
def latlon2screen(self, lat, lon, lcc):
|
||||
return (lon - self.lon_c)*lcc*self.zoom + self.w/2, -(lat - self.lat_c)*self.zoom + self.h/2
|
||||
def update_surface(self, lat, lon, zoom, tilecache, style):
|
||||
def latlon2screen(self, lat, lon):
|
||||
return (lon - self.lon_c)*self.lcc*self.zoom + self.w/2, -(lat - self.lat_c)*self.zoom + self.h/2
|
||||
def update_surface(self, lat, lon, zoom, tilecache, style, lock):
|
||||
self.zoom = zoom
|
||||
self.lat_c = lat
|
||||
self.lon_c = lon
|
||||
cr = cairo.Context(self.surface)
|
||||
cr.rectangle(0, 0, self.w, self.h)
|
||||
cr.set_source_rgb(0.7, 0.7, 0.7)
|
||||
tt = time.time()
|
||||
cr.fill()
|
||||
print (" fill: ", time.time() - tt)
|
||||
latmin, lonmin = self.screen2latlon(0, self.h)
|
||||
latmax, lonmax = self.screen2latlon(self.w, 0)
|
||||
latkey_min = int(latmin*100)
|
||||
latkey_max = int(latmax*100)
|
||||
lonkey_min = int(lonmin*100)
|
||||
lonkey_max = int(lonmax*100)
|
||||
print(latmin, lonmin, latmax, lonmax)
|
||||
print( latkey_min, latkey_max, lonkey_min, lonkey_max)
|
||||
# print(latmin, lonmin, latmax, lonmax)
|
||||
# print( latkey_min, latkey_max, lonkey_min, lonkey_max)
|
||||
#FIXME: add time
|
||||
active_tile = set([(i,j) for i in range(latkey_min, latkey_max+1) for j in range(lonkey_min, lonkey_max+1)])
|
||||
print(active_tile)
|
||||
# print(active_tile)
|
||||
for k in tilecache.keys():
|
||||
if k not in active_tile:
|
||||
del tilecache[k]
|
||||
print("del tile:", k)
|
||||
# print("del tile:", k)
|
||||
for k in active_tile:
|
||||
if k not in tilecache:
|
||||
tilecache[k] = load_tile(k)
|
||||
tilecache[k] = load_tile(k, lock)
|
||||
#FIXME add time2
|
||||
ww = ways(tilecache)
|
||||
print("ways: ", len(ww))
|
||||
# print("ways: ", len(ww))
|
||||
|
||||
if lock is not None:
|
||||
lock.acquire()
|
||||
lock.release()
|
||||
ww.sort(key=lambda x: style[x.style][3])
|
||||
lcc = math.cos(self.lat_c*math.pi/180)
|
||||
self.lcc = math.cos(self.lat_c*math.pi/180)
|
||||
for w in ww:
|
||||
cs = []
|
||||
if lock is not None:
|
||||
lock.acquire()
|
||||
lock.release()
|
||||
for k in range(0, len(w.coords), 2):
|
||||
x, y = self.latlon2screen(w.coords[k], w.coords[k+1], lcc);
|
||||
x, y = self.latlon2screen(w.coords[k], w.coords[k+1]);
|
||||
cs.append(x)
|
||||
cs.append(y)
|
||||
w.cs = cs
|
||||
for passn in range(1, 4):
|
||||
print("pass ",passn)
|
||||
# print("pass ",passn)
|
||||
for w in ww:
|
||||
stn = w.style
|
||||
if lock is not None:
|
||||
lock.acquire()
|
||||
lock.release()
|
||||
if stn < len(style) and style[stn] is not None and style[stn][passn-1] is not None:
|
||||
st = style[w.style][passn-1]
|
||||
cr.set_line_width(st[0])
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue