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

Merge pull request #48 from sam-m888/7553GraphviznotGraphViz

Browse Source 
7553 Change GraphViz to Graphviz
This commit is contained in:
Doug Blank 2015-07-25 09:33:20 -04:00
commit 00bd848ab4
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FAQ
View File

@ -212,7 +212,7 @@ their own plugins which could be new reports, charts, or research tools.
18. In what formats can Gramps output its reports? 18. In what formats can Gramps output its reports?
Text reports are available in HTML, PDF, ODT, LaTeX, and RTF formats. Graphical reports (charts and diagrams) are available in PostScript, PDF, SVG, ODS, and GraphViz formats. Text reports are available in HTML, PDF, ODT, LaTeX, and RTF formats. Graphical reports (charts and diagrams) are available in PostScript, PDF, SVG, ODS, and Graphviz formats.
19. How can I change the default language in reports? 19. How can I change the default language in reports?

4
NEWS
View File

@ -360,8 +360,8 @@ Version 3.4.3 of Gramps! "Whenever life gets you down, Mrs. Brown", a maintenanc
* GEDCOM Repositories not imported correctly from FTM for Windows and Heredis. * GEDCOM Repositories not imported correctly from FTM for Windows and Heredis.
* Fixes to a number of errors in filtering notes. * Fixes to a number of errors in filtering notes.
* Fix some errors in determining whether someone is alive (e.g. for filtering out alive people). * Fix some errors in determining whether someone is alive (e.g. for filtering out alive people).
* Make availability of GraphViz settings depend on output format * Make availability of Graphviz settings depend on output format
* Improve the descriptions and tooltip for GraphViz aspect ratio option * Improve the descriptions and tooltip for Graphviz aspect ratio option
* Fixed update problems with citation bottombar gramplet (bug #6336) * Fixed update problems with citation bottombar gramplet (bug #6336)
* Fixed Open Document Text output in Book report (bug #6457) * Fixed Open Document Text output in Book report (bug #6457)
* A number of changes to Narrative Web: * A number of changes to Narrative Web:

2
README
View File

@ -30,7 +30,7 @@ The following packages are *STRONGLY RECOMMENDED* to be installed:
Without this the GeoView will not be active, see Without this the GeoView will not be active, see
http://gramps-project.org/wiki/index.php?title=Gramps_4.1_Wiki_Manual_-_Main_Window#Geography_Category http://gramps-project.org/wiki/index.php?title=Gramps_4.1_Wiki_Manual_-_Main_Window#Geography_Category
GraphViz Enable creation of graphs using GraphViz engine. Graphviz Enable creation of graphs using Graphviz engine.
Without this, three reports cannot be run. Without this, three reports cannot be run.
Obtain it from: http://www.graphviz.org Obtain it from: http://www.graphviz.org

2
gramps/cli/plug/__init__.py
View File

@ -225,7 +225,7 @@ class CommandLineReport(object):
self.raw_name = name self.raw_name = name
self.option_class = option_class(name, database) self.option_class = option_class(name, database)
if category == CATEGORY_GRAPHVIZ: if category == CATEGORY_GRAPHVIZ:
# Need to include GraphViz options # Need to include Graphviz options
self.__gvoptions = graphdoc.GVOptions() self.__gvoptions = graphdoc.GVOptions()
menu = self.option_class.menu menu = self.option_class.menu
self.__gvoptions.add_menu_options(menu) self.__gvoptions.add_menu_options(menu)

14
gramps/gen/plug/docgen/graphdoc.py
View File

@ -128,7 +128,7 @@ class GVOptions():
:return: nothing :return: nothing
""" """
################################ ################################
category = _("GraphViz Layout") category = _("Graphviz Layout")
################################ ################################
font_family = EnumeratedListOption(_("Font family"), "") font_family = EnumeratedListOption(_("Font family"), "")
for item in _FONTS: for item in _FONTS:
@ -151,7 +151,7 @@ class GVOptions():
menu.add_option(category, "rank_dir", rank_dir) menu.add_option(category, "rank_dir", rank_dir)
h_pages = NumberOption(_("Number of Horizontal Pages"), 1, 1, 25) h_pages = NumberOption(_("Number of Horizontal Pages"), 1, 1, 25)
h_pages.set_help(_("GraphViz can create very large graphs by " h_pages.set_help(_("Graphviz can create very large graphs by "
"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. "
@ -159,7 +159,7 @@ class GVOptions():
menu.add_option(category, "h_pages", h_pages) menu.add_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)
v_pages.set_help(_("GraphViz can create very large graphs by " v_pages.set_help(_("Graphviz can create very large graphs by "
"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. "
@ -187,7 +187,7 @@ class GVOptions():
self.v_pages.connect('value-changed', self.pages_changed) self.v_pages.connect('value-changed', self.pages_changed)
################################ ################################
category = _("GraphViz Options") category = _("Graphviz Options")
################################ ################################
aspect_ratio = EnumeratedListOption(_("Aspect ratio"), "fill") aspect_ratio = EnumeratedListOption(_("Aspect ratio"), "fill")
@ -234,7 +234,7 @@ class GVOptions():
menu.add_option(category, "ranksep", ranksep) menu.add_option(category, "ranksep", ranksep)
use_subgraphs = BooleanOption(_('Use subgraphs'), True) use_subgraphs = BooleanOption(_('Use subgraphs'), True)
use_subgraphs.set_help(_("Subgraphs can help GraphViz position " use_subgraphs.set_help(_("Subgraphs can help Graphviz position "
"spouses together, but with non-trivial " "spouses together, but with non-trivial "
"graphs will result in longer lines and " "graphs will result in longer lines and "
"larger graphs.")) "larger graphs."))
@ -510,7 +510,7 @@ class GVDocBase(BaseDoc, GVDoc):
text += ' style="%s"' % style text += ' style="%s"' % style
# note that we always output a label -- even if an empty string -- # note that we always output a label -- even if an empty string --
# otherwise GraphViz uses the node ID as the label which is unlikely # otherwise Graphviz uses the node ID as the label which is unlikely
# to be what the user wants to see in the graph # to be what the user wants to see in the graph
if label.startswith("<") or htmloutput: if label.startswith("<") or htmloutput:
text += ' label=<%s>' % label text += ' label=<%s>' % label
@ -645,7 +645,7 @@ class GVPsDoc(GVDocBase):
# Generate the PS file. # Generate the PS file.
# Reason for using -Tps:cairo. Needed for Non Latin-1 letters # 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: # Some testing with Tps:cairo. Non Latin-1 letters are OK i all cases:
# Output format: ps PDF-GostScript PDF-GraphViz # Output format: ps PDF-GostScript PDF-Graphviz
# Single page OK OK OK # Single page OK OK OK
# Multip page 1 page, OK 1 page, # Multip page 1 page, OK 1 page,
# corrupted set by gramps # corrupted set by gramps

2
gramps/plugins/graph/graphplugins.gpr.py
View File

@ -29,7 +29,7 @@ MODULE_VERSION="5.0"
plg = newplugin() plg = newplugin()
plg.id = 'familylines_graph' plg.id = 'familylines_graph'
plg.name = _("Family Lines Graph") plg.name = _("Family Lines Graph")
plg.description = _("Produces family line graphs using GraphViz.") plg.description = _("Produces family line graphs using Graphviz.")
plg.version = '1.0' plg.version = '1.0'
plg.gramps_target_version = MODULE_VERSION plg.gramps_target_version = MODULE_VERSION
plg.status = STABLE plg.status = STABLE

2
gramps/plugins/graph/gvfamilylines.py
View File

@ -24,7 +24,7 @@
# #
""" """
Family Lines, a GraphViz-based plugin for Gramps. Family Lines, a Graphviz-based plugin for Gramps.
""" """
#------------------------------------------------------------------------ #------------------------------------------------------------------------

2
gramps/plugins/graph/gvhourglass.py
View File

@ -23,7 +23,7 @@
# #
""" """
Generate an hourglass graph using the GraphViz generator. Generate an hourglass graph using the Graphviz generator.
""" """
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #

4
gramps/plugins/graph/gvrelgraph.py
View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Adapted from GraphViz.py (now deprecated) # Adapted from Graphviz.py (now deprecated)
# Copyright (C) 2000-2007 Donald N. Allingham # Copyright (C) 2000-2007 Donald N. Allingham
# Copyright (C) 2005-2006 Eero Tamminen # Copyright (C) 2005-2006 Eero Tamminen
# Copyright (C) 2007-2008 Brian G. Matherly # Copyright (C) 2007-2008 Brian G. Matherly
@ -186,7 +186,7 @@ class RelGraphReport(Report):
def add_child_links_to_families(self): def add_child_links_to_families(self):
""" """
returns string of GraphViz edges linking parents to families or returns string of Graphviz edges linking parents to families or
children children
""" """
# Hash people in a dictionary for faster inclusion checking # Hash people in a dictionary for faster inclusion checking