Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Geography: convert to gtk3 and some cleaning. not finished, but it works.

Browse Source 
svn: r20358
This commit is contained in:
Serge Noiraud
2012-09-10 18:55:23 +00:00
parent 136438c5c5
commit 1fe42b7f49
8 changed files with 86 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/lib/maps/markerlayer.py
View File

@ -115,13 +115,12 @@ class MarkerLayer(GObject.GObject, osmgpsmap.MapLayer):
self.min_value = count
self.nb_ref_by_places = self.max_references / self.max_places
def do_draw(self, gpsmap, drawable):
def do_draw(self, gpsmap, ctx):
"""
Draw all markers here. Calculate where to draw the marker.
Depending of the average, minimum and maximum value, resize the marker.
We use cairo to resize the marker.
"""
ctx = drawable.cairo_create()
max_interval = self.max_value - self.nb_ref_by_places
min_interval = self.nb_ref_by_places - self.min_value
if max_interval == 0: # This to avoid divide by zero
@ -144,7 +143,7 @@ class MarkerLayer(GObject.GObject, osmgpsmap.MapLayer):
size -= (0.3 * ((self.nb_ref_by_places - mark)
/ min_interval) )
conv_pt = osmgpsmap.point_new_degrees(float(marker[0][0]),
conv_pt = osmgpsmap.MapPoint.new_degrees(float(marker[0][0]),
float(marker[0][1]))
coord_x, coord_y = gpsmap.convert_geographic_to_screen(conv_pt)
ctx.translate(coord_x, coord_y)
@ -156,7 +155,7 @@ class MarkerLayer(GObject.GObject, osmgpsmap.MapLayer):
# So we shift the image position.
posY = - int( 48 * size + 0.5 ) - 10
posX = - int(( 48 * size ) / 6 + 0.5 ) - 10
ctx.set_source_pixbuf(marker[1], posX, posY)
ctx.set_source_surface(marker[1], posX, posY)
ctx.paint()
ctx.restore()
_LOG.debug("%s" % time.strftime("end drawing : "