[Gzz-commits] gzz doc/pegboard/vobuml--tjl/peg.rst doc/pp/coo...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/01/01 11:21:16

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

Log message:
        Visual shortcut

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/vobuml--tjl/peg.rst.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pp/coords.rst.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umlhelper.mp.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umltool.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: gzz/doc/pegboard/vobuml--tjl/peg.rst
diff -u gzz/doc/pegboard/vobuml--tjl/peg.rst:1.9 
gzz/doc/pegboard/vobuml--tjl/peg.rst:1.10
--- gzz/doc/pegboard/vobuml--tjl/peg.rst:1.9    Wed Jan  1 08:37:10 2003
+++ gzz/doc/pegboard/vobuml--tjl/peg.rst        Wed Jan  1 11:21:16 2003
@@ -3,8 +3,8 @@
 =============================================================
 
 :Author:   Tuomas J. Lukka
-:Last-Modified: $Date: 2003/01/01 13:37:10 $
-:Revision: $Revision: 1.9 $
+:Last-Modified: $Date: 2003/01/01 16:21:16 $
+:Revision: $Revision: 1.10 $
 :Status:   Incomplete
 
 With PP and hierarchical coordinate systems, 
@@ -144,6 +144,28 @@
     B = vs.coords.scale(0, ...)
     C = vs.coords.cull(A, B)
     vs.matcher.addSub(A, C, ...)
+
+Since the same two coordinate systems often have 
+both ``vobsubmatch`` and ``vobtransform`` relationships,
+a visual shorthand of dashing the line types can be used:
+
+
+..  UML:: vobuml1_short
+
+    class A "*CS"
+
+    class B "scaleCS"
+
+    class C "cullCS"
+       vobtransformsub - role(parent) A
+       vobtransform - role(clip) B
+
+    ---
+
+    A.c = (0,0);
+    B.c = (100,0);
+    C.c = (50, -150);
+
 
 Relationships of Vobs
 ---------------------
Index: gzz/doc/pp/coords.rst
diff -u gzz/doc/pp/coords.rst:1.1 gzz/doc/pp/coords.rst:1.2
--- gzz/doc/pp/coords.rst:1.1   Tue Dec 31 05:08:14 2002
+++ gzz/doc/pp/coords.rst       Wed Jan  1 11:21:16 2003
@@ -2,11 +2,13 @@
 The coordinate systems in PP
 ============================
 
-.. image pp-fullsketch.png
+.. figure:: pp-fullsketch.png
+   :width: 400
 
    A sketch of the overall PP view
 
-.. image pp-leftedge.png
+.. figure:: pp-leftedge.png
+   :width: 250
 
    The Focus+Context zooming in left panel.
 
@@ -23,21 +25,28 @@
 
 
 
-..  uml ppcoordscanvas
+..  UML:: ppcoordscanvas
 
-    class Frame2Root "*CS"
+    class frame2Root "*CS"
 
-    class FrameCentered "translateCS"
+    class panZoom "*CS"
 
-    class Paper2Frame "*CS"
+
+    class frameCentered "translateCS"
+       vobtransform - frame2Root
+
+    frcmat = vobsubmatch frameCentered frame2Root
 
     class Paper2Screen "concatCS"
+       vobtransform - role(0) frameCentered
+       vobtransform - role(1) panZoom
+       vobsubmatch frame2Root
 
     class Bg2Screen "scaleCS"
+       vobtransform - Paper2Screen
 
 
-..  uml ppcoords1
+..  UML:: ppcoords1
 
     class PPSceneRoot
 
-    class 
Index: gzz/metacode/umlhelper.mp
diff -u gzz/metacode/umlhelper.mp:1.15 gzz/metacode/umlhelper.mp:1.16
--- gzz/metacode/umlhelper.mp:1.15      Wed Jan  1 08:37:10 2003
+++ gzz/metacode/umlhelper.mp   Wed Jan  1 11:21:16 2003
@@ -194,6 +194,8 @@
 enddef;
 
 vobtransformthick = .5 pt;
+vobinthick = .7 pt;
+vobsubmatchthick = 2pt;
 
 vardef vobtransformfromassoc(expr p, multi, role) =
     save pe;
@@ -214,7 +216,34 @@
     pickup pe;
 enddef;
 
-vobinthick = .7 pt;
+picture vobtranssubdash;
+vobtranssubdash = dashpattern(on 8pt off 12pt);
+
+vardef vobtransformfromsubassoc(expr p, multi, role) =
+    save pe;
+    pe = savepen;
+    pickup pencircle scaled vobsubmatchthick;
+    draw p dashed vobtranssubdash;
+    pickup pencircle scaled vobtransformthick;
+    draw p;
+    adornassocend(p, multi, role);
+    pickup pe;
+enddef;
+
+vardef vobtransformtosubassoc(expr p, multi, role) =
+    save pe;
+    pe = savepen;
+    pickup pencircle scaled vobsubmatchthick;
+    draw p dashed vobtranssubdash;
+    draw arrowedpath(p, 1, 1.3);
+
+    pickup pencircle scaled vobtransformthick;
+    draw p;
+    adornassocend(p, multi, role);
+    pickup pe;
+enddef;
+
+
 
 vardef vobinfromassoc(expr p, multi, role) =
     save pe;
@@ -254,7 +283,6 @@
     draw ap;
 enddef;
 
-vobsubmatchthick = 2pt;
 vardef vobsubmatch(expr p) =
     save pe;
     pe = savepen;
Index: gzz/metacode/umltool.py
diff -u gzz/metacode/umltool.py:1.12 gzz/metacode/umltool.py:1.13
--- gzz/metacode/umltool.py:1.12        Wed Jan  1 08:37:10 2003
+++ gzz/metacode/umltool.py     Wed Jan  1 11:21:16 2003
@@ -556,6 +556,12 @@
        self.a.type = "vobtransformfrom"
        self.b.type = "vobtransformto"
 
+class mpvobtransformsub(mpassoc):
+    def __init__(self, var, s, l):
+       mpassoc.__init__(self, var, s, l)
+       self.a.type = "vobtransformfromsub"
+       self.b.type = "vobtransformtosub"
+
 
 class mpvobin(mpassoc):
     def __init__(self, var, s, l):
@@ -684,6 +690,7 @@
        elif key == "interface": type = mpinterface
        elif key == "assoc": type = mpassoc
        elif key == "vobtransform": type = mpvobtransform
+       elif key == "vobtransformsub": type = mpvobtransformsub
        elif key == "vobsubmatch": type = mpvobsubmatch
        elif key == "vobin": type = mpvobin
        elif key == "naryassoc": type = mpnary