From bd966adafdf95be35776f61c4edb65c297019248 Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Sun, 1 Feb 2009 05:14:20 +0000 Subject: [PATCH] Change from using ".dot" to ".gv" for Graphviz files. ".dot" is recognized as MS Word Template file on some systems. svn: r11782 --- src/ReportBase/_GraphvizReportDialog.py | 24 ++++++++++++------------ src/plugins/graph/GVFamilyLines.py | 3 ++- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/ReportBase/_GraphvizReportDialog.py b/src/ReportBase/_GraphvizReportDialog.py index 88c8b0657..4facc3d8e 100644 --- a/src/ReportBase/_GraphvizReportDialog.py +++ b/src/ReportBase/_GraphvizReportDialog.py @@ -354,15 +354,15 @@ class GVDocBase(BaseDoc.BaseDoc, BaseDoc.GVDoc): # #------------------------------------------------------------------------------- class GVDotDoc(GVDocBase): - """ GVDoc implementation that generates a .dot text file. """ + """ GVDoc implementation that generates a .gv text file. """ def close(self): """ Implements GVDocBase.close() """ GVDocBase.close(self) # Make sure the extension is correct - if self._filename[-4:] != ".dot": - self._filename += ".dot" + if self._filename[-4:] != ".gv": + self._filename += ".gv" _run_long_process_in_thread(self.__generate, self._filename) @@ -410,7 +410,7 @@ class GVPsDoc(GVDocBase): application does not appear to hang. """ # Create a temporary dot file - (handle, tmp_dot) = tempfile.mkstemp(".dot" ) + (handle, tmp_dot) = tempfile.mkstemp(".gv" ) dotfile = os.fdopen(handle,"w") dotfile.write(self._dot.getvalue()) dotfile.close() @@ -456,7 +456,7 @@ class GVSvgDoc(GVDocBase): application does not appear to hang. """ # Create a temporary dot file - (handle, tmp_dot) = tempfile.mkstemp(".dot" ) + (handle, tmp_dot) = tempfile.mkstemp(".gv" ) dotfile = os.fdopen(handle,"w") dotfile.write(self._dot.getvalue()) dotfile.close() @@ -502,7 +502,7 @@ class GVSvgzDoc(GVDocBase): application does not appear to hang. """ # Create a temporary dot file - (handle, tmp_dot) = tempfile.mkstemp(".dot" ) + (handle, tmp_dot) = tempfile.mkstemp(".gv" ) dotfile = os.fdopen(handle,"w") dotfile.write(self._dot.getvalue()) dotfile.close() @@ -548,7 +548,7 @@ class GVPngDoc(GVDocBase): application does not appear to hang. """ # Create a temporary dot file - (handle, tmp_dot) = tempfile.mkstemp(".dot" ) + (handle, tmp_dot) = tempfile.mkstemp(".gv" ) dotfile = os.fdopen(handle,"w") dotfile.write(self._dot.getvalue()) dotfile.close() @@ -594,7 +594,7 @@ class GVJpegDoc(GVDocBase): application does not appear to hang. """ # Create a temporary dot file - (handle, tmp_dot) = tempfile.mkstemp(".dot" ) + (handle, tmp_dot) = tempfile.mkstemp(".gv" ) dotfile = os.fdopen(handle,"w") dotfile.write(self._dot.getvalue()) dotfile.close() @@ -640,7 +640,7 @@ class GVGifDoc(GVDocBase): application does not appear to hang. """ # Create a temporary dot file - (handle, tmp_dot) = tempfile.mkstemp(".dot" ) + (handle, tmp_dot) = tempfile.mkstemp(".gv" ) dotfile = os.fdopen(handle,"w") dotfile.write(self._dot.getvalue()) dotfile.close() @@ -689,7 +689,7 @@ class GVPdfGvDoc(GVDocBase): application does not appear to hang. """ # Create a temporary dot file - (handle, tmp_dot) = tempfile.mkstemp(".dot" ) + (handle, tmp_dot) = tempfile.mkstemp(".gv" ) dotfile = os.fdopen(handle,"w") dotfile.write(self._dot.getvalue()) dotfile.close() @@ -733,7 +733,7 @@ class GVPdfGsDoc(GVDocBase): application does not appear to hang. """ # Create a temporary dot file - (handle, tmp_dot) = tempfile.mkstemp(".dot" ) + (handle, tmp_dot) = tempfile.mkstemp(".gv" ) dotfile = os.fdopen(handle,"w") dotfile.write(self._dot.getvalue()) dotfile.close() @@ -823,7 +823,7 @@ if _DOT_FOUND: _FORMATS += [{ 'type' : "dot", 'ext' : "dot", - 'descr': _("Graphviz Dot File"), + 'descr': _("Graphviz File"), 'mime' : "text/x-graphviz", 'class': GVDotDoc }] diff --git a/src/plugins/graph/GVFamilyLines.py b/src/plugins/graph/GVFamilyLines.py index d118c04f9..2bebda2d3 100644 --- a/src/plugins/graph/GVFamilyLines.py +++ b/src/plugins/graph/GVFamilyLines.py @@ -757,7 +757,8 @@ class FamilyLinesReport(Report): self.doc.add_comment('') - # if we're going to attempt to include images, then use the HTML style of .dot file + # If we're going to attempt to include images, then use the HTML style + # of .gv file. bUseHtmlOutput = False if self._incimages: bUseHtmlOutput = True