[Gzz-commits] gzz metacode/umlrst.py metacode/umltool.py ./TODO

[Asko Soukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Asko Soukka <address@hidden>    03/01/07 05:22:24

Modified files:
        metacode       : umlrst.py umltool.py 
        .              : TODO 

Log message:
        scaling implicitly embedded diagrams

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umlrst.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umltool.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.490&tr2=1.491&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.490 gzz/TODO:1.491
--- gzz/TODO:1.490      Tue Jan  7 04:30:55 2003
+++ gzz/TODO    Tue Jan  7 05:22:24 2003
@@ -167,13 +167,7 @@
           prototype of mindmap applitude (fall 2003?), check alternatives
        - umltool paper dl 15.2., but should actually be done in the late Jan
        - enhancing umltool
-           - make umltool rst loop not stop when an error
-             in parsing the uml code is encountered -- for example,
-             replace a "-" with a "--" in an association to get such
-             an error.
            - metapost directive: like .uml, but simply a metapost diagram.
-           - the implicitly included diagrams should be reduced in size
-           - focus+context: slightly darker colour
            - bigpackage jlink should only be the label, not the whole area 
              of the bigpackage.
            - jlinks should also work in reverse: the UML diagram
Index: gzz/metacode/umlrst.py
diff -u gzz/metacode/umlrst.py:1.12 gzz/metacode/umlrst.py:1.13
--- gzz/metacode/umlrst.py:1.12 Thu Jan  2 04:06:14 2003
+++ gzz/metacode/umlrst.py      Tue Jan  7 05:22:24 2003
@@ -192,7 +192,7 @@
             new_prefix = name+"_"+path.replace("/","_")
             if new_prefix.endswith(".gen"):
                 new_prefix = new_prefix[0:len(new_prefix)-4]
-            create_diagram(old_prefix, new_prefix, 1.0)
+            create_diagram(old_prefix, new_prefix, 0.5)
         
             #Cut&Pastes imagemap into html
             imgmap = 
open(umltool.settings['tmpdir']+"/"+new_prefix+".gen.html").read()
Index: gzz/metacode/umltool.py
diff -u gzz/metacode/umltool.py:1.17 gzz/metacode/umltool.py:1.18
--- gzz/metacode/umltool.py:1.17        Tue Jan  7 03:48:29 2003
+++ gzz/metacode/umltool.py     Tue Jan  7 05:22:24 2003
@@ -766,7 +766,7 @@
     def imgmapanchor(self, scale=1.0):
        return """<area href="%s" shape="rect" coords="%s" target="_top" 
title="%s" alt="%s" />\n""" \
                % (self.target(),
-                  ",".join(["%s"%(int(c*1.0)) for c in self.corners]),
+                  ",".join(["%s"%(int(c*scale)) for c in self.corners]),
                   self.name,
                   self.name)
        
@@ -854,6 +854,7 @@
 
     scaling = 2
     list = bbox.pstopnm(scaling)
+    scaling = int(scaling / scale)
     print "PSTOPNM: ", list
     syscmd = ("pstopnm -verbose "+" ".join(list)+" <"+path+prefix_out\
               +""".1 | pnmscale -reduce %s |