[Gzz-commits] gzz gfx/libcoords/Coords.cxx gzz/modules/pp/PPC...

[Tuomas J. Lukka]

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

Modified files:
        gfx/libcoords  : Coords.cxx 
        gzz/modules/pp : PPCellView.java PPView2.java 
        gzz/view       : LinebrokenCellContentView.java 

Log message:
        PP fixes: baselining, pointinterpcoords inverse

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcoords/Coords.cxx.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPCellView.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LinebrokenCellContentView.java.diff?tr1=1.23&tr2=1.24&r1=text&r2=text

Patches:
Index: gzz/gfx/libcoords/Coords.cxx
diff -u gzz/gfx/libcoords/Coords.cxx:1.59 gzz/gfx/libcoords/Coords.cxx:1.60
--- gzz/gfx/libcoords/Coords.cxx:1.59   Fri Dec 20 11:00:21 2002
+++ gzz/gfx/libcoords/Coords.cxx        Tue Jan 14 08:36:06 2003
@@ -175,11 +175,6 @@
     float fract;
     PointInterpCoordSys(CoordSys *cs1, CoordSys *cs2, float fract)
            : cs1(cs1), cs2(cs2), fract(fract) { }
-    virtual CoordSys *createInverse() {
-       // XXX ARGH!
-       ownInverse = true;
-       return new RootCoords();
-    }
     virtual void setSuper(CoordSys **super) {
     }
     virtual void setParams(float *params) {
@@ -246,6 +241,14 @@
 
        glMultMatrixf(mat1);
        return true; 
+    }
+    CoordSys *createInverse() {
+       // Badly wrong
+       ownInverse = true;
+       return new PointInterpCoordSys(cs1->getInverse(), cs2->getInverse(), 
fract);
+       // if(canPerformGL()) {
+       // } else {
+       // }
     }
 };
 
Index: gzz/gzz/modules/pp/PPCellView.java
diff -u gzz/gzz/modules/pp/PPCellView.java:1.1 
gzz/gzz/modules/pp/PPCellView.java:1.2
--- gzz/gzz/modules/pp/PPCellView.java:1.1      Mon Jan 13 03:01:17 2003
+++ gzz/gzz/modules/pp/PPCellView.java  Tue Jan 14 08:36:06 2003
@@ -12,7 +12,7 @@
 public class PPCellView extends LinebrokenCellContentView {
 
     public PPCellView(TextStyle style, String widthString) {
-       super(style, widthString);
+       super(style, widthString, false);
     }
 
 
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.59 
gzz/gzz/modules/pp/PPView2.java:1.60
--- gzz/gzz/modules/pp/PPView2.java:1.59        Mon Jan 13 03:33:53 2003
+++ gzz/gzz/modules/pp/PPView2.java     Tue Jan 14 08:36:06 2003
@@ -36,7 +36,7 @@
 import java.util.*;
 
 public class PPView2 implements View {
-public static final String rcsid = "$Id: PPView2.java,v 1.59 2003/01/13 
08:33:53 mudyc Exp $";
+public static final String rcsid = "$Id: PPView2.java,v 1.60 2003/01/14 
13:36:06 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
@@ -304,7 +304,7 @@
                } 
                count *= 0.5;
            }
-           actr = vs.translateCS(actr, "SHIFT_"+connectedFrom, 0, count * 
1.8f);
+           actr = vs.translateCS(actr, "SHIFT_"+connectedFrom+" "+count, 0, 
count * 1.8f);
 
            int buoycs = floater.buoyCoordsys(actr, key);
 
Index: gzz/gzz/view/LinebrokenCellContentView.java
diff -u gzz/gzz/view/LinebrokenCellContentView.java:1.23 
gzz/gzz/view/LinebrokenCellContentView.java:1.24
--- gzz/gzz/view/LinebrokenCellContentView.java:1.23    Mon Jan 13 02:16:24 2003
+++ gzz/gzz/view/LinebrokenCellContentView.java Tue Jan 14 08:36:06 2003
@@ -40,7 +40,7 @@
  *  Doesn't scroll, currently.
  */
 public class LinebrokenCellContentView extends CellView {
-public static final String rcsid = "$Id: LinebrokenCellContentView.java,v 1.23 
2003/01/13 07:16:24 mudyc Exp $";
+public static final String rcsid = "$Id: LinebrokenCellContentView.java,v 1.24 
2003/01/14 13:36:06 tjl Exp $";
     public static boolean dbg = false;
     private static void p(String s) { if(dbg) pa(s); }
     private static void pa(String s) { System.err.println(s); }
@@ -55,6 +55,8 @@
 
     protected String widthString;
 
+    protected boolean baselined = true;
+
     public LinebrokenCellContentView(TextStyle style) {
        this(style, "XXXXXXXXXX");
     }
@@ -63,6 +65,10 @@
         this.style = style;
        this.widthString = widthString;
     }
+    public LinebrokenCellContentView(TextStyle style, String widthString, 
boolean baselined) {
+       this(style, widthString);
+       this.baselined = baselined;
+    }
 
     /** Get the height necessary to layout a range of text in a cell,
      *  at a given width and scale.
@@ -178,7 +184,7 @@
        s = s.substring(start, end);
 
        if(dbg) pa("addVobs: "+start+" "+end+" '"+s+"'");
-        TextVob vob = new TextVob(style, s, true, key, textColor);
+        TextVob vob = new TextVob(style, s, baselined, key, textColor);
         ch.addBox(vob);
     }
 }