[ff-cvs] fenfire/org/fenfire/fenpdf fenpdfcontext.py act...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/25 20:34:29

Modified files:
        org/fenfire/fenpdf: fenpdfcontext.py 
        org/fenfire/fenpdf/actions: keyboard.py 
        org/fenfire/fenpdf/appearance: papers.py views.py 

Log message:
        cleaning + fix me msg

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdfcontext.py.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/actions/keyboard.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/papers.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/views.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/fenpdf/actions/keyboard.py
diff -u fenfire/org/fenfire/fenpdf/actions/keyboard.py:1.9 
fenfire/org/fenfire/fenpdf/actions/keyboard.py:1.10
--- fenfire/org/fenfire/fenpdf/actions/keyboard.py:1.9  Mon Aug 25 05:28:51 2003
+++ fenfire/org/fenfire/fenpdf/actions/keyboard.py      Mon Aug 25 20:34:28 2003
@@ -140,6 +140,7 @@
 
     def exit(self):
        # Harsh
+        import java
        java.lang.System.exit(43)
 
     def toggleZoomToSingle(self, main):
Index: fenfire/org/fenfire/fenpdf/appearance/papers.py
diff -u fenfire/org/fenfire/fenpdf/appearance/papers.py:1.4 
fenfire/org/fenfire/fenpdf/appearance/papers.py:1.5
--- fenfire/org/fenfire/fenpdf/appearance/papers.py:1.4 Mon Aug 25 06:52:12 2003
+++ fenfire/org/fenfire/fenpdf/appearance/papers.py     Mon Aug 25 20:34:29 2003
@@ -70,10 +70,14 @@
                        .whitePaperMakers[
                            self.whitePaperMakerIndex]
        p("Set paper maker: ", makerEntry)
-       paperMaker = makerEntry[0]()
-       if dbg: print "Maker:", paperMaker
 
-       self.spanImageFactory.paperMaker = paperMaker
+        if 0:
+            paperMaker = makerEntry[0]()
+            if dbg: print "Maker:", paperMaker
+
+            self.spanImageFactory.paperMaker = paperMaker
+        else:
+            raise 'FIX ME! this didn\'t work in mudyc\'s cvs tree.'
 
     def getSpanImageFactory(self):
        return self.spanImageFactory
Index: fenfire/org/fenfire/fenpdf/appearance/views.py
diff -u fenfire/org/fenfire/fenpdf/appearance/views.py:1.15 
fenfire/org/fenfire/fenpdf/appearance/views.py:1.16
--- fenfire/org/fenfire/fenpdf/appearance/views.py:1.15 Mon Aug 25 17:18:56 2003
+++ fenfire/org/fenfire/fenpdf/appearance/views.py      Mon Aug 25 20:34:29 2003
@@ -8,6 +8,9 @@
 
 dbg = 0
 
+def p(*s):
+    print 'appearance.views.py:: ',s
+
 class Views:
     """Encapsulate the creation of the immutable views and connectors used in 
FenPDF.
 
@@ -106,13 +109,13 @@
            mainNode = self.createMainNode(old.getPlane())
            mainNode2 = self.createMainNode(old2.getPlane())
            if dbg:
-               print "FOCI: ",old.getFocus(), old2.getFocus(), \
-                           mainNode.getFocus(), mainNode2.getFocus()
+               p("FOCI: ",old.getFocus(), old2.getFocus(), \
+                           mainNode.getFocus(), mainNode2.getFocus())
            mainNode.setFocus(old.getFocus())
            mainNode2.setFocus(old2.getFocus())
            if dbg:
-               print "FOCI: ",old.getFocus(), old2.getFocus(), \
-                           mainNode.getFocus(), mainNode2.getFocus()
+               p("FOCI: ",old.getFocus(), old2.getFocus(), \
+                           mainNode.getFocus(), mainNode2.getFocus())
        else:
            # Start fresh from home
            mainNode = self.createMainNode(self.home)
@@ -156,6 +159,7 @@
            
 
        if self.fenPDF.animation.reuseVs:
+            p('reuse vobscene')
            return self.fenPDF.animation.lastVs
 
        self.background.placeBackDrop(vs)
Index: fenfire/org/fenfire/fenpdf/fenpdfcontext.py
diff -u fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.28 
fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.29
--- fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.28    Mon Aug 25 17:26:21 2003
+++ fenfire/org/fenfire/fenpdf/fenpdfcontext.py Mon Aug 25 20:34:28 2003
@@ -96,6 +96,7 @@
                 self.pageview = None
         self.view2d = Views()
 
+        self.fenPDF = None
 
     def clean(self):
        pass
@@ -118,10 +119,11 @@
     def mainNodeToBeRender(self, vs, into, mainNode):
        self.selection = ff.util.lava.view.getView(mainNode, 
ff.view.AreaSelectingView2D)
 
-        if mainNode != self.states.buoymanager.getLastMain(): return
+        buoymanager = self.states.fenPDF.views.getBuoyManager()
+        if mainNode != buoymanager.getLastMain(): return
 
         # draw cursor
-        mainNode = self.states.buoymanager.getLastMain()
+        mainNode = buoymanager.getLastMain()
         canvas = ff.util.lava.view.getView(mainNode, ff.view.CanvasView2D)
         if not isinstance(canvas, ff.view.CanvasView2D): return