[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/metacode umlrst.py umltool.py
|
From: |
Asko Soukka |
|
Subject: |
[Gzz-commits] gzz/metacode umlrst.py umltool.py |
|
Date: |
Thu, 19 Dec 2002 08:46:30 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Asko Soukka <address@hidden> 02/12/19 08:46:30
Modified files:
metacode : umlrst.py umltool.py
Log message:
fixed imagemap-output
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umlrst.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umltool.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: gzz/metacode/umlrst.py
diff -u gzz/metacode/umlrst.py:1.6 gzz/metacode/umlrst.py:1.7
--- gzz/metacode/umlrst.py:1.6 Wed Dec 18 10:56:09 2002
+++ gzz/metacode/umlrst.py Thu Dec 19 08:46:30 2002
@@ -128,12 +128,12 @@
#Cut&Pastes imagemap into html
imgmap =
open(umltool.settings['tmpdir']+"/"+name+".gen.html").read()
- out.write("<map name=\""+name+"\">\n")
+ out.write("<map id=\""+name+"\" name=\""+name+"\">\n")
out.write(imgmap[imgmap.find('>',imgmap.find('<map'))+1:\
imgmap.find('</map>')])
out.write("</map>\n")
out.write("<img
src=\""+umltool.settings['to_tmpdir']+"/"+name+".gen.png"\
- +"\" usemap=\""+name+"\"/>")
+ +"\" usemap=\""+name+"\" alt=\""+name+"\" />")
html = html[html.find("-->", insert)+3:len(html)]
insert = html.find("<!-- UML:")
out.write(html)
Index: gzz/metacode/umltool.py
diff -u gzz/metacode/umltool.py:1.5 gzz/metacode/umltool.py:1.6
--- gzz/metacode/umltool.py:1.5 Wed Dec 18 10:56:09 2002
+++ gzz/metacode/umltool.py Thu Dec 19 08:46:30 2002
@@ -700,25 +700,25 @@
"-xsize", self.w * scale, "-ysize", self.h * scale,
"-xborder", 0, "-yborder", 0]]
-def run(prefix):
- if prefix.endswith(".gen"):
- genprefix = prefix
- else: genprefix = prefix + ".gen"
+def run(prefix_in, prefix_out=""):
+ if prefix_out == "": prefix_out = prefix_in
+ if not prefix_out.endswith(".gen"): prefix_out = prefix_out + ".gen"
+
if settings.has_key('tmpdir'):
path = settings['tmpdir'] + "/"
else: path = '';
- s = open(path+prefix+".uml").read()
+ s = open(path+prefix_in+".uml").read()
l = parseIndented(s)
m = mplist(l)
- gen1 = open(path+genprefix+".1", "w")
+ gen1 = open(path+prefix_out+".1", "w")
gen1.write(m.setupCode())
gen1.close()
- gen2 = open(path+genprefix+".2", "w")
+ gen2 = open(path+prefix_out+".2", "w")
gen2.write(m.drawCode())
gen2.close()
- gen3 = open(path+genprefix+".3", "w")
+ gen3 = open(path+prefix_out+".3", "w")
gen3.write("""
prologues := 1;
@@ -726,20 +726,20 @@
beginfig(1)
- input %(genprefix)s.1
- input %(prefix)s.mp
- input %(genprefix)s.2
+ input %(prefix_out)s.1
+ input %(prefix_in)s.mp
+ input %(prefix_out)s.2
endfig
end
""" % locals())
gen3.close()
- syscmd = "/usr/bin/mpost %s" % genprefix+".3";
+ syscmd = "/usr/bin/mpost %s" % prefix_out+".3";
if settings.has_key('tmpdir'):
os.system("cd "+path+";"+syscmd)
else: os.system(syscmd)
- log = open(path+genprefix+".log").read()
+ log = open(path+prefix_out+".log").read()
print "LINKS"
links = []
@@ -758,9 +758,9 @@
list = bbox.pstopnm(4)
print "PSTOPNM: ", list
- syscmd = ("pstopnm -verbose "+" ".join(list)+" <"+path+genprefix\
+ syscmd = ("pstopnm -verbose "+" ".join(list)+" <"+path+prefix_out\
+""".1 | pnmscale -reduce 4 |
- pnmtopng >"""+path+genprefix+".png")
+ pnmtopng >"""+path+prefix_out+".png")
print "Command:",syscmd
os.system(syscmd)
@@ -772,7 +772,7 @@
</HEAD>
<BODY>
<P>
- %(prefix)s<BR>
+ %(prefix_in)s<BR>
<OBJECT data="%(filename)s" type="image/png" usemap="map1">
<map name="map1">
%(links)s
@@ -780,9 +780,10 @@
</OBJECT>
</BODY>
</HTML>
- """ % { "prefix": prefix,
- "filename": genprefix+".png",
+ """ % { "prefix_in": prefix_in,
+ "filename": prefix_out+".png",
"links": " ".join([l.imgmapanchor() for l in links]) }
- html = open(path+genprefix+".html", "w")
+ html = open(path+prefix_out+".html", "w")
html.write(htmlcode)
html.close()
+
- [Gzz-commits] gzz/metacode umlrst.py umltool.py,
Asko Soukka <=