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

0004637: GraphViz reports should be runnable from the command line

Browse Source 
svn: r16978
This commit is contained in:
Brian Matherly
2011-03-30 01:31:49 +00:00
parent 6cb1eac5c2
commit 9a85b44447
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/cli/plug/__init__.py
View File

@ -152,6 +152,10 @@ class CommandLineReport(object):
self.category = category self.category = category
self.format = None self.format = None
self.option_class = option_class(name, database) self.option_class = option_class(name, database)
if category == CATEGORY_GRAPHVIZ:
# Need to include GraphViz options
self.__gvoptions = graphdoc.GVOptions()
self.__gvoptions.add_menu_options(self.option_class.menu)
self.option_class.load_previous_values() self.option_class.load_previous_values()
_validate_options(self.option_class, database) _validate_options(self.option_class, database)
self.show = options_str_dict.pop('show', None) self.show = options_str_dict.pop('show', None)
@ -355,6 +359,14 @@ class CommandLineReport(object):
if self.format is None: if self.format is None:
# Pick the first one as the default. # Pick the first one as the default.
self.format = self.__bookdoc_plugins[0].get_basedoc() self.format = self.__bookdoc_plugins[0].get_basedoc()
elif self.category == CATEGORY_GRAPHVIZ:
for graph_format in graphdoc.FORMATS:
if graph_format['ext'] == self.options_dict['off']:
if not self.format: # choose the first one, not the last
self.format = graph_format["class"]
if self.format is None:
# Pick the first one as the default.
self.format = graphdoc.FORMATS[0]["class"]
else: else:
self.format = None self.format = None
@ -433,13 +445,17 @@ def cl_report(database, name, category, report_class, options_class,
# write report # write report
try: try:
if category in [CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK, \ if category in [CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK]:
CATEGORY_GRAPHVIZ]:
clr.option_class.handler.doc = clr.format( clr.option_class.handler.doc = clr.format(
clr.selected_style, clr.selected_style,
PaperStyle(clr.paper,clr.orien)) PaperStyle(clr.paper,clr.orien))
if clr.css_filename is not None and hasattr(clr.option_class.handler.doc, 'set_css_filename'): elif category == CATEGORY_GRAPHVIZ:
clr.option_class.handler.doc.set_css_filename(clr.css_filename) clr.option_class.handler.doc = clr.format(
clr.option_class,
PaperStyle(clr.paper,clr.orien))
if clr.css_filename is not None and \
hasattr(clr.option_class.handler.doc, 'set_css_filename'):
clr.option_class.handler.doc.set_css_filename(clr.css_filename)
MyReport = report_class(database, clr.option_class) MyReport = report_class(database, clr.option_class)
MyReport.doc.init() MyReport.doc.init()
MyReport.begin_report() MyReport.begin_report()