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

Geography : bug 4873 + marker selection changes.

Browse Source 
svn: r17372
This commit is contained in:
Serge Noiraud 2011-05-02 07:00:17 +00:00
parent f934513a9e
commit a9ec8901ba
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/lib/maps/geography.py
View File

@ -322,25 +322,38 @@ class GeoGraphyView(osmGpsMap, NavigationView):
# as we are not precise with our hand, reduce the precision # as we are not precise with our hand, reduce the precision
# depending on the zoom. # depending on the zoom.
precision = { precision = {
1 : '%3.0f', 2 : '%3.0f', 3 : '%3.0f', 4 : '%3.0f', 1 : '%3.0f', 2 : '%3.1f', 3 : '%3.1f', 4 : '%3.1f',
5 : '%3.0f', 6 : '%3.1f', 7 : '%3.1f', 8 : '%3.1f', 5 : '%3.2f', 6 : '%3.2f', 7 : '%3.2f', 8 : '%3.3f',
9 : '%3.1f', 10 : '%3.1f', 11 : '%3.2f', 12 : '%3.2f', 9 : '%3.3f', 10 : '%3.3f', 11 : '%3.3f', 12 : '%3.3f',
13 : '%3.2f', 14 : '%3.3f', 15 : '%3.3f', 16 : '%3.4f', 13 : '%3.3f', 14 : '%3.4f', 15 : '%3.4f', 16 : '%3.4f',
17 : '%3.4f', 18 : '%3.5f' 17 : '%3.4f', 18 : '%3.4f'
}.get(config.get("geography.zoom"), '%3.1f') }.get(config.get("geography.zoom"), '%3.1f')
shift = {
1 : 5.0, 2 : 5.0, 3 : 3.0,
4 : 1.0, 5 : 0.5, 6 : 0.3, 7 : 0.15,
8 : 0.06, 9 : 0.03, 10 : 0.015,
11 : 0.005, 12 : 0.003, 13 : 0.001,
14 : 0.0005, 15 : 0.0003, 16 : 0.0001,
17 : 0.0001, 18 : 0.0001
}.get(config.get("geography.zoom"), 5.0)
latp = precision % lat latp = precision % lat
lonp = precision % lon lonp = precision % lon
mlatp = precision % float(mark[3]) mlatp = precision % float(mark[3])
mlonp = precision % float(mark[4]) mlonp = precision % float(mark[4])
latok = lonok = False
_LOG.debug(" compare latitude : %s with %s (precision = %s)" _LOG.debug(" compare latitude : %s with %s (precision = %s)"
" place='%s'" % (float(mark[3]), lat, precision, " place='%s'" % (float(mark[3]), lat, precision,
mark[0])) mark[0]))
_LOG.debug("compare longitude : %s with %s (precision = %s)" _LOG.debug("compare longitude : %s with %s (precision = %s)"
" zoom=%d" % (float(mark[4]), lon, precision, " zoom=%d" % (float(mark[4]), lon, precision,
config.get("geography.zoom"))) config.get("geography.zoom")))
if mlatp == latp and mlonp == lonp: if (float(mlatp) >= (float(latp) - shift) ) and
_LOG.debug(" compare latitude : %s with %s OK" % (mlatp, latp)) (float(mlatp) <= (float(latp) + shift) ):
_LOG.debug("compare longitude : %s with %s OK" % (mlonp, lonp)) latok = True
if (float(mlonp) >= (float(lonp) - shift) ) and
(float(mlonp) <= (float(lonp) + shift) ):
lonok = True
if latok and lonok:
mark_selected.append(mark) mark_selected.append(mark)
found = True found = True
if found: if found:

4
src/plugins/view/geoperson.py
View File

@ -356,6 +356,7 @@ class GeoPerson(GeoGraphyView):
itemoption = gtk.Menu() itemoption = gtk.Menu()
itemoption.set_title(message) itemoption.set_title(message)
itemoption.show() itemoption.show()
message = ""
add_item.set_submenu(itemoption) add_item.set_submenu(itemoption)
modify = gtk.MenuItem(_("Edit Event")) modify = gtk.MenuItem(_("Edit Event"))
modify.show() modify.show()
@ -375,6 +376,7 @@ class GeoPerson(GeoGraphyView):
itemoption = gtk.Menu() itemoption = gtk.Menu()
itemoption.set_title(message) itemoption.set_title(message)
itemoption.show() itemoption.show()
message = ""
add_item.set_submenu(itemoption) add_item.set_submenu(itemoption)
modify = gtk.MenuItem(_("Edit Event")) modify = gtk.MenuItem(_("Edit Event"))
modify.show() modify.show()
@ -390,6 +392,7 @@ class GeoPerson(GeoGraphyView):
self.add_place_bubble_message(event, lat, lon, self.add_place_bubble_message(event, lat, lon,
marks, menu, message, mark) marks, menu, message, mark)
oldplace = mark[0] oldplace = mark[0]
message = ""
message = "%s : %s" % ( mark[2], mark[1] ) message = "%s : %s" % ( mark[2], mark[1] )
prevmark = mark prevmark = mark
add_item = gtk.MenuItem(message) add_item = gtk.MenuItem(message)
@ -407,6 +410,7 @@ class GeoPerson(GeoGraphyView):
center.show() center.show()
center.connect("activate", self.center_here, event, lat, lon, prevmark) center.connect("activate", self.center_here, event, lat, lon, prevmark)
itemoption.append(center) itemoption.append(center)
menu.show()
menu.popup(None, None, None, 0, event.time) menu.popup(None, None, None, 0, event.time)
return 1 return 1