[ff-cvs] fenfire/org/fenfire fenpdf/appearance/papers.py...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/25 06:52:13

Modified files:
        org/fenfire/fenpdf/appearance: papers.py views.py 
        org/fenfire/spanimages/gl: SingleImage.java 

Log message:
        Fix paper texture reloading: don't throw away PageScrollBlockImager 
when redoing views.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/papers.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/views.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/SingleImage.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/fenpdf/appearance/papers.py
diff -u fenfire/org/fenfire/fenpdf/appearance/papers.py:1.3 
fenfire/org/fenfire/fenpdf/appearance/papers.py:1.4
--- fenfire/org/fenfire/fenpdf/appearance/papers.py:1.3 Mon Aug 25 05:32:17 2003
+++ fenfire/org/fenfire/fenpdf/appearance/papers.py     Mon Aug 25 06:52:12 2003
@@ -4,7 +4,7 @@
 import vob
 from org import fenfire as ff
 
-dbg = 1
+dbg = 0
 
 def p(*s):
     print 'ff.fenpdf.appearance.papers::', s
@@ -25,6 +25,11 @@
        self.fancyPaperMakerIndex = 0
        self.whitePaperMakerIndex = 0
 
+       # ScrollBlockImagers do not change -
+       # they also cache the textures, better
+       # keep them here.
+       self.scrollBlockImager = ff.spanimages.gl.PageScrollBlockImager()
+
        self.update()
 
     def toggleBg(self, useBg = -1):
@@ -53,14 +58,19 @@
        self.fenPDF.views.update()
 
     def update(self):
-       self.spanImageFactory = ff.spanimages.gl.DefaultSpanImageFactory(
-           ff.spanimages.gl.PageScrollBlockImager())
+       self.spanImageFactory = \
+          ff.spanimages.gl.DefaultSpanImageFactory(
+               self.scrollBlockImager)
        if self.useBg:
-           paperMaker = ff.spanimages.gl.papermakers.fancyPaperMakers[
-               self.fancyPaperMakerIndex][0]()
+           makerEntry = ff.spanimages.gl.papermakers\
+                       .fancyPaperMakers[
+                               self.fancyPaperMakerIndex]
        else:
-           paperMaker = ff.spanimages.gl.papermakers.whitePaperMakers[
-               self.whitePaperMakerIndex][0]()
+           paperMaker = ff.spanimages.gl.papermakers\
+                       .whitePaperMakers[
+                           self.whitePaperMakerIndex]
+       p("Set paper maker: ", makerEntry)
+       paperMaker = makerEntry[0]()
        if dbg: print "Maker:", paperMaker
 
        self.spanImageFactory.paperMaker = paperMaker
Index: fenfire/org/fenfire/fenpdf/appearance/views.py
diff -u fenfire/org/fenfire/fenpdf/appearance/views.py:1.13 
fenfire/org/fenfire/fenpdf/appearance/views.py:1.14
--- fenfire/org/fenfire/fenpdf/appearance/views.py:1.13 Mon Aug 25 05:59:10 2003
+++ fenfire/org/fenfire/fenpdf/appearance/views.py      Mon Aug 25 06:52:12 2003
@@ -6,6 +6,8 @@
 from org import fenfire as ff
 from org.fenfire.vocab import RDF, CANVAS2D, TREETIME
 
+dbg = 0
+
 class Views:
     """Encapsulate the creation of the immutable views and connectors used in 
FenPDF.
 
@@ -103,11 +105,13 @@
            old2 = self.buoyManager.singles[1].mainNode
            mainNode = self.createMainNode(old.getPlane())
            mainNode2 = self.createMainNode(old2.getPlane())
-           print "FOCI: ",old.getFocus(), old2.getFocus(), \
+           if dbg:
+               print "FOCI: ",old.getFocus(), old2.getFocus(), \
                            mainNode.getFocus(), mainNode2.getFocus()
            mainNode.setFocus(old.getFocus())
            mainNode2.setFocus(old2.getFocus())
-           print "FOCI: ",old.getFocus(), old2.getFocus(), \
+           if dbg:
+               print "FOCI: ",old.getFocus(), old2.getFocus(), \
                            mainNode.getFocus(), mainNode2.getFocus()
        else:
            # Start fresh from home
Index: fenfire/org/fenfire/spanimages/gl/SingleImage.java
diff -u fenfire/org/fenfire/spanimages/gl/SingleImage.java:1.11 
fenfire/org/fenfire/spanimages/gl/SingleImage.java:1.12
--- fenfire/org/fenfire/spanimages/gl/SingleImage.java:1.11     Mon Aug 18 
05:46:28 2003
+++ fenfire/org/fenfire/spanimages/gl/SingleImage.java  Mon Aug 25 06:52:13 2003
@@ -106,6 +106,13 @@
        this.missingPixels = new double[this.loader.getNLevels()];
     }
 
+    public void finalize() {
+       if(dbg) p("Finalize single image: "+scrollBlock+" "+page+" "
+                   +" "+xresolution+" "+yresolution);
+
+
+    }
+
     /** Read the data from the texaccum and add to 
      * missingPixels.
      */