[Gzz-commits] gzz doc/pegboard/vobuml--tjl/peg.rst metacode/u...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/01/01 08:37:10

Modified files:
        doc/pegboard/vobuml--tjl: peg.rst 
        metacode       : umlhelper.mp umltool.py 

Log message:
        Example image of vob containment. Please see

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/vobuml--tjl/peg.rst.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umlhelper.mp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umltool.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: gzz/doc/pegboard/vobuml--tjl/peg.rst
diff -u gzz/doc/pegboard/vobuml--tjl/peg.rst:1.8 
gzz/doc/pegboard/vobuml--tjl/peg.rst:1.9
--- gzz/doc/pegboard/vobuml--tjl/peg.rst:1.8    Wed Jan  1 08:23:29 2003
+++ gzz/doc/pegboard/vobuml--tjl/peg.rst        Wed Jan  1 08:37:10 2003
@@ -3,8 +3,8 @@
 =============================================================
 
 :Author:   Tuomas J. Lukka
-:Last-Modified: $Date: 2003/01/01 13:23:29 $
-:Revision: $Revision: 1.8 $
+:Last-Modified: $Date: 2003/01/01 13:37:10 $
+:Revision: $Revision: 1.9 $
 :Status:   Incomplete
 
 With PP and hierarchical coordinate systems, 
@@ -153,6 +153,28 @@
 by a thin, dashed line. The coordinate system end is optionally
 adorned by the index.
 
+.. UML:: vobuml2
+
+    class A "orthoCS"
+
+    class B "orthoCS"
+
+    class TextVob
+       vobin - A
+
+    class IrreguVob
+       vobin - role(paper) A
+       vobin - role(frame) B
+
+    ---
+    TextVob.c = (0, 100);
+    IrreguVob.c = (0, 0);
+    A.c = (200,100);
+    B.c = (200,0);
+
+In the above diagram, there are two Vobs and two coordinate
+systems. The TextVob is placed in A, and the IrreguVob, which
+uses two coordinate systems, is in A and B.
 
 Examples
 ========
Index: gzz/metacode/umlhelper.mp
diff -u gzz/metacode/umlhelper.mp:1.14 gzz/metacode/umlhelper.mp:1.15
--- gzz/metacode/umlhelper.mp:1.14      Wed Jan  1 08:19:53 2003
+++ gzz/metacode/umlhelper.mp   Wed Jan  1 08:37:10 2003
@@ -214,6 +214,28 @@
     pickup pe;
 enddef;
 
+vobinthick = .7 pt;
+
+vardef vobinfromassoc(expr p, multi, role) =
+    save pe;
+    pe = savepen;
+    pickup pencircle scaled vobinthick;
+    draw p dashed evenly;
+    adornassocend(p, multi, role);
+    pickup pe;
+enddef;
+
+vardef vobintoassoc(expr p, multi, role) =
+    save pe;
+    pe = savepen;
+    pickup pencircle scaled vobinthick;
+    draw arrowedpath(p, 1.4, 1.0);
+    draw p dashed evenly;
+    adornassocend(p, multi, role);
+    pickup pe;
+enddef;
+
+
 vardef inherit(expr p) =
     save ap;
     path ap;
Index: gzz/metacode/umltool.py
diff -u gzz/metacode/umltool.py:1.11 gzz/metacode/umltool.py:1.12
--- gzz/metacode/umltool.py:1.11        Wed Jan  1 08:19:53 2003
+++ gzz/metacode/umltool.py     Wed Jan  1 08:37:10 2003
@@ -557,6 +557,12 @@
        self.b.type = "vobtransformto"
 
 
+class mpvobin(mpassoc):
+    def __init__(self, var, s, l):
+       mpassoc.__init__(self, var, s, l)
+       self.a.type = "vobinfrom"
+       self.b.type = "vobinto"
+
 
 class simpleRel(namedEl):
     def __init__(self, var, s, l):
@@ -679,6 +685,7 @@
        elif key == "assoc": type = mpassoc
        elif key == "vobtransform": type = mpvobtransform
        elif key == "vobsubmatch": type = mpvobsubmatch
+       elif key == "vobin": type = mpvobin
        elif key == "naryassoc": type = mpnary
        elif key == "supply": type = mpsupply
        elif key == "use": type = mpuse