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

9082: Show more place types in family lines graph

Browse Source
This commit is contained in:
MJBMZ 2016-10-27 17:36:09 +01:00 committed by Nick Hall
parent aab0984dfb
commit d333f2eee7
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gramps/plugins/graph/gvfamilylines.py
View File

@ -791,7 +791,8 @@ class FamilyLinesReport(Report):
else: else:
birth_str = self._get_date(date) birth_str = self._get_date(date)
# get birth place (one of: city, state, or country) we can use # get birth place (one of: hamlet, village, town, city, parish,
# county, province, region, state or country)
birthplace = None birthplace = None
if bth_event and self._incplaces: if bth_event and self._incplaces:
birthplace = self.get_event_place(bth_event) birthplace = self.get_event_place(bth_event)
@ -805,7 +806,8 @@ class FamilyLinesReport(Report):
else: else:
death_str = self._get_date(date) death_str = self._get_date(date)
# get death place (one of: city, state, or country) we can use # get death place (one of: hamlet, village, town, city, parish,
# county, province, region, state or country)
deathplace = None deathplace = None
if dth_event and self._incplaces: if dth_event and self._incplaces:
deathplace = self.get_event_place(dth_event) deathplace = self.get_event_place(dth_event)
@ -1045,8 +1047,22 @@ class FamilyLinesReport(Report):
place = self._db.get_place_from_handle(place_handle) place = self._db.get_place_from_handle(place_handle)
if place: if place:
location = get_main_location(self._db, place) location = get_main_location(self._db, place)
if location.get(PlaceType.CITY): if location.get(PlaceType.HAMLET):
place_text = location.get(PlaceType.HAMLET)
elif location.get(PlaceType.VILLAGE):
place_text = location.get(PlaceType.VILLAGE)
elif location.get(PlaceType.TOWN):
place_text = location.get(PlaceType.TOWN)
elif location.get(PlaceType.CITY):
place_text = location.get(PlaceType.CITY) place_text = location.get(PlaceType.CITY)
elif location.get(PlaceType.PARISH):
place_text = location.get(PlaceType.PARISH)
elif location.get(PlaceType.COUNTY):
place_text = location.get(PlaceType.COUNTY)
elif location.get(PlaceType.PROVINCE):
place_text = location.get(PlaceType.PROVINCE)
elif location.get(PlaceType.REGION):
place_text = location.get(PlaceType.REGION)
elif location.get(PlaceType.STATE): elif location.get(PlaceType.STATE):
place_text = location.get(PlaceType.STATE) place_text = location.get(PlaceType.STATE)
elif location.get(PlaceType.COUNTRY): elif location.get(PlaceType.COUNTRY):