[Gzz-commits] gzz doc/pp/coords.rst gzz/modules/pp/PPView2.ja...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/01/02 05:04:53

Modified files:
        doc/pp         : coords.rst 
        gzz/modules/pp : PPView2.java 
        metacode       : umlhelper.mp 

Log message:
        Diagram of buoy's relation to main view

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pp/coords.rst.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umlhelper.mp.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: gzz/doc/pp/coords.rst
diff -u gzz/doc/pp/coords.rst:1.3 gzz/doc/pp/coords.rst:1.4
--- gzz/doc/pp/coords.rst:1.3   Wed Jan  1 16:46:55 2003
+++ gzz/doc/pp/coords.rst       Thu Jan  2 05:04:53 2003
@@ -80,7 +80,7 @@
 
     horizontally(50, levi, frameToRoot, panZoom);
     horizontally(40, levii, frameCentered);
-    horizontally(50, leviii, 
+    horizontally(100, leviii, 
       frameUnit, 
            paperToScreen);
     horizontally(60, leviv, 
@@ -109,5 +109,52 @@
 
 ..  UML:: ppcoords1
 
-    class PPSceneRoot
+    class mainCtr "translateCS"
 
+    class frame "orthoBoxCS"
+       vobtransformsub - mainCtr
+
+    class contentToMain "orthoCS"
+       vobsubmatch mainCtr
+
+    class contentAnchor "*CS"
+       vobtransformsub - role(indirect) frame
+       vobtransform - role(indirect) contentToMain
+
+    bigpackage SingleBuoy
+
+    class anchorUnit "unitSqCS"
+       vobtransformsub - contentAnchor
+
+    class anchorCenter "translateCS"
+       vobtransformsub - anchorUnit
+
+    class buoy "buoyOnCircleCS"
+       vobtransform - anchorCenter
+       fields
+           key: Pair(LeftCell, RightCell)
+
+    class buoyFrame "orthoBoxCS"
+       vobtransformsub - buoy
+
+    class buoyPan "orthoCS"
+       vobsubmatch buoy
+
+    ---
+
+    mainCtr.c = (0,-50);
+    horizontally(30, mainfr, frame, contentToMain);
+    vertically(60, colu, mainCtr, mainfr, contentAnchor);
+
+    SingleBuoy.nw = (200, 0);
+    SingleBuoy.se = (400, -300);
+
+    anchorUnit.c = (250, -50);
+    anchorCenter.c = (350, -50);
+    buoy.c = (300, -150);
+    buoyFrame.c = (250, -250);
+    buoyPan.c = (350, -250);
+
+
+
+    
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.31 
gzz/gzz/modules/pp/PPView2.java:1.32
--- gzz/gzz/modules/pp/PPView2.java:1.31        Wed Jan  1 05:33:27 2003
+++ gzz/gzz/modules/pp/PPView2.java     Thu Jan  2 05:04:53 2003
@@ -36,7 +36,7 @@
 import java.util.*;
 
 public class PPView2 implements View {
-public static final String rcsid = "$Id: PPView2.java,v 1.31 2003/01/01 
10:33:27 mudyc Exp $";
+public static final String rcsid = "$Id: PPView2.java,v 1.32 2003/01/02 
10:04:53 tjl Exp $";
     public static boolean dbg = true;
     private static void pa(String s) { System.err.println(s); }
 
@@ -366,10 +366,8 @@
        SinglePlane pl = new SinglePlane();
        pl.context = main_vc;
 
-       int mainctr = ((GLVobCoorder)vs.coords).affineCoordsys(0, 0,
-                   centerX(vs), mainY + mainHeight/2,
-                   1, 0, 0, 1);
-       vs.matcher.add(mainctr, "MAINVP");
+       int mainctr = vs.coords.translateCS(0, "MAINVP",
+                   centerX(vs), mainY + mainHeight/2);
 
        int frameCS = vs.orthoBoxCS(mainctr, "frame", 10, 
                (-mainWidth)/2, -mainHeight/2, 1, 1, 
Index: gzz/metacode/umlhelper.mp
diff -u gzz/metacode/umlhelper.mp:1.16 gzz/metacode/umlhelper.mp:1.17
--- gzz/metacode/umlhelper.mp:1.16      Wed Jan  1 11:21:16 2003
+++ gzz/metacode/umlhelper.mp   Thu Jan  2 05:04:53 2003
@@ -436,20 +436,30 @@
     save cur, had;
     had := 0;
     pair cur;
-    pair final.w, final.e, final.c;
+    pair final.w, final.e, final.c, final.s, final.n;
     forsuffixes obj = t:
        show "Vertically: ",cur, obj;
        if had = 0:
            final.w = obj.w;
+           final.n = obj.n;
+           final.s = obj.s;
            had := 1;
        fi
        obj.w = cur + (spacing, 0);
+       if final.n < obj.n:
+           final.n := obj.n;
+       fi
+       if final.s > obj.s:
+           final.s := obj.s;
+       fi
        save cur;
        pair cur;
        cur = obj.e ;
     endfor
     final.e = cur;
     final.c = 0.5[final.w, final.e];
+    final.n := (xpart final.c, ypart final.n);
+    final.s := (xpart final.c, ypart final.s);
 enddef;
 
 vardef centeroffs(expr spacing)(suffix final)(text t) =