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

Fix of issue 2815.

Browse Source 
svn: r12330
This commit is contained in:
Peter Landgren 2009-03-13 10:17:19 +00:00
parent b93aac2667
commit 55d5595d47
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/ReportBase/_GraphvizReportDialog.py
View File

@ -322,17 +322,6 @@ class GVDocBase(BaseDoc.BaseDoc, BaseDoc.GVDoc):
self.write('\n') self.write('\n')
def add_invis_links(self, persons_id):
"""
Adds a sequence of links of the style:
node1 -> node2 -> ... -> node3 [ style = invis ];
"""
if len(persons_id) > 1:
ids = " -> ".join(persons_id)
self.write(' { rank=same; %s [ style = invis ]; }\n' % ids)
def add_comment(self, comment): def add_comment(self, comment):
""" """
Add a comment. Add a comment.
@ -403,6 +392,13 @@ class GVPsDoc(GVDocBase):
# GV documentation says dpi is only for image formats. # GV documentation says dpi is only for image formats.
options.menu.get_option_by_name('dpi').set_value(72) options.menu.get_option_by_name('dpi').set_value(72)
GVDocBase.__init__(self, options, paper_style) GVDocBase.__init__(self, options, paper_style)
# GV documentation allow multiple pages only for ps format,
# But it does not work with -Tps:cairo in order to
# show Non Latin-1 letters. Force to only 1 page.
# See bug tracker issue 2815
options.menu.get_option_by_name('v_pages').set_value(1)
options.menu.get_option_by_name('h_pages').set_value(1)
GVDocBase.__init__(self, options, paper_style)
def close(self): def close(self):
""" Implements GVDocBase.close() """ """ Implements GVDocBase.close() """
@ -427,6 +423,16 @@ class GVPsDoc(GVDocBase):
dotfile.close() dotfile.close()
# Generate the PS file. # Generate the PS file.
# Reason for using -Tps:cairo. Needed for Non Latin-1 letters
# Some testing with Tps:cairo. Non Latin-1 letters are OK i all cases:
# Output format: ps PDF-GostScript PDF-GraphViz
# Single page OK OK OK
# Multip page 1 page, OK 1 page,
# corrupted set by gramps
# If I take a correct multip page PDF and convert it with pdf2ps I get multip pages,
# but the output is clipped, some margins have disappeared. I used 1 inch margins always.
# See bug tracker issue 2815
os.system( 'dot -Tps:cairo -o"%s" "%s"' % (self._filename, tmp_dot) ) os.system( 'dot -Tps:cairo -o"%s" "%s"' % (self._filename, tmp_dot) )
# Delete the temporary dot file # Delete the temporary dot file
os.remove(tmp_dot) os.remove(tmp_dot)
@ -753,6 +759,8 @@ class GVPdfGsDoc(GVDocBase):
os.close( handle ) os.close( handle )
# Generate PostScript using dot # Generate PostScript using dot
# Reason for using -Tps:cairo. Needed for Non Latin-1 letters
# See bug tracker issue 2815
command = 'dot -Tps:cairo -o"%s" "%s"' % ( tmp_ps, tmp_dot ) command = 'dot -Tps:cairo -o"%s" "%s"' % ( tmp_ps, tmp_dot )
os.system(command) os.system(command)
@ -955,8 +963,7 @@ class GraphvizReportDialog(ReportDialog):
"spreading the graph across a rectangular " "spreading the graph across a rectangular "
"array of pages. This controls the number " "array of pages. This controls the number "
"pages in the array horizontally. " "pages in the array horizontally. "
"Only valid for dot, postscript and pdf " "Only valid for dot and pdf via Ghostscript."))
"via Ghostscript."))
self.options.add_menu_option(category, "h_pages", h_pages) self.options.add_menu_option(category, "h_pages", h_pages)
v_pages = NumberOption(_("Number of Vertical Pages"), 1, 1, 25) v_pages = NumberOption(_("Number of Vertical Pages"), 1, 1, 25)
@ -964,8 +971,7 @@ class GraphvizReportDialog(ReportDialog):
"spreading the graph across a rectangular " "spreading the graph across a rectangular "
"array of pages. This controls the number " "array of pages. This controls the number "
"pages in the array vertically. " "pages in the array vertically. "
"Only valid for dot, postscript and pdf " "Only valid for dot and pdf via Ghostscript."))
"via Ghostscript."))
self.options.add_menu_option(category, "v_pages", v_pages) self.options.add_menu_option(category, "v_pages", v_pages)
page_dir = EnumeratedListOption(_("Paging Direction"), "BL") page_dir = EnumeratedListOption(_("Paging Direction"), "BL")