[Gzz-commits] gzz/metacode umlhelper.mp umltool.py

[Asko Soukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Asko Soukka <address@hidden>    03/02/07 06:28:45

Modified files:
        metacode       : umlhelper.mp umltool.py 

Log message:
        umltool upgrade

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umlhelper.mp.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umltool.py.diff?tr1=1.25&tr2=1.26&r1=text&r2=text

Patches:
Index: gzz/metacode/umlhelper.mp
diff -u gzz/metacode/umlhelper.mp:1.21 gzz/metacode/umlhelper.mp:1.22
--- gzz/metacode/umlhelper.mp:1.21      Thu Feb  6 16:57:42 2003
+++ gzz/metacode/umlhelper.mp   Fri Feb  7 06:28:44 2003
@@ -79,6 +79,10 @@
 
 
 % A class title as a picture (font etc)
+def diagramTitle(expr s) =
+    (infontBB(s, defaultfont) scaled 2.0)
+enddef;
+
 def classTitle(expr s) =
     (infontBB(s, defaultfont) scaled 1.5)
 enddef;
@@ -390,8 +394,8 @@
     showjlinksize(name, p);
 enddef;
 vardef showlinkerror(expr name, p) =
-    fill p withcolor (1, 0.6, 0.6);
     showjlinksize(name, p);
+    draw classTitle("BROKEN LINK") shifted ulcorner(p) withcolor (1, 0, 0);
 enddef;
 vardef showfocus(expr name, p) =
     fill p withcolor (9, 0.8, 0.7);
Index: gzz/metacode/umltool.py
diff -u gzz/metacode/umltool.py:1.25 gzz/metacode/umltool.py:1.26
--- gzz/metacode/umltool.py:1.25        Thu Feb  6 16:57:42 2003
+++ gzz/metacode/umltool.py     Fri Feb  7 06:28:44 2003
@@ -395,14 +395,13 @@
     def setupCode(self):
        s = """
            picture %%.pict;
-           %%.pict = classTitle("%name%");
+           %%.pict = diagramTitle("%name%");
            picmeasurements(%%);
            """
        return self.repl(s)
     def drawCode(self):
        s =  jlinkstr(self.jlink, "bboxmeasuredpic(%%)", 0) + """
            drawmeasuredpic(%%);
-           draw bboxmeasuredpic(%%);
            """ 
        return self.repl(s)
 
@@ -840,9 +839,11 @@
                 refer_names[id] = refer_name
                 refer_obj = mptitle(refer_name, refer_title)
                 refer_obj.jlink = refer_jlink+"#"+settings['name']
+                if id == len(refers)-1:
+                    refer_draw += "\tdraw 
ulcorner(bbox(currentpicture))+(0,10) -- urcorner(bbox(currentpicture))+(0,10) 
withpen pencircle scaled 3pt;\n"
                 refer_draw += refer_obj.setupCode()
                 if id == len(refers)-1:
-                    refer_draw += "\t"+refer_name+".sw = 
ulcorner(bbox(currentpicture));\n"
+                    refer_draw += "\t"+refer_name+".sw = 
ulcorner(bbox(currentpicture))+(2,0);\n"
                 else:
                     refer_draw += "\t"+refer_name+".sw = "\
                                   +refer_names[id+1]\