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

* src/plugins/TimeLine.py: Remove old Date.UNDEF usage.

Browse Source 
svn: r3660
This commit is contained in:
Alex Roitman 2004-10-22 15:35:47 +00:00
parent ce0ffc7035
commit 4df725c5c2
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2004-10-22 Alex Roitman <shura@alex.neuro.umn.edu>
* src/plugins/TimeLine.py: Remove old Date.UNDEF usage.
2004-10-19 Don Allingham <dallingham@users.sourceforge.net> 2004-10-19 Don Allingham <dallingham@users.sourceforge.net>
* src/GrampsCfg.py: eliminate unused options * src/GrampsCfg.py: eliminate unused options
* src/gramps.glade: eliminate unused options * src/gramps.glade: eliminate unused options

22
src/plugins/TimeLine.py
View File

@ -188,13 +188,13 @@ class TimeLine:
if b_id: if b_id:
b = self.db.get_event_from_handle(b_id).get_date_object().get_year() b = self.db.get_event_from_handle(b_id).get_date_object().get_year()
else: else:
b = Date.UNDEF b = None
d_id = p.get_death_handle() d_id = p.get_death_handle()
if d_id: if d_id:
d = self.db.get_event_from_handle(d_id).get_date_object().get_year() d = self.db.get_event_from_handle(d_id).get_date_object().get_year()
else: else:
d = Date.UNDEF d = None
n = p.get_primary_name().get_name() n = p.get_primary_name().get_name()
self.d.draw_text('TLG-text',n,incr+pad,self.header + (incr+pad)*index) self.d.draw_text('TLG-text',n,incr+pad,self.header + (incr+pad)*index)
@ -204,19 +204,19 @@ class TimeLine:
y3 = (y1+y2)/2.0 y3 = (y1+y2)/2.0
w = 0.05 w = 0.05
if b != Date.UNDEF: if b:
start_offset = ((float(b-low)/float(high-low)) * (size)) start_offset = ((float(b-low)/float(high-low)) * (size))
x1 = start+start_offset x1 = start+start_offset
path = [(x1,y1),(x1+w,y3),(x1,y2),(x1-w,y3)] path = [(x1,y1),(x1+w,y3),(x1,y2),(x1-w,y3)]
self.d.draw_path('TLG-line',path) self.d.draw_path('TLG-line',path)
if d != Date.UNDEF: if d:
start_offset = ((float(d-low)/float(high-low)) * (size)) start_offset = ((float(d-low)/float(high-low)) * (size))
x1 = start+start_offset x1 = start+start_offset
path = [(x1,y1),(x1+w,y3),(x1,y2),(x1-w,y3)] path = [(x1,y1),(x1+w,y3),(x1,y2),(x1-w,y3)]
self.d.draw_path('TLG-solid',path) self.d.draw_path('TLG-solid',path)
if b != Date.UNDEF and d != Date.UNDEF: if b and d:
start_offset = ((float(b-low)/float(high-low)) * size) + w start_offset = ((float(b-low)/float(high-low)) * size) + w
stop_offset = ((float(d-low)/float(high-low)) * size) - w stop_offset = ((float(d-low)/float(high-low)) * size) - w
@ -286,28 +286,28 @@ class TimeLine:
if b_id: if b_id:
b = self.db.get_event_from_handle(b_id).get_date_object().get_year() b = self.db.get_event_from_handle(b_id).get_date_object().get_year()
else: else:
b = Date.UNDEF b = None
d_id = p.get_death_handle() d_id = p.get_death_handle()
if d_id: if d_id:
d = self.db.get_event_from_handle(d_id).get_date_object().get_year() d = self.db.get_event_from_handle(d_id).get_date_object().get_year()
else: else:
d = Date.UNDEF d = None
if b != Date.UNDEF: if b:
low = min(low,b) low = min(low,b)
high = max(high,b) high = max(high,b)
if d != Date.UNDEF: if d:
low = min(low,d) low = min(low,d)
high = max(high,d) high = max(high,d)
low = (low/10)*10 low = (low/10)*10
high = ((high+9)/10)*10 high = ((high+9)/10)*10
if low == Date.UNDEF: if low == None:
low = high low = high
if high == Date.UNDEF: if high == None:
high = low high = low
return (low,high) return (low,high)