You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by aj...@apache.org on 2004/06/16 20:15:36 UTC

cvs commit: gump/python/gump/test loading.py

ajack       2004/06/16 11:15:36

  Modified:    python/gump/document/xdocs Tag: CleanUp documenter.py
               python/gump/test Tag: CleanUp loading.py
  Log:
  Embedded SVGs (not PNGs) when using XHTML.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.9.2.6   +16 -8     gump/python/gump/document/xdocs/documenter.py
  
  Index: documenter.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/document/xdocs/documenter.py,v
  retrieving revision 1.9.2.5
  retrieving revision 1.9.2.6
  diff -u -r1.9.2.5 -r1.9.2.6
  --- documenter.py	16 Jun 2004 17:50:40 -0000	1.9.2.5
  +++ documenter.py	16 Jun 2004 18:15:36 -0000	1.9.2.6
  @@ -1760,9 +1760,9 @@
           statsTable=statsSection.createTable()           
           
           # Generate an SVG for FOG:
  -        #(pngFile,pngTitle) = self.diagramFOG(project)
  -        #if pngFile:
  -        #    statsTable.createEntry("FOG Factor: ").createData().createIcon(pngFile,pngTitle)
  +        (file,title) = self.diagramFOG(project)
  +        if file:
  +            statsTable.createEntry("FOG Factor: ").createData().createIcon(file,title)
               
           statsTable.createEntry("FOG Factor: ", '%02.2f' % stats.getFOGFactor())
           statsTable.createEntry('Dependency Depth: ', project.getDependencyDepth())        
  @@ -1888,10 +1888,10 @@
           # Not ready for prime time...   
           try:
               # Generate an SVG for Dependencies Diagram:
  -            (pngFile,pngTitle) = self.diagramDependencies(project)
  -            if pngFile:
  +            (file,title) = self.diagramDependencies(project)
  +            if file:
                   para=dependencySection.createSection('Dependency Diagram').createParagraph()
  -                para.createFork(pngFile).createIcon(pngFile,pngTitle)
  +                para.createFork(file).createIcon(file,title)
           except:
               log.error('Failed to diagram dependencies for [' + project.getName() + ']', exc_info=1)
           
  @@ -2553,7 +2553,11 @@
               diagram=ScaleDiagram([stats.successes,stats.prereqs,stats.failures])
               diagram.generateDiagram().serializeToFile(svgFile)
               
  -            return (pngFile, 'FOG Factor')
  +            file=pngFile
  +            if self.config.isXhtml():
  +                file=svgFile
  +            
  +            return (file, 'FOG Factor')
               
           return (None, None)
                   
  @@ -2569,7 +2573,11 @@
           diagram.compute()
           diagram.generateDiagram().serializeToFile(svgFile)
           
  -        return (pngFile, 'Dependency Diagram')
  +        file=pngFile
  +        if self.config.isXhtml():
  +           file=svgFile
  +                
  +        return (file, 'Dependency Diagram')
                   
       #####################################################################           
       #
  
  
  
  No                   revision
  No                   revision
  1.1.2.2   +1 -1      gump/python/gump/test/Attic/loading.py
  
  Index: loading.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/test/Attic/loading.py,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- loading.py	16 Jun 2004 17:50:40 -0000	1.1.2.1
  +++ loading.py	16 Jun 2004 18:15:36 -0000	1.1.2.2
  @@ -38,7 +38,7 @@
       def __init__(self):
           UnitTestSuite.__init__(self)
           
  -    def performLoad(file):
  +    def performLoad(self,file):
           return WorkSpaceLoader(True).load(file)
   
       def testSimple1(self):
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org