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

* src/Report.py: Catch thrown Database error

Browse Source 
* src/GraphLayout.py: catch database loops
* src/po/check_po: utility to look for problems in .po files


svn: r5160
This commit is contained in:
Don Allingham 2005-09-01 02:39:55 +00:00
parent cbf80d0547
commit 0ff17e104b
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gramps2/ChangeLog
View File

@ -1,6 +1,9 @@
2005-08-31 Don Allingham <don@gramps-project.org> 2005-08-31 Don Allingham <don@gramps-project.org>
* src/Report.py: Catch thrown Database error
* src/GraphLayout.py: catch database loops
* src/po/de.po: fix %()s mismatches * src/po/de.po: fix %()s mismatches
* src/po/ru.po: fix %()s mismatches * src/po/ru.po: fix %()s mismatches
* src/po/check_po: utility to look for problems in .po files
2005-08-31 Eero Tamminen <eerot@sf> 2005-08-31 Eero Tamminen <eerot@sf>
* src/po/fi.po: Translation update for 2.0.7. * src/po/fi.po: Translation update for 2.0.7.

21
gramps2/src/GraphLayout.py
View File

@ -20,6 +20,11 @@
# $Id$ # $Id$
import sets
import Errors
import NameDisplay
class GraphLayout: class GraphLayout:
def __init__(self,database,plist,person_handle): def __init__(self,database,plist,person_handle):
@ -44,7 +49,18 @@ class DescendLine(GraphLayout):
self.space_for(self.person_handle) self.space_for(self.person_handle)
return (self.v,self.e[1:]) return (self.v,self.e[1:])
def space_for(self,person_handle,level=1.0,pos=1.0): def space_for(self,person_handle,level=1.0,pos=1.0, current=None):
if current == None:
current = sets.Set()
person = self.database.get_person_from_handle(person_handle)
if person_handle not in current:
current.add(person_handle)
else:
raise Errors.DatabaseError(_("Database error: %s is defined as his or her own ancestor") %
NameDisplay.displayer.display(person))
last = self.elist[-1] last = self.elist[-1]
self.elist.append((level,pos)) self.elist.append((level,pos))
self.e.append((last[0],last[1],level,pos)) self.e.append((last[0],last[1],level,pos))
@ -54,11 +70,10 @@ class DescendLine(GraphLayout):
if pos > self.maxy: if pos > self.maxy:
self.maxy = pos self.maxy = pos
person = self.database.get_person_from_handle(person_handle)
for family_handle in person.get_family_handle_list(): for family_handle in person.get_family_handle_list():
family = self.database.get_family_from_handle(family_handle) family = self.database.get_family_from_handle(family_handle)
for child_handle in family.get_child_handle_list(): for child_handle in family.get_child_handle_list():
self.space_for(child_handle,level+1.0,pos) self.space_for(child_handle,level+1.0,pos,current)
pos = pos + max(self.depth(child_handle),1) pos = pos + max(self.depth(child_handle),1)
if pos > self.maxy: if pos > self.maxy:
self.maxy = pos self.maxy = pos

2
gramps2/src/Report.py
View File

@ -1804,6 +1804,8 @@ def report(database,person,report_class,options_class,translated_name,name,categ
except Errors.ReportError, msg: except Errors.ReportError, msg:
(m1,m2) = msg.messages() (m1,m2) = msg.messages()
ErrorDialog(m1,m2) ErrorDialog(m1,m2)
except Errors.DatabaseError,msg:
ErrorDialog(_("Report could not be created"),str(msg))
except: except:
import DisplayTrace import DisplayTrace
DisplayTrace.DisplayTrace() DisplayTrace.DisplayTrace()