From db449a4968868559b4a4d6f2f9ed2ecb2578d8c0 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sat, 5 Jan 2002 19:55:03 +0000 Subject: [PATCH] New Descendant Graph report, along with various report enhancements svn: r679 --- README | 5 +- src/DrawDoc.py | 3 + src/HtmlDoc.py | 12 +- src/PdfDrawDoc.py | 30 +++ src/Plugins.py | 33 +-- src/Report.py | 311 +++++++++++++++++------- src/StyleEditor.py | 6 +- src/TextDoc.py | 20 +- src/plugins.glade | 47 ++++ src/plugins/AncestorChart.py | 1 + src/plugins/AncestorReport.py | 1 + src/plugins/DesGraph.py | 434 ++++++++++++++++++++++++++++++++++ src/plugins/DescendReport.py | 1 + src/plugins/FamilyGroup.py | 1 + src/plugins/GraphViz.py | 1 + src/plugins/IndivSummary.py | 1 + src/plugins/Summary.py | 1 + src/plugins/WebPage.py | 1 + src/utils.py | 12 - 19 files changed, 786 insertions(+), 135 deletions(-) create mode 100644 src/plugins/DesGraph.py diff --git a/README b/README index bff3db624..4f01b6f54 100644 --- a/README +++ b/README @@ -6,7 +6,10 @@ Python 1.5.2 or greater Gnome 1.2 or greater PyGnome 1.0.53 or greater -PyXML 0.6.2 or greater (http://sourceforge.net/project/showfiles.php?group_id=6473) +If you are using python 1.5.2, you may also need PyXML 0.6.2 or +greater. Many distributions already provide this, but if your +installation does not have it, you can get it from +http://sourceforge.net/project/showfiles.php?group_id=6473 Building on non-Linux systems: i18n support and GNU make -------------------------------------------------------- diff --git a/src/DrawDoc.py b/src/DrawDoc.py index ce6db5ec7..7c918ea7b 100644 --- a/src/DrawDoc.py +++ b/src/DrawDoc.py @@ -136,6 +136,9 @@ class DrawDoc: def draw_box(self,style,text,x,y): pass + def write_at(self,style,text,x,y): + pass + def draw_line(self,style,x1,y1,x2,y2): pass diff --git a/src/HtmlDoc.py b/src/HtmlDoc.py index 29130e006..24afa766f 100644 --- a/src/HtmlDoc.py +++ b/src/HtmlDoc.py @@ -40,7 +40,7 @@ try: except: no_pil = 1 -t_header_line_re = re.compile(r"(.*).*(.*)", re.DOTALL) +t_header_line_re = re.compile(r"(.*)(.*)(.*)", re.DOTALL|re.IGNORECASE|re.MULTILINE) #------------------------------------------------------------------------ # @@ -48,10 +48,10 @@ t_header_line_re = re.compile(r"(.*).*(.*)", re.DOTALL) # #------------------------------------------------------------------------ _top = [ - '\n', + '\n', '\n', '\n', - ' \n', + ' \n', ' \n', ' \n', '