[Gzz-commits] gzz gzz/gfx/gl/GLVobCoorder.java gzz/view/TextC...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/09/14 10:07:01

Modified files:
        gzz/gfx/gl     : GLVobCoorder.java 
        gzz/view       : TextCellContentView.java 
Removed files:
        gfx/demo/nic   : textinterp.py 

Log message:
        argl. fix text interpolation bug

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLVobCoorder.java.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/TextCellContentView.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gzz/gzz/gfx/gl/GLVobCoorder.java
diff -c gzz/gzz/gfx/gl/GLVobCoorder.java:1.24 
gzz/gzz/gfx/gl/GLVobCoorder.java:1.25
*** gzz/gzz/gfx/gl/GLVobCoorder.java:1.24       Mon Sep  9 09:48:16 2002
--- gzz/gzz/gfx/gl/GLVobCoorder.java    Sat Sep 14 10:07:01 2002
***************
*** 29,35 ****
  import gzz.client.gl.*;
  
  public class GLVobCoorder extends AffineVobCoorder {
! public static final String rcsid = "$Id: GLVobCoorder.java,v 1.24 2002/09/09 
13:48:16 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 29,35 ----
  import gzz.client.gl.*;
  
  public class GLVobCoorder extends AffineVobCoorder {
! public static final String rcsid = "$Id: GLVobCoorder.java,v 1.25 2002/09/14 
14:07:01 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 95,101 ****
--- 95,106 ----
                    cx+" "+cy+" "+x_x+" "+x_y+" "+y_x+" "+y_y);
  
            // a REAL kludge
+           if(dbg) pa("Passed key: "+key);
            key = new Integer(key.hashCode() % 27482963 * 427189 + 
(keys[into]!=null?keys[into].hashCode() : 89761));
+           if(dbg) {
+               pa("Old key: "+keys[into]);
+               pa("New key: "+key);
+           }
        }
        coordsys[ncoordsys]     = cx;
        coordsys[ncoordsys + 1] = cy;
Index: gzz/gzz/view/TextCellContentView.java
diff -c gzz/gzz/view/TextCellContentView.java:1.8 
gzz/gzz/view/TextCellContentView.java:1.9
*** gzz/gzz/view/TextCellContentView.java:1.8   Fri Sep 13 07:05:17 2002
--- gzz/gzz/view/TextCellContentView.java       Sat Sep 14 10:07:01 2002
***************
*** 37,43 ****
   */
  
  public class TextCellContentView implements CellContentView {
! public static final String rcsid = "$Id: TextCellContentView.java,v 1.8 
2002/09/13 11:05:17 benja 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); }
--- 37,43 ----
   */
  
  public class TextCellContentView implements CellContentView {
! public static final String rcsid = "$Id: TextCellContentView.java,v 1.9 
2002/09/14 14:07:01 benja 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); }
***************
*** 45,51 ****
      TextStyle style;
  
      private static Object KEY[] = new Object[20];
!     static { for(int i=0; i<KEY.length; i++) KEY[i] = new Integer(i); }
  
      public TextCellContentView(TextStyle style) {
          this.style = style;
--- 45,51 ----
      TextStyle style;
  
      private static Object KEY[] = new Object[20];
!     static { for(int i=0; i<KEY.length; i++) KEY[i] = new Integer(i+1); }
  
      public TextCellContentView(TextStyle style) {
          this.style = style;
***************
*** 86,92 ****
          else if(right < middle) skew = (- width + box.width);
          else skew = (- left + middle);
  
!         Object key = (line < KEY.length) ? KEY[line] : new Integer(line);
          int skewedcs =
              v.coords.coordsys(cs, key, 0, skew, 0, width, box.height);
  
--- 86,92 ----
          else if(right < middle) skew = (- width + box.width);
          else skew = (- left + middle);
  
!         Object key = (line < KEY.length) ? KEY[line] : new Integer(line+1);
          int skewedcs =
              v.coords.coordsys(cs, key, 0, skew, 0, width, box.height);