[Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/11 08:07:31

Modified files:
        org/fenfire/bin: fenpdf10.py 
        org/fenfire/demo: fenpdfcontext.py 
        org/fenfire/view/buoy: actions.py 

Log message:
        import and new paper implementation

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/fenpdfcontext.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/actions.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.13 
fenfire/org/fenfire/bin/fenpdf10.py:1.14
--- fenfire/org/fenfire/bin/fenpdf10.py:1.13    Mon Aug 11 07:07:26 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Mon Aug 11 08:07:31 2003
@@ -22,8 +22,6 @@
 
 # The FenPDF 1.0 !
 
-from __future__ import nested_scopes
-
 dbg = 0
 
 def p(*s):
@@ -163,6 +161,8 @@
     noteA3 = Nodes.get(ppAct.newNote(paperA, 100, 100, ''))
     noteA4 = Nodes.get(ppAct.newNote(paperA, -60,70, 'This is a very long test 
which is used to see if '))
 
+    fen.graph.add(noteA2, RDF.type, ff.vocab.lava.MINDSTRUCT.Data)
+
     ppAct.assocNotes(noteA1, 1, noteA2);
 
     span = sc.getCurrent().getPage(0).subArea(100, 100, 300, 200);
@@ -232,7 +232,7 @@
 context.states.cursor.setCursorOffset(3)
 context.ppView = irregu
 context.pageView = None
-context.alph = myalph
+context.states.alph = myalph
 context.states.view2d.irregu = irregu
 ff.view.buoy.MainNode2D.fen = fen
 ff.view.buoy.AbstractMainNode2D.context = context
@@ -266,7 +266,7 @@
 # With wheel
 mainMouse.setWheelListener(0, 'Moving the pan', \
                            actions.PanMover(context))
-
+context.states.mainMouse = mainMouse
 
 # Default controls for buoys
 buoyMouse = vob.mouse.MouseMultiplexer()
Index: fenfire/org/fenfire/demo/fenpdfcontext.py
diff -u fenfire/org/fenfire/demo/fenpdfcontext.py:1.20 
fenfire/org/fenfire/demo/fenpdfcontext.py:1.21
--- fenfire/org/fenfire/demo/fenpdfcontext.py:1.20      Mon Aug 11 06:26:34 2003
+++ fenfire/org/fenfire/demo/fenpdfcontext.py   Mon Aug 11 08:07:31 2003
@@ -118,10 +118,14 @@
         self.spanImageFactory = spanImageFactory
         self.nodeview = nodeview
         self.pageview = None
+        self.alph = None
 
         # buoymanager, set with setMgr()
         self.mgr = None
 
+        # main view mouse multiplexer
+        self.mainMouse = None
+
         class Selection:
             def __init__(self):
                 self.area = [0,0,0,0]
@@ -312,7 +316,8 @@
            text.setCursorOffset(-1)
 
     def renderContext(self, vs, into):
-       b = ff.view.lava.Button(vs, 0, 30, 0, 50);
+        self.mousebuttons = cs = vs.translateCS(0, "BUTTONS",0,0)
+       b = ff.view.lava.Button(vs, cs, 30, 0, 50);
         b.add("[Import PS/PDF]", "IMPORT");
         b.add("[New paper]",     "NEW_PAPER");
        b.add("[Save]", "SAVE");
@@ -321,8 +326,46 @@
     def doMouse(self, ev, oldVS):
         if self.mousemenu.mouse(ev, oldVS):
             return 1
-        return 0
 
+        if ev.getType() != ev.MOUSE_CLICKED: return 0;
+
+        key = oldVS.getKeyAt(self.mousebuttons, ev.getX(), ev.getY(), None)
+        if key == None: return 0
+
+        mgr = self.states.mgr
+        views = self.states.view2d
+
+        if key == 'IMPORT':
+            f = java.awt.Frame()
+            fd = java.awt.FileDialog(f, 'Valitse liitettava kuva',
+                                         java.awt.FileDialog.LOAD)
+            fd.setModal(1)
+            fd.show()  #// now wait until user makes a desicion
+            fd.hide()
+            p("ps/pdf to be added: "+fd.getDirectory()+fd.getFile())
+            if fd.getDirectory() == None:
+                return 0
+
+            sc = self.states.alph.addFile(
+                java.io.File(fd.getDirectory()+fd.getFile()),
+                'application/pdf')
+            p('sc: ',sc,'foo: ', sc.getID())
+            mgr.replaceManager(0, 
+                ff.view.buoy.FisheyeMainNode2D(sc, views.pageview, 
+                      ff.view.buoy.AbstractMainNode2D.SimpleFocus(0,0),
+                      self.states.mainMouse))
+            return 1
+        elif key == 'NEW_PAPER':
+            paper = self.states.pp.newPaper();
+            mgr.replaceManager(0, 
+                ff.view.buoy.MainNode2D(ff.swamp.Nodes.get(paper), 
+                                        views.irregu, 
ff.view.buoy.AbstractMainNode2D.SimpleFocus(0,0),1,
+                                        self.states.mainMouse))
+            return 1
+        else:
+            p('key', key)
+            return 0
+    
     
     def clean(self):
         self.mousemenu.hideList()
Index: fenfire/org/fenfire/view/buoy/actions.py
diff -u fenfire/org/fenfire/view/buoy/actions.py:1.7 
fenfire/org/fenfire/view/buoy/actions.py:1.8
--- fenfire/org/fenfire/view/buoy/actions.py:1.7        Mon Aug 11 05:04:40 2003
+++ fenfire/org/fenfire/view/buoy/actions.py    Mon Aug 11 08:07:31 2003
@@ -20,7 +20,7 @@
 # 
 # 
 
-from __future__ import nested_scopes
+
 from org import fenfire as ff
 from org.fenfire.vocab import CANVAS2D, RDF
 import org.nongnu.libvob as vob