[Gzz-commits] gzz gzz/slices/YAMLVersionFormatter.py test/gzz...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/10/11 10:00:36

Modified files:
        gzz/slices     : YAMLVersionFormatter.py 
        test/gzz/impl  : saving.test 

Log message:
        Fix the pagespan saving bug

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/slices/YAMLVersionFormatter.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/impl/saving.test.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gzz/gzz/slices/YAMLVersionFormatter.py
diff -c gzz/gzz/slices/YAMLVersionFormatter.py:1.8 
gzz/gzz/slices/YAMLVersionFormatter.py:1.9
*** gzz/gzz/slices/YAMLVersionFormatter.py:1.8  Wed Oct  2 13:29:17 2002
--- gzz/gzz/slices/YAMLVersionFormatter.py      Fri Oct 11 10:00:36 2002
***************
*** 219,225 ****
          pt = span.getLocation()
        size = span.getSize()
        return '[PageSpan, "%s", %s, %s, %s, %s, %s, %s]' % \
!              (id, span.offset(), span.length(),
                    pt.x, pt.y, size.width, size.height)
  
      elif isinstance(span, ImageSpan):
--- 219,225 ----
          pt = span.getLocation()
        size = span.getSize()
        return '[PageSpan, "%s", %s, %s, %s, %s, %s, %s]' % \
!              (id, span.offset(), span.offset() + span.length(),
                    pt.x, pt.y, size.width, size.height)
  
      elif isinstance(span, ImageSpan):
Index: gzz/test/gzz/impl/saving.test
diff -c gzz/test/gzz/impl/saving.test:1.8 gzz/test/gzz/impl/saving.test:1.9
*** gzz/test/gzz/impl/saving.test:1.8   Tue Oct  1 13:40:36 2002
--- gzz/test/gzz/impl/saving.test       Fri Oct 11 10:00:36 2002
***************
*** 124,139 ****
      c = space.N()
      empty = space.getCellTexter().getEnfilade(c, None)
      scr = ScrollBlockManager.getScrollBlock(serv, id)
          
!     space.getCellTexter().setEnfilade(c, empty.plus(scr.getCurrent()))
      
      save(space)
      s2 = load()
      
      c2 = s2.getCell(c.getId())
      
      assert s2.getCellTexter().getEnfilade(c2, None) == \
             space.getCellTexter().getEnfilade(c, None)
             
      save(s2)
!     s3 = load()
\ No newline at end of file
--- 124,144 ----
      c = space.N()
      empty = space.getCellTexter().getEnfilade(c, None)
      scr = ScrollBlockManager.getScrollBlock(serv, id)
+     scr.forcelengthKLUDGE(17);
          
!     space.getCellTexter().setEnfilade(c, empty.plus(scr.getCurrent()).plus(
!                                   scr.getCurrent().subArea(5,9,7,7,23,23)))
      
      save(space)
      s2 = load()
      
      c2 = s2.getCell(c.getId())
      
+     print s2.getCellTexter().getEnfilade(c2, None)
+     print space.getCellTexter().getEnfilade(c, None)
+     
      assert s2.getCellTexter().getEnfilade(c2, None) == \
             space.getCellTexter().getEnfilade(c, None)
             
      save(s2)
!     s3 = load()