[ff-cvs] fenfire/org/fenfire fenpdf/BUGS fenpdf/fenpdfco...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/15 02:58:23

Modified files:
        org/fenfire/fenpdf: BUGS fenpdfcontext.py 
        org/fenfire/modules/pp: PPActionsImpl.java 
Added files:
        org/fenfire/fenpdf: importpdf.py 

Log message:
        Clean up import, add to treetime

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/importpdf.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/BUGS.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdfcontext.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.java.diff?tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/fenpdf/BUGS
diff -u fenfire/org/fenfire/fenpdf/BUGS:1.3 fenfire/org/fenfire/fenpdf/BUGS:1.4
--- fenfire/org/fenfire/fenpdf/BUGS:1.3 Fri Aug 15 01:13:51 2003
+++ fenfire/org/fenfire/fenpdf/BUGS     Fri Aug 15 02:58:23 2003
@@ -19,6 +19,7 @@
 
 - imported PDFs not added to treetime
 
+- import assumes application/pdf!
 
 IMPORTANT:
 
@@ -26,6 +27,8 @@
   calculated wrong because not rendered??
 
 - transclusions move by dragging WITHOUT ctrl!!!
+
+- startup takes far too long. Irregu?
 
 ANNOYANCE:
 
Index: fenfire/org/fenfire/fenpdf/fenpdfcontext.py
diff -u fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.5 
fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.6
--- fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.5     Fri Aug 15 01:13:51 2003
+++ fenfire/org/fenfire/fenpdf/fenpdfcontext.py Fri Aug 15 02:58:23 2003
@@ -32,7 +32,7 @@
         cur = self.states.cursor
         acc = cur.getAccursed()
         offs = cur.getCursorOffset()
-        alph = ff.util.AlphContent(self.states.fen)
+        alphContent = ff.util.AlphContent(self.states.fen)
 
         ### normal alphabets etc.
         if len(stroke) == 1:
@@ -90,7 +90,7 @@
                 p('delete:', offs)
                 pp.deleteText(note, offs - 1, offs)
                 offs = cur.setCursorOffset(offs - 1)
-                text = alph.getText(fen.constgraph, acc)
+                text = alphContent.getText(fen.constgraph, acc)
                 if offs == 0 and len(text) == 0:
                     if RDFUtil.isLinked(fen.graph, acc):
                         pp.insertText(note, 0, "#")
@@ -100,7 +100,7 @@
        elif stroke == 'Left':
             if offs > 0: cur.setCursorOffset(offs - 1)
         elif stroke == 'Right':
-            text = alph.getText(acc)
+            text = alphContent.getText(acc)
             if offs < len(text):
                 cur.setCursorOffset( offs + 1)
        
@@ -115,7 +115,6 @@
         self.spanImageFactory = spanImageFactory
         self.nodeview = nodeview
         self.pageview = None
-        self.alph = None
 
         # buoymanager, set with setBuoymanager()
         self.buoymanager = None
@@ -379,24 +378,17 @@
         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())
-            buoymanager.replaceManager(0, 
-                ff.view.buoy.FisheyeMainNode2D(sc, views.pageview, 
-                      ff.view.buoy.AbstractMainNode2D.SimpleFocus(0,0),
-                      self.states.mainMouse))
+           scrollBlock = ff.fenpdf.importpdf.importPDF_select(
+                   self.states.fen,
+                   self.states.ppActions.getTreeTime())
+            p('sc: ',scrollBlock,'id: ', scrollBlock.getID())
+           if scrollBlock != None:
+               buoymanager.replaceManager(0, 
+                   ff.view.buoy.FisheyeMainNode2D(
+                       scrollBlock, 
+                       views.pageview, 
+                       ff.view.buoy.AbstractMainNode2D.SimpleFocus(0,0),
+                       self.states.mainMouse))
             return 1
         elif key == 'NEW_PAPER':
             paper = self.states.ppActions.newPaper();
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.35 
fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.36
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.35      Thu Aug 14 
03:32:55 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.java   Fri Aug 15 02:58:23 2003
@@ -46,7 +46,7 @@
  *  UnicastRemoteObject' for now. -benja
  */
 public class PPActionsImpl /*extends UnicastRemoteObject*/ implements 
PPActions {
-public static final String rcsid = "$Id: PPActionsImpl.java,v 1.35 2003/08/14 
07:32:55 tjl Exp $";
+public static final String rcsid = "$Id: PPActionsImpl.java,v 1.36 2003/08/15 
06:58:23 tjl Exp $";
     public static boolean dbg = false;
     protected static void p(String s) { System.out.println("PPActionsImpl: 
"+s); }
 
@@ -58,6 +58,9 @@
     }
 
     public org.fenfire.structure.TreeTime treeTime;
+    public org.fenfire.structure.TreeTime getTreeTime() {
+       return treeTime;
+    }
 
     public PPActionsImpl(Fen fen)  throws RemoteException {
        super();