[Gzz-commits] gzz/gzz/modules/pp ImageCell.java PPActionsImpl...

[Tuomas J. Lukka]

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

Modified files:
        gzz/modules/pp : ImageCell.java PPActionsImpl.java PPView2.java 
                         demotest.py 
        gzz/modules/pp/vob: CalendarBg.java 

Log message:
        Almost ready -- but no time any more.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/ImageCell.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPActionsImpl.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/CalendarBg.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp/ImageCell.java
diff -u gzz/gzz/modules/pp/ImageCell.java:1.1 
gzz/gzz/modules/pp/ImageCell.java:1.2
--- gzz/gzz/modules/pp/ImageCell.java:1.1       Tue Nov  5 03:55:33 2002
+++ gzz/gzz/modules/pp/ImageCell.java   Tue Nov  5 04:52:14 2002
@@ -55,7 +55,7 @@
        double y1 = im.t.getTexCoord(1, 1);
 
        im.v = GLCache.getCallListCoorded(
-           "PushAttrib ENABLE_BIT TEXTURE_BIT COLOR_BUFFER_BIT\n"+
+           "PushAttrib ENABLE_BIT TEXTURE_BIT COLOR_BUFFER_BIT CURRENT_BIT\n"+
            "Enable TEXTURE_2D\n"+
            "BindTexture TEXTURE_2D "+im.t.getTexId()+"\n"+
            "Disable BLEND\n"+
Index: gzz/gzz/modules/pp/PPActionsImpl.java
diff -u gzz/gzz/modules/pp/PPActionsImpl.java:1.7 
gzz/gzz/modules/pp/PPActionsImpl.java:1.8
--- gzz/gzz/modules/pp/PPActionsImpl.java:1.7   Sun Oct 20 07:45:58 2002
+++ gzz/gzz/modules/pp/PPActionsImpl.java       Tue Nov  5 04:52:14 2002
@@ -58,7 +58,7 @@
     //
     public String newPaper()
                    throws RemoteException { synchronized(space) {
-       Cell n = center.N(d.d1);
+       Cell n = center.h(d.d1, 1).N(d.d1);
        n.setText("Uusi paperi");
        return n.getId();
     }}
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.15 
gzz/gzz/modules/pp/PPView2.java:1.16
--- gzz/gzz/modules/pp/PPView2.java:1.15        Tue Nov  5 04:12:31 2002
+++ gzz/gzz/modules/pp/PPView2.java     Tue Nov  5 04:52:14 2002
@@ -17,6 +17,8 @@
     public static boolean dbg = true;
     private static void pa(String s) { System.err.println(s); }
 
+    public static Object NEWPAPERKEY = new Object();
+
     // Geometry
 
     /** The width of the main view.
@@ -27,6 +29,19 @@
      */
     public float leftPanelWidth = 100;
 
+    /** The height of the entries in the left edge panel.
+     */
+    public float leftPanelObjectHeight = 100;
+
+    /** The "over-size" of the entries in the left panel
+     */
+    public float leftPanelRealHeight = 170,
+               leftPanelRealWidth = 230;
+
+    /** The zoom in the left panel
+     */
+    public float leftPanelZoom = .8f;
+
     /** The height of the main view.
      */
     public float mainHeight = 600;
@@ -345,7 +360,32 @@
                    plane = plane.s(d.d1);
                }
            }
+       } else {
+           // the left panel
+           Cell p = main_vc.getAccursed().h(d.contains).h(d.d1).s(d.d1);
+           float x = 0.5f * leftPanelWidth;
+           for(float y = 1.5f*leftPanelObjectHeight; p != null; 
+                           y += leftPanelObjectHeight) {
+               int ctr = ((GLVobCoorder)vs.coords).affineCoordsys(0, 0,
+                           x, y, 1, 0, 0, 1);
+               vs.matcher.add(ctr, new Pair(p, null));
+
+               int fr = vs.orthoBoxCS(ctr, "frame", 10, 
+                       -leftPanelRealWidth/2, -leftPanelRealHeight/2,
+                       1, 1, leftPanelRealWidth, leftPanelRealHeight);
+               vs.activate(fr);
+
+               int c2f = vs.coords.ortho(0, 0, 0, 0, 
+                           leftPanelZoom, leftPanelZoom);
+               vs.matcher.addSub(ctr, c2f, "C2F");
+
+               buoy_vc.setAccursed(p);
+               buoy_singlePlane.render(vs, fr, c2f);
+               p = p.s(d.d1);
+           }
        }
+       
+       
     }
 
     int curlinkY = 0;
Index: gzz/gzz/modules/pp/demotest.py
diff -u gzz/gzz/modules/pp/demotest.py:1.20 gzz/gzz/modules/pp/demotest.py:1.21
--- gzz/gzz/modules/pp/demotest.py:1.20 Tue Nov  5 03:55:33 2002
+++ gzz/gzz/modules/pp/demotest.py      Tue Nov  5 04:52:14 2002
@@ -32,16 +32,16 @@
 
 n1 = ppactions.newNote(id, 100, 100, "WIgdqp")
 n1_2 = ppactions.newNote(id, 100, 200, "Foog")
-n1_3 = ppactions.newNote(id, 0, 0, "Abksefvu21249")
+n1_3 = ppactions.newNote(id, 0, 0, "KOTI")
 
 np = ppactions.newPaper()
-n2 = ppactions.newNote(np, 100, 50, "lijesf")
+n2 = ppactions.newNote(np, 100, 50, "VALOKUVAT")
 n2 = ppactions.newNote(np, 100, 100, "IMG:/BIG/0000_022.jpg")
 ppactions.assocNotes(n1_2, 1, n2)
 
 np = ppactions.newPaper()
 space.getCell(np).N(d.bgtype)
-n2 = ppactions.newNote(np, 50, 50, "blah")
+n2 = ppactions.newNote(np, 0, 0, "KALENTERI")
 n3 = ppactions.newNote(np, 150, 250, "oijgsg")
 
 ppactions.assocNotes(n1, 1, n2)
Index: gzz/gzz/modules/pp/vob/CalendarBg.java
diff -u gzz/gzz/modules/pp/vob/CalendarBg.java:1.1 
gzz/gzz/modules/pp/vob/CalendarBg.java:1.2
--- gzz/gzz/modules/pp/vob/CalendarBg.java:1.1  Tue Nov  5 03:21:01 2002
+++ gzz/gzz/modules/pp/vob/CalendarBg.java      Tue Nov  5 04:52:14 2002
@@ -32,14 +32,14 @@
 import java.util.*;
 
 public class CalendarBg {
-public static final String rcsid = "$Id: CalendarBg.java,v 1.1 2002/11/05 
08:21:01 tjl Exp $";
+public static final String rcsid = "$Id: CalendarBg.java,v 1.2 2002/11/05 
09:52:14 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
     static gzz.vob.vobs.CalendarVob[] vobs = new gzz.vob.vobs.CalendarVob[14];
     static public void init() {
        TextStyle style_date = GraphicsAPI.getInstance().getTextStyle("serif", 
0, 14);
        TextStyle style_n = GraphicsAPI.getInstance().getTextStyle("serif", 0, 
14);
-       gzz.vob.vobs.CalendarVob.setStatics(style_date, style_n, 0.03f);
+       gzz.vob.vobs.CalendarVob.setStatics(style_date, style_n, 0.02f);
 
        gzz.vob.vobs.CalendarVob.setBounds(0.37f, 0.5f, 1.0f);
        gzz.vob.vobs.CalendarVob.setScales(1.4f, 0.5f, 0.34f, 1.4f);