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

GeoView : issue 3472

Browse Source 
svn: r13909
This commit is contained in:
Serge Noiraud 2009-12-24 17:21:55 +00:00
parent cd7f3b8a29
commit 9aabed5c4f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/view/geoview.py
View File

@ -88,6 +88,7 @@ _ICONS = {
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import re import re
ZOOMANDPOS = re.compile('zoom=([0-9]*) coord=([0-9\.\-\+]*), ([0-9\.\-\+]*):::') ZOOMANDPOS = re.compile('zoom=([0-9]*) coord=([0-9\.\-\+]*), ([0-9\.\-\+]*):::')
cal = config.get('preferences.calendar-format-report')
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -1599,7 +1600,7 @@ class GeoView(HtmlView):
event_ref = person.get_birth_ref() event_ref = person.get_birth_ref()
if event_ref: if event_ref:
event = dbstate.db.get_event_from_handle(event_ref.ref) event = dbstate.db.get_event_from_handle(event_ref.ref)
eventyear = event.get_date_object().get_year() eventyear = event.get_date_object().to_calendar(cal).get_year()
place_handle = event.get_place_handle() place_handle = event.get_place_handle()
if place_handle: if place_handle:
place = dbstate.db.get_place_from_handle(place_handle) place = dbstate.db.get_place_from_handle(place_handle)
@ -1636,7 +1637,7 @@ class GeoView(HtmlView):
event_ref = person.get_death_ref() event_ref = person.get_death_ref()
if event_ref: if event_ref:
event = dbstate.db.get_event_from_handle(event_ref.ref) event = dbstate.db.get_event_from_handle(event_ref.ref)
eventyear = event.get_date_object().get_year() eventyear = event.get_date_object().to_calendar(cal).get_year()
place_handle = event.get_place_handle() place_handle = event.get_place_handle()
if place_handle: if place_handle:
place = dbstate.db.get_place_from_handle(place_handle) place = dbstate.db.get_place_from_handle(place_handle)
@ -1724,7 +1725,7 @@ class GeoView(HtmlView):
for event in dbstate.db.iter_events(): for event in dbstate.db.iter_events():
place_handle = event.get_place_handle() place_handle = event.get_place_handle()
eventyear = event.get_date_object().get_year() eventyear = event.get_date_object().to_calendar(cal).get_year()
if place_handle: if place_handle:
place = dbstate.db.get_place_from_handle(place_handle) place = dbstate.db.get_place_from_handle(place_handle)
if place: if place:
@ -1863,7 +1864,7 @@ class GeoView(HtmlView):
# Only match primaries, no witnesses # Only match primaries, no witnesses
continue continue
event = dbstate.db.get_event_from_handle(event_ref.ref) event = dbstate.db.get_event_from_handle(event_ref.ref)
eventyear = event.get_date_object().get_year() eventyear = event.get_date_object().to_calendar(cal).get_year()
place_handle = event.get_place_handle() place_handle = event.get_place_handle()
if place_handle: if place_handle:
place = dbstate.db.get_place_from_handle(place_handle) place = dbstate.db.get_place_from_handle(place_handle)