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

Fix two bugs in fanchart: crash on empty famtree, empty events show year 0

Browse Source 
svn: r20354
This commit is contained in:
Benny Malengier 2012-09-08 22:22:43 +00:00
parent 1ce04c4874
commit 320044c377
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gen/utils/db.py
View File

@ -117,10 +117,12 @@ def get_age(db, person, fallback=True, calendar="gregorian"):
age = None age = None
if birth is not None: if birth is not None:
birth_date = birth.get_date_object().to_calendar("gregorian") birth_date = birth.get_date_object().to_calendar("gregorian")
if (birth_date and birth_date.get_valid()): if (birth_date and birth_date.get_valid()
and not birth_date.is_empty()):
if death is not None: if death is not None:
death_date = death.get_date_object().to_calendar("gregorian") death_date = death.get_date_object().to_calendar("gregorian")
if (death_date and death_date.get_valid()): if (death_date and death_date.get_valid()
and not death_date.is_empty()):
age = death_date - birth_date age = death_date - birth_date
if not age.is_valid(): if not age.is_valid():
age = None age = None
@ -141,13 +143,15 @@ def get_timeperiod(db, person):
birth = get_birth_or_fallback(db, person) birth = get_birth_or_fallback(db, person)
if birth is not None: if birth is not None:
birth_date = birth.get_date_object().to_calendar("gregorian") birth_date = birth.get_date_object().to_calendar("gregorian")
if (birth_date and birth_date.get_valid()): if (birth_date and birth_date.get_valid()
and not birth_date.is_empty()):
return birth_date.get_year() return birth_date.get_year()
death = get_death_or_fallback(db, person) death = get_death_or_fallback(db, person)
# no birth, period is death - 20 # no birth, period is death - 20
if death is not None: if death is not None:
death_date = death.get_date_object().to_calendar("gregorian") death_date = death.get_date_object().to_calendar("gregorian")
if (death_date and death_date.get_valid()): if (death_date and death_date.get_valid()
and not death_date.is_empty()):
return death_date.get_year() - 20 return death_date.get_year() - 20
# no birth and death, look for another event date we can use # no birth and death, look for another event date we can use
for event_ref in person.get_primary_event_ref_list(): for event_ref in person.get_primary_event_ref_list():
@ -155,7 +159,8 @@ def get_timeperiod(db, person):
event = db.get_event_from_handle(event_ref.ref) event = db.get_event_from_handle(event_ref.ref)
if event: if event:
event_date = event.get_date_object().to_calendar("gregorian") event_date = event.get_date_object().to_calendar("gregorian")
if (event_date and event_date.get_valid()): if (event_date and event_date.get_valid()
and not event_date.is_empty()):
return event_date.get_year() return event_date.get_year()
return None return None

5
src/gui/widgets/fanchart.py
View File

@ -602,7 +602,10 @@ class FanChartWidget(Gtk.DrawingArea):
cr.stroke() cr.stroke()
#now again to fill #now again to fill
person = self.dbstate.db.get_person_from_handle(child_handle) person = self.dbstate.db.get_person_from_handle(child_handle)
r, g, b, a = self.background_box(person, person.gender, -1, userdata) if person:
r, g, b, a = self.background_box(person, person.gender, -1, userdata)
else:
r=255; g=255; b=255; a=1
cr.move_to(rmin*math.cos(thetamin), rmin*math.sin(thetamin)) cr.move_to(rmin*math.cos(thetamin), rmin*math.sin(thetamin))
cr.arc(0, 0, rmin, thetamin, thetamax) cr.arc(0, 0, rmin, thetamin, thetamax)
cr.line_to(rmax*math.cos(thetamax), rmax*math.sin(thetamax)) cr.line_to(rmax*math.cos(thetamax), rmax*math.sin(thetamax))