[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/lava/...
From: |
Matti Katila |
Subject: |
[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/lava/... |
Date: |
Wed, 21 May 2003 13:56:04 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/05/21 13:56:04
Modified files:
org/fenfire/demo: buoyoing.py
org/fenfire/view/lava: FenPDFContext.java
Log message:
importing pdf files works! whee..
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/FenPDFContext.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.53
fenfire/org/fenfire/demo/buoyoing.py:1.54
--- fenfire/org/fenfire/demo/buoyoing.py:1.53 Mon May 19 08:35:50 2003
+++ fenfire/org/fenfire/demo/buoyoing.py Wed May 21 13:56:04 2003
@@ -49,7 +49,7 @@
from org.fenfire.index import XuLink
import vob
-
+w.setCursor('wait')
ff.util.PageSpanPaper.paperMill = vob.gl.PaperMill.getInstance()
ff.util.PageSpanPaper.paperMillWindow = vob.putil.demowindow.w
@@ -122,6 +122,9 @@
textnodeview.setContext(context)
context.setAccursed(noteA1)
context.setCursorOffset(3)
+context.ppView = irregu
+context.pageView = None
+context.alph = myalph
ff.view.buoy.MainNode2D.fen = fen
ff.view.buoy.AbstractMainNode2D.context = context
@@ -185,7 +188,7 @@
print "SET DOUBLE ", h0, h1, w0, w1, s0, s1, buoywidth0, buoywidth1
vs.coords.setOrthoBoxParams(self.into1, 0,
- ctrx - .5*w0, 0,
+ ctrx - .5*w0, 40,
s0, s0,
w0, h0)
Index: fenfire/org/fenfire/view/lava/FenPDFContext.java
diff -u fenfire/org/fenfire/view/lava/FenPDFContext.java:1.15
fenfire/org/fenfire/view/lava/FenPDFContext.java:1.16
--- fenfire/org/fenfire/view/lava/FenPDFContext.java:1.15 Wed May 21
12:49:36 2003
+++ fenfire/org/fenfire/view/lava/FenPDFContext.java Wed May 21 13:56:04 2003
@@ -25,6 +25,9 @@
import java.awt.FileDialog;
import java.awt.Frame;
+import org.nongnu.alph.*;
+import org.nongnu.alph.impl.*;
+
/** FenPDF context what handles keystrokes and
* accursed node at least.
@@ -178,11 +181,17 @@
}
+ public View2D ppView = null;
+ public View2D pageView = null;
+ public StormAlph alph = null;
+
/** @return object of new plane for mainnode view 2d
* or what??? XXX
* what this should even do?
*/
- public Object doMouse(MouseEvent e, VobScene oldVS) throws RemoteException
{
+ public Object doMouse(MouseEvent e, VobScene oldVS)
+ throws RemoteException, IOException
+ {
if (e.getID() != MouseEvent.MOUSE_CLICKED) return null;
int cs = oldVS.coords.getCSAt(0, e.getX(), e.getY(), null);
if(cs < 0) return null;
@@ -196,17 +205,20 @@
FileDialog fd = new FileDialog(f, "Valitse liitettava kuva",
FileDialog.LOAD);
fd.setModal(true);
- fd.show();
+ fd.show(); // now wait until user makes a desicion
fd.hide();
p("ps/pdf to be added: "+fd.getDirectory()+fd.getFile());
- p("unfortunately - NOT IMPLEMENTED");
+
+ ScrollBlock sc = alph.addFile(new
File(fd.getDirectory()+fd.getFile()),
+ "application/pdf");
+ return new FisheyeMainNode2D(sc, new PageScrollView2D(), 0,0);
}
else if (key.equals("LINK")) {
if (CURR >0) actionLink(1); else actionLink(-1);
}
else if (key.equals("NEW_PAPER")) {
String paper = ppAct.newPaper();
- return new MainNode2D(Nodes.get(paper), null, 0,0,1);
+ return new MainNode2D(Nodes.get(paper), ppView, 0,0,1);
}
else return null;