[Gzz-commits] gzz doc/pegboard/1014/PEG_1014.rst gzz/media/im...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/10/11 09:35:02

Modified files:
        doc/pegboard/1014: PEG_1014.rst 
        gzz/media/impl : PageImageScroll.java 
        gzz/view       : CellVobFactory.java VobVanishingClient.java 
Added files:
        test/gzz/media : pagespan.py 
        test/gzz/media/impl: pageimagescroll.test 

Log message:
        Failing pagespan test

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1014/PEG_1014.rst.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/media/impl/PageImageScroll.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellVobFactory.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/VobVanishingClient.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/media/pagespan.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/media/impl/pageimagescroll.test?rev=1.1

Patches:
Index: gzz/doc/pegboard/1014/PEG_1014.rst
diff -c gzz/doc/pegboard/1014/PEG_1014.rst:1.1 
gzz/doc/pegboard/1014/PEG_1014.rst:1.2
*** gzz/doc/pegboard/1014/PEG_1014.rst:1.1      Thu Oct 10 05:35:13 2002
--- gzz/doc/pegboard/1014/PEG_1014.rst  Fri Oct 11 09:35:02 2002
***************
*** 3,23 ****
  =============================================================
  
  :Author:   Tuomas J. Lukka
! :Date:     $Date: 2002/10/10 09:35:13 $
! :Revision: $Revision: 1.1 $
  :Status:   Incomplete
  
  The previous PEGs on coordinate systems were a tad unclear
  on the overall goals - hopefully these new methods will
  clarify the picture.
  
! For example, if we have a parent coordinate system
! and a box coordinate system (not defined inside the parent),
  we can define a padded text coordinate system (i.e. one which
  has isotropic coordinates relative to the parent coordinate system)
  based only on these two coordinate systems::
  
!     def paddedText(parent, box):
        vs.
  
  Changes
--- 3,23 ----
  =============================================================
  
  :Author:   Tuomas J. Lukka
! :Date:     $Date: 2002/10/11 13:35:02 $
! :Revision: $Revision: 1.2 $
  :Status:   Incomplete
  
  The previous PEGs on coordinate systems were a tad unclear
  on the overall goals - hopefully these new methods will
  clarify the picture.
  
! For example, a box coordinate system and an aspect ratio
! coordinate system (a mapping from (0,w)x(0,1) to (0,1),(0,1))
  we can define a padded text coordinate system (i.e. one which
  has isotropic coordinates relative to the parent coordinate system)
  based only on these two coordinate systems::
  
!     def paddedText(box, aspectratio):
        vs.
  
  Changes
Index: gzz/gzz/media/impl/PageImageScroll.java
diff -c gzz/gzz/media/impl/PageImageScroll.java:1.11 
gzz/gzz/media/impl/PageImageScroll.java:1.12
*** gzz/gzz/media/impl/PageImageScroll.java:1.11        Fri Oct  4 02:54:11 2002
--- gzz/gzz/media/impl/PageImageScroll.java     Fri Oct 11 09:35:02 2002
***************
*** 38,44 ****
  
  public class PageImageScroll
         implements ScrollBlockManager.MediaserverScrollBlock {
! String rcsid = "$Id: PageImageScroll.java,v 1.11 2002/10/04 06:54:11 tjl Exp 
$";
      public static boolean dbg = true;
      final static void p(String s) { if(dbg) System.out.println(s); }
      final static void pa(String s) { System.out.println(s); }
--- 38,44 ----
  
  public class PageImageScroll
         implements ScrollBlockManager.MediaserverScrollBlock {
! String rcsid = "$Id: PageImageScroll.java,v 1.12 2002/10/11 13:35:02 tjl Exp 
$";
      public static boolean dbg = true;
      final static void p(String s) { if(dbg) System.out.println(s); }
      final static void pa(String s) { System.out.println(s); }
***************
*** 98,103 ****
--- 98,109 ----
            i++;
        pages = i;
        pa("Checked document of "+i+" pages");
+     }
+     /** DO NOT USE EXCEPT WHEN CREATING FAKE PAGESPANS
+      * FOR TESTS.
+      */
+     public void forcelengthKLUDGE(int len) {
+       pages = len;
      }
  
      public Span getCurrent() {
Index: gzz/gzz/view/CellVobFactory.java
diff -c gzz/gzz/view/CellVobFactory.java:1.20 
gzz/gzz/view/CellVobFactory.java:1.21
*** gzz/gzz/view/CellVobFactory.java:1.20       Sat Oct  5 09:59:47 2002
--- gzz/gzz/view/CellVobFactory.java    Fri Oct 11 09:35:02 2002
***************
*** 46,52 ****
   */
  
  public class CellVobFactory implements CellView {
! public static final String rcsid = "$Id: CellVobFactory.java,v 1.20 
2002/10/05 13:59:47 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 implements CellView {
! public static final String rcsid = "$Id: CellVobFactory.java,v 1.21 
2002/10/11 13:35:02 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); }
***************
*** 129,135 ****
       * system of the given vobscene.
       * @param c The cell
       * @param v The vobscene to add to
!      * @param cs The coordinate system index
       */
      public void place(final Cell c, final VobScene v, final int cs,
                        final float w, final float h,
--- 129,138 ----
       * system of the given vobscene.
       * @param c The cell
       * @param v The vobscene to add to
!      * @param cs The coordinate system index.
!      * @param w The w
!      * @param h The w
!      *                        when mapped .
       */
      public void place(final Cell c, final VobScene v, final int cs,
                        final float w, final float h,
Index: gzz/gzz/view/VobVanishingClient.java
diff -c gzz/gzz/view/VobVanishingClient.java:1.14 
gzz/gzz/view/VobVanishingClient.java:1.15
*** gzz/gzz/view/VobVanishingClient.java:1.14   Thu Oct 10 05:29:51 2002
--- gzz/gzz/view/VobVanishingClient.java        Fri Oct 11 09:35:02 2002
***************
*** 167,173 ****
      public void place(Cell c, Object o, float fract, int x0, int y0, int x1, 
int y1,
                int depth, float rot) {
        Vob v = (Vob)o;
!       int cs = into.coordsys(intoCS, c, depth, x0, y0, 2, 2);
        cvf.place(c, into, cs, (x1-x0), (y1-y0), context, fract);
      }
  
--- 167,173 ----
      public void place(Cell c, Object o, float fract, int x0, int y0, int x1, 
int y1,
                int depth, float rot) {
        Vob v = (Vob)o;
!       int cs = into.coordsys(intoCS, c, depth, x0, y0, (x1-x0), (y1-y0));
        cvf.place(c, into, cs, (x1-x0), (y1-y0), context, fract);
      }