[Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py view/double...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/11 14:52:26

Modified files:
        org/fenfire/bin: fenpdf10.py 
Added files:
        org/fenfire/view: doublegeometer.py fenpdfgeometry.py 

Log message:
        Broken change - something wrong with laptop, need to move to desktop. 
Lots of restructuring - Geometer should NOT take care of all events\!\!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/doublegeometer.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/fenpdfgeometry.py?rev=1.1

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.15 
fenfire/org/fenfire/bin/fenpdf10.py:1.16
--- fenfire/org/fenfire/bin/fenpdf10.py:1.15    Mon Aug 11 08:12:19 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Mon Aug 11 14:52:26 2003
@@ -25,7 +25,7 @@
 dbg = 0
 
 def p(*s):
-    print 'fenfire.bin.fenpdf1.0::',s
+    print 'fenfire.bin.fenpdf10::',s
 
 import sys
 import jarray
@@ -187,8 +187,6 @@
 
     ppAct.assocNotes(noteHome, 1, noteA1)
 
-
-if not do_load_graph:
     #sc2 = myalph.addFile(java.io.File('testdata/paper.pdf'), 
'application/pdf')
 
     #noteH1 = Nodes.get(ppAct.newNote(paperHome, 200, 150, ''))
@@ -315,74 +313,14 @@
 ttconnector.pageImageScrollNodeType = tconnector.pageImageScrollNodeType
 
 
-# connectors = [ppconnector, tconnector, ttconnector]
-connectors = [ppconnector, tconnector]
+connectors = [ppconnector, tconnector, ttconnector]
+# connectors = [ppconnector, tconnector]
 
-class DoubleGeometer:
-    def __init__(self, mgr, context, nodeview):
-       self.split = .5
-       self.height = 100
-       self.width = 100
+class EventHandler:
+    def __init__(self, mgr, context)
         self.mgr = mgr
         self.context = context
         self.context.setMngr(mgr)
-        self.nv = nodeview
-    def _doset(self, vs):
-
-        w,h = vs.size.width, vs.size.height
-
-       #s0 = self.split ** .5
-       #s1 = (1-self.split) ** .5
-
-       #mainsize = w * .9
-       #w0 = (self.split ** 0.5) * mainsize
-       #w1 = ((1-self.split) ** 0.5) * mainsize
-
-
-        #if self.split < .5:
-        #    w0 = mainsize / s0
-        #    w1 = mainsize * (1-self.split) / s1
-        #    h0 = self.split * h
-        #    h1 = (1-self.split+.25) * h
-        #else:
-        #    w0 = mainsize * self.split / s0
-        #    w1 = mainsize / s1
-        #    h0 = (self.split+.25) * h
-        #    h1 = (1-self.split) * h
-
-        #w0 = mainsize * self.split / s0
-        #w1 = mainsize / s1
-        #h0 = (self.split+.25) * h
-        #h1 = (1-self.split) * h
-
-        w0 = w*2/3
-        h0 = w/2 - 40
-
-        h1 = h - h0
-
-        s0 = 1.
-        s1 = .8
-
-       vs.coords.setOrthoBoxParams(self.mainbox1, 1,
-                       0, 0, s0, s0, w/s0, h0/s0);
-       vs.coords.setOrthoBoxParams(self.mainbox2, 1,
-                       0, h0, s1, s1, w/s1, h1/s1);
-
-       
-    def place(self, vs):
-       self.height = vs.size.height
-       self.width = vs.size.width
-
-       self.mainbox1 = vs.orthoBoxCS(0,"MainFrame1", 0, 0, 0, 0, 0, 0, 0);
-       self.mainbox2 = vs.orthoBoxCS(0,"MainFrame2", 0, 0, 0, 0, 0, 0, 0);
-
-       self._doset(vs)
-
-        self.context.renderContext(vs, 0)
-
-       return [(self.mainbox1, None, None), 
-               (self.mainbox2, None, None)]
-
     def mouse(self, ev, oldvs):
         if dbg: p(ev)
 
@@ -398,6 +336,9 @@
 
         if ev.getType() == ev.MOUSE_RELEASED:
             p('mainMouse released? - there\'s a bug in here!')
+
+           # The following code has ABSOLUTELY no place in the geometer.
+
             mousePrint(self.context.states.lastEvent, 'lastEvent')
 
             # release event must go to mainMouse MouseMultiplexer to work 
correctly!
@@ -405,7 +346,7 @@
             # flush implemented...
             mainMouse.flush()
             buoyMouse.flush()
-            
+             
             self.context.clean()
             w.setCursor('default')
 
@@ -431,8 +372,6 @@
         return 0
 
 
-
-
     def buoyMouse(self, mgr, ev, single, link):
         if buoyMouse.deliverEvent(ev):
             vob.AbstractUpdateManager.chg()
@@ -457,34 +396,7 @@
         vob.AbstractUpdateManager.chg()
         return 1
 
-    def key(self, key):
-        self.context.key(key)
-
-        if key == "+":
-            self.split += .03
-        elif key == "-":
-            self.split -= .03
-        elif key == "Home":
-            self.mgr.singles[1].mainNode = ff.view.buoy.MainNode2D(planeHome, 
irregu, ctrl)
-        elif key == "Ctrl-Q":
-            p("going to save");
-
-            m = ff.swamp.Graphs.toModel(fen.graph);
-            m.write(java.io.FileWriter(FILE));
-
-            java.lang.System.exit(43)
-        elif key == "Ctrl-R":
-            vob.putil.demo.loadScenes()
-        #elif key == "?":
-        #    vob.putil.demo.showHelp = 1-showHelp
-        #    vob.AbstractUpdateManager.setNoAnimation()
-        else:
-            return globalkey(key)
-
-        vob.AbstractUpdateManager.chg()
-        return 1
-
-
+       
 
 class Scene(vob.buoy.buoymanager.MultiBuoyManager):
     def __init__(self, single = 0):
@@ -492,11 +404,13 @@
         if single:
             vob.buoy.buoymanager.MultiBuoyManager.__init__(self, 
                [mainNode], connectors,
-               SingleGeometer(self, context, nodeview))
+               vob.buoy.buoymanager.SingleGeometer(self, context, nodeview),
+               ff.view.fenpdfgeometry.FenPDFGeometryConfiguration())
         else:
             vob.buoy.buoymanager.MultiBuoyManager.__init__(self, 
                [mainNode, mainNode2], connectors,
-               DoubleGeometer(self, context, nodeview))
+               ff.view.doublegeometer.DoubleGeometer(self, context, nodeview),
+               ff.view.fenpdfgeometry.FenPDFGeometryConfiguration())
             
         w.setCursor('default')
 
@@ -549,7 +463,7 @@
     w.renderStill(vs2, 0);
     saveanim.saveframe("/tmp/buoyframe%i.png" % frame, w)
     frame += 1
-        
+
 def globalkey(k):
     if k == "Ctrl-P":
         s = Scene()
@@ -566,3 +480,7 @@
         screenshots()
 #    if k == "Ctrl-B":
 #        ff.util.PageSpanPaper.withBlur = not ff.util.PageSpanPaper.withBlur
+
+
+
+