[Gzz-commits] gzz/gzz view/CellVobFactory.java vob/SimpleConn...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/09/18 08:04:46

Modified files:
        gzz/view       : CellVobFactory.java 
        gzz/vob        : SimpleConnection.java 
Added files:
        gzz/view       : LinebrokenCellContentView.java 

Log message:
        Linebroken cell content view for Tuomas to look at

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LinebrokenCellContentView.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellVobFactory.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/SimpleConnection.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gzz/view/CellVobFactory.java
diff -c gzz/gzz/view/CellVobFactory.java:1.5 
gzz/gzz/view/CellVobFactory.java:1.6
*** gzz/gzz/view/CellVobFactory.java:1.5        Fri Sep 13 08:20:18 2002
--- gzz/gzz/view/CellVobFactory.java    Wed Sep 18 08:04:46 2002
***************
*** 46,52 ****
   */
  
  public class CellVobFactory {
! public static final String rcsid = "$Id: CellVobFactory.java,v 1.5 2002/09/13 
12:20:18 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); }
--- 46,52 ----
   */
  
  public class CellVobFactory {
! public static final String rcsid = "$Id: CellVobFactory.java,v 1.6 2002/09/18 
12:04:46 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); }
***************
*** 55,62 ****
      static TextStyle style =
        GraphicsAPI.getInstance().getTextStyle("SansSerif", Font.PLAIN, 10);
  
!     CellContentView ccv = new TextCellContentView(style);
      //CellContentView ccv = new SpanCellContentView(style);
  
      Dim d_clone;
      /*
--- 55,63 ----
      static TextStyle style =
        GraphicsAPI.getInstance().getTextStyle("SansSerif", Font.PLAIN, 10);
  
!     //CellContentView ccv = new TextCellContentView(style);
      //CellContentView ccv = new SpanCellContentView(style);
+     CellContentView ccv = new LinebrokenCellContentView(style);
  
      Dim d_clone;
      /*
Index: gzz/gzz/vob/SimpleConnection.java
diff -c gzz/gzz/vob/SimpleConnection.java:1.1 
gzz/gzz/vob/SimpleConnection.java:1.2
*** gzz/gzz/vob/SimpleConnection.java:1.1       Mon Jul 15 11:51:08 2002
--- gzz/gzz/vob/SimpleConnection.java   Wed Sep 18 08:04:46 2002
***************
*** 9,15 ****
   *    at your choice, any later version. Alternatively, you may use and
   *    distribute under the terms of the XPL.
   *
!  *    See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of 
   *    the licenses.
   *
   *    This software is distributed in the hope that it will be useful,
--- 9,15 ----
   *    at your choice, any later version. Alternatively, you may use and
   *    distribute under the terms of the XPL.
   *
!  *    See the LICENSE.lgpl and LICENSE.xpl files for the specific terms of
   *    the licenses.
   *
   *    This software is distributed in the hope that it will be useful,
***************
*** 22,34 ****
   * Written by Benja Fallenstein
   */
  package gzz.vob;
  import java.awt.*;
  
  /** A plain line drawn between two coordinate sets.
   */
  
  public class SimpleConnection extends Vob {
! public static final String rcsid = "$Id: SimpleConnection.java,v 1.1 
2002/07/15 15:51:08 benja Exp $";
  
      float x0, y0, x1, y1;
      Color color;
--- 22,36 ----
   * Written by Benja Fallenstein
   */
  package gzz.vob;
+ import gzz.gfx.gl.GZZGL;
+ import gzz.client.*;
  import java.awt.*;
  
  /** A plain line drawn between two coordinate sets.
   */
  
  public class SimpleConnection extends Vob {
! public static final String rcsid = "$Id: SimpleConnection.java,v 1.2 
2002/09/18 12:04:46 benja Exp $";
  
      float x0, y0, x1, y1;
      Color color;
***************
*** 69,74 ****
--- 71,85 ----
        g.drawLine(pt0.x, pt0.y, pt1.x, pt1.y);
      }
  
+     static Vob line;
+     public int addToListGL(GraphicsAPI.Window win,
+                       int[] list, int curs, int coordsys1,
+                               int coordsys2) {
+       if(line == null)
+             line = GZZGL.createLineConnector(1, 1);
+         curs = line.addToListGL(win, list, curs, coordsys1, coordsys2);
+       return curs;
+     }
  }