From 935f32acffd15885b327cde3101ebc4d4d6ff6d4 Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Thu, 27 Dec 2007 22:23:40 +0000 Subject: [PATCH] Fix thumbnail images and HTML labels for relationship graph (Graphviz). svn: r9604 --- ChangeLog | 4 ++++ src/ReportBase/_GraphvizReportDialog.py | 7 ++++++- src/plugins/GVRelGraph.py | 3 --- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3851e20c2..7daa7df33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-12-27 Brian Matherly + * src/ReportBase/_GraphvizReportDialog.py: + * src/plugins/GVRelGraph.py: fix thumbnail images and HTML output. + 2007-12-27 Brian Matherly * src/ReportBase/_GraphvizReportDialog.py: Fix Graphviz generated PDF. diff --git a/src/ReportBase/_GraphvizReportDialog.py b/src/ReportBase/_GraphvizReportDialog.py index 9b0f3b461..43d0cfe61 100644 --- a/src/ReportBase/_GraphvizReportDialog.py +++ b/src/ReportBase/_GraphvizReportDialog.py @@ -214,7 +214,12 @@ class GVDocBase(BaseDoc.BaseDoc,BaseDoc.GVDoc): Implementes BaseDoc.GVDoc.add_node(). """ line = ' "%s" [' % id - line += 'label="%s"' % label + + if label.startswith("<"): + # This must be HTML + line += 'label=<%s>' % label + else: + line += 'label="%s"' % label if shape: line += ', shape="%s"' % shape diff --git a/src/plugins/GVRelGraph.py b/src/plugins/GVRelGraph.py index 6a89cf70a..d4dfb3abc 100644 --- a/src/plugins/GVRelGraph.py +++ b/src/plugins/GVRelGraph.py @@ -220,9 +220,6 @@ class RelGraphReport(Report): dirpath = dirpath.lower() url = "%s/%s.html" % (dirpath,h) - if self.bUseHtmlOutput: - label = '<%s>' % label - self.doc.add_node(p_id,label,shape,color,style,fill) # Output families where person is a parent