[Gzz-commits] gzz ./TODO gzz/modules/pp/PPView2.java

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/11/05 04:12:31

Modified files:
        .              : TODO 
        gzz/modules/pp : PPView2.java 

Log message:
        fillets

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.368&tr2=1.369&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.368 gzz/TODO:1.369
--- gzz/TODO:1.368      Tue Nov  5 03:30:13 2002
+++ gzz/TODO    Tue Nov  5 04:12:31 2002
@@ -98,15 +98,13 @@
        + new PEG for bubbleview, with some sketches
     tjl:        
        - PP [deadline 5.11]
-           - images
-           - fillets main<->buoy
+           - fix directory geometry
            - dragging texts
            - editing text -- can use Win.java code --> new Java file, with
              AbstractViewContext and PPView2
            - deleting links?!
            - nadir
            - use jvk's new ellipse code
-           - fix directory geometry
            - HOME button
        - fix LineVob for AWT
        - PEG getCS(parent, key), affineCoordsys -> affine, +affineCS in 
VobScene
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.14 
gzz/gzz/modules/pp/PPView2.java:1.15
--- gzz/gzz/modules/pp/PPView2.java:1.14        Tue Nov  5 03:55:33 2002
+++ gzz/gzz/modules/pp/PPView2.java     Tue Nov  5 04:12:31 2002
@@ -220,14 +220,14 @@
                centerX(vs), buoyCenterY, buoyRadius,
                centerX(vs) - dir * buoyRadius, buoyCenterY);
        }
-       public void buoy(int anchor, final Cell c, Cell connectedFrom) {
+       public void buoy(final int anchor, final Cell c, Cell connectedFrom) {
            Object key ; 
            if(dir > 0) 
                key = new Pair(connectedFrom, c);
            else
                key = new Pair(c, connectedFrom);
-           int actr = vs.translateCS(vs.unitSqCS(anchor, "AUSQ"), "TR12",
-                           .5f, .5f);
+           final int anchorUnit = vs.unitSqCS(anchor, "AUSQ"); 
+           int actr = vs.translateCS(anchorUnit, "TR12", .5f, .5f);
            int buoycs = floater.buoyCoordsys(actr, key);
 
            final int frameCS = vs.orthoBoxCS(buoycs, "frame", 0, 
@@ -244,6 +244,12 @@
                public void run() {
                    buoy_vc.setAccursed(c);
                    buoy_singlePlane.render(vs, frameCS, c2fCS);
+
+                   vs.map.put(filletState);
+                   int curs = coordinatePlaneView.getCursorBox();
+                   pa("Fillet curs: "+curs);
+                   vs.map.put(fillet, anchorUnit, vs.unitSqCS(curs, "AUSQ"));
+                   vs.map.put(postFilletState);
                }
            });
        }
@@ -258,6 +264,14 @@
 
     TextStyle style = GraphicsAPI.getInstance().getTextStyle("Sans", 0, 20);
     CellInBox cellview = new ImageCell(new TextCellContentView(style));
+
+    // public so can be replaced from jython
+    public Vob filletState = GLCache.getCallList(
+           "LineWidth 2\nColor 0 0 0\nDisable TEXTURE_2D");
+    public GLRen.SqFilletConnection fillet = GLRen.createSqFilletConnection(30,
+           1, .125f, 6);
+    public Vob postFilletState = GLCache.getCallList(
+           "LineWidth 2\nColor 0 0 0\nEnable TEXTURE_2D");
 
     public void render(VobScene vs, int intoCS, ViewContext context) {