[Gzz-commits] gzz/gzz/view TextCellContentView.java VobVanish...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/09/28 05:14:17

Modified files:
        gzz/view       : TextCellContentView.java 
                         VobVanishingClient.java 

Log message:
        Give cells' TextVobs a second coordsys-- now just need to make use of it

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/TextCellContentView.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/VobVanishingClient.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gzz/gzz/view/TextCellContentView.java
diff -c gzz/gzz/view/TextCellContentView.java:1.11 
gzz/gzz/view/TextCellContentView.java:1.12
*** gzz/gzz/view/TextCellContentView.java:1.11  Fri Sep 27 05:07:56 2002
--- gzz/gzz/view/TextCellContentView.java       Sat Sep 28 05:14:17 2002
***************
*** 37,43 ****
   */
  
  public class TextCellContentView implements CellContentView {
! public static final String rcsid = "$Id: TextCellContentView.java,v 1.11 
2002/09/27 09:07:56 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); }
--- 37,43 ----
   */
  
  public class TextCellContentView implements CellContentView {
! public static final String rcsid = "$Id: TextCellContentView.java,v 1.12 
2002/09/28 09:14: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); }
***************
*** 88,102 ****
          Object key = (line < KEY.length) ? KEY[line] : new Integer(line+1);
          // int skewedcs = v.coordsys(cs, key, 0, skew, 0, w, box.height);
  
!         placeVob(c, v, cs_box, brBefore, brAfter, offs, context, scale);
      }
  
!     protected void placeVob(Cell c, VobScene v, int cs, int start, int end,
                              int offs, ViewContext context, float scale) {
          TextVob vob = new TextVob(style, scale, c.t().substring(start, end));
!         v.map.put(vob, cs);
  
          if(offs >= 0)
!             v.map.put(new TextCursorVob(vob, offs), cs);
      }
  }
--- 88,102 ----
          Object key = (line < KEY.length) ? KEY[line] : new Integer(line+1);
          // int skewedcs = v.coordsys(cs, key, 0, skew, 0, w, box.height);
  
!         placeVob(c, v, cs_out, cs_box, brBefore, brAfter, offs, context, 
scale);
      }
  
!     protected void placeVob(Cell c, VobScene v, int cs_out, int cs_box, int 
start, int end,
                              int offs, ViewContext context, float scale) {
          TextVob vob = new TextVob(style, scale, c.t().substring(start, end));
!         v.map.put(vob, cs_box, cs_out);
  
          if(offs >= 0)
!             v.map.put(new TextCursorVob(vob, offs), cs_box);
      }
  }
Index: gzz/gzz/view/VobVanishingClient.java
diff -c gzz/gzz/view/VobVanishingClient.java:1.9 
gzz/gzz/view/VobVanishingClient.java:1.10
*** gzz/gzz/view/VobVanishingClient.java:1.9    Fri Sep 27 05:07:56 2002
--- gzz/gzz/view/VobVanishingClient.java        Sat Sep 28 05:14:17 2002
***************
*** 165,174 ****
                int depth, float rot) {
        Vob v = (Vob)o;
        int cs = into.coordsys(intoCS, c, depth, x0, y0, x1-x0, y1-y0);
!       if(v != null) ((CellVobFactory)cvf).addCellVobs(c, into, 
!                   intoCS, cs, 
                (x0+x1)/2, (y0+y1)/2, (x1-x0)/2, (y1-y0)/2, v, context, fract);
!       cvf.place(c, into, intoCS, cs, 
            (x0+x1)/2, (y0+y1)/2, (x1-x0)/2, (y1-y0)/2, context, fract);
      }
  
--- 165,174 ----
                int depth, float rot) {
        Vob v = (Vob)o;
        int cs = into.coordsys(intoCS, c, depth, x0, y0, x1-x0, y1-y0);
!       if(v != null) ((CellVobFactory)cvf).addCellVobs(c, into,
!                   intoCS, cs,
                (x0+x1)/2, (y0+y1)/2, (x1-x0)/2, (y1-y0)/2, v, context, fract);
!       cvf.place(c, into, intoCS, cs,
            (x0+x1)/2, (y0+y1)/2, (x1-x0)/2, (y1-y0)/2, context, fract);
      }