[Gzz-commits] navidoc/navidoc/mp __init__.py uml.mp

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Changes by:     Asko Soukka <address@hidden>    03/05/21 06:27:52

Modified files:
        navidoc/mp     : __init__.py uml.mp 

Log message:
        roughEdges everywhere

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/uml.mp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.24 navidoc/navidoc/mp/__init__.py:1.25
--- navidoc/navidoc/mp/__init__.py:1.24 Wed May 21 05:32:56 2003
+++ navidoc/navidoc/mp/__init__.py      Wed May 21 06:27:52 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: __init__.py,v 1.24 2003/05/21 09:32:56 humppake Exp $
+# $Id: __init__.py,v 1.25 2003/05/21 10:27:52 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -38,14 +38,16 @@
 dbg = config.dbg.shorthand('mp')
 dbg_fail = config.dbg.shorthand('mp.fail')
 
+rough_edges = []
+
 def link_draw_code(self):
     if config.mp_eps_only: return ''
     if self.error: return 'showlinkerror("'+self.target+'", "'+self.title+'", 
('+self.bbox+'));'
     if not self.focus: return 'showlink("'+self.target+'", "'+self.title+'", 
('+self.bbox+'));'
     else:
         if self.rough_edge:
-            return 'showfocus("'+self.target+'", "'+self.title+'", 
('+self.bbox+'));' \
-                   +"\n"+'drawRoughEdge(('+self.bbox+'));'
+            navidoc.mp.rough_edges.extend([self.bbox])
+            return 'showfocus("'+self.target+'", "'+self.title+'", 
('+self.bbox+'));'+"\n"
         else: return 'showfocus("'+self.target+'", "'+self.title+'", 
('+self.bbox+'));'
 navidoc.link.Link.draw_code = link_draw_code
 
@@ -92,7 +94,7 @@
         self.do_contents(list)
         if self.link != None:
             self.link.bbox = ('bboxmeasuredpic(%s)' % (self.var))
-            self.link.rough_edge = 0
+            self.link.rough_edge = 1
     def setup_code(self):
        s = """
            picture %%.pict;
@@ -193,8 +195,15 @@
     gen2 = open(dir+diagram+context+'.gen.mp.2', 'w')
     gen2.write(m.draw_code()+"\n")
     gen2.write(draw_extra+"\n")
+
+    global rough_edges
+    for rough_bbox in rough_edges:
+        """Print stored roughEdges now, on top of everything else."""
+        gen2.write('drawRoughEdge(('+rough_bbox+'), (bbox 
currentpicture));'+"\n")
     gen2.write('showlinksize("bbox", "'+diagram+'", (bbox 
currentpicture));'+"\n")
     gen2.close()
+    rough_edges = []
+
     gen3 = open(dir+diagram+context+".gen.mp.3", "w")
     gen3.write("""
        prologues := 1;
Index: navidoc/navidoc/mp/uml.mp
diff -u navidoc/navidoc/mp/uml.mp:1.4 navidoc/navidoc/mp/uml.mp:1.5
--- navidoc/navidoc/mp/uml.mp:1.4       Wed May 21 05:32:56 2003
+++ navidoc/navidoc/mp/uml.mp   Wed May 21 06:27:52 2003
@@ -19,7 +19,7 @@
 % MA  02111-1307  USA
 % 
 
-% $Id: uml.mp,v 1.4 2003/05/21 09:32:56 humppake Exp $
+% $Id: uml.mp,v 1.5 2003/05/21 10:27:52 humppake Exp $
 
 %
 % Written by Tuomas Lukka
@@ -445,7 +445,7 @@
     jitterpt(point length(p) of p, pta)
 enddef;
 
-vardef drawRoughEdge(expr p) =
+vardef drawRoughEdge(expr p, q) =
     save c, hor, ver, np, j, astart, athrough, aend, na;
     pair c;
     c = center(p);
@@ -475,6 +475,7 @@
     np := jitterpath(np, round(40+uniformdeviate(30)), .05 * j);
 
     draw np withpen pencircle scaled 8pt xscaled .4 rotated -37;
+    clip currentpicture to q;;
     
 enddef;