[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/buoy/...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/05/15 12:51:06

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/view/buoy: AbstractMainNode2D.java 
        org/fenfire/view/lava: FenPDFContext.java 

Log message:
        annotations into canvas work

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/FenPDFContext.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.46 
fenfire/org/fenfire/demo/buoyoing.py:1.47
--- fenfire/org/fenfire/demo/buoyoing.py:1.46   Wed May 14 18:03:33 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Thu May 15 12:51:06 2003
@@ -71,7 +71,6 @@
 fen.enfiladeOverlap = fen.txt.getTransclusionIndex()
 
 ppAct = ff.modules.pp.PPActionsImpl(fen)
-rst = ff.modules.pp.lava.RSTActionsImpl(fen)
 
 # Now, before reading the xu stuff, render something 
 # to try to prevent NV driver
@@ -95,15 +94,6 @@
     noteB1 = Nodes.get(ppAct.newNote(paperB, 1000,500, 'This is an another 
test!'))
 
     ppAct.assocNotes(noteB1, 1, noteA1)
-
-    canvas = rst.newRSTCanvas()
-    parag = rst.newParagraph(canvas, 200, 10,10)
-    senten = rst.newSentence(parag,0)
-    note = ff.swamp.Nodes.N()
-    ff.util.AlphContent(fen).setText(note, 'This is rst canvas test', 1)
-    rst.insertNode(senten, note, 0)
-
-    ppAct.assocNotes(noteA2, 1, Nodes.toString(note))
     ppAct.assocNotes(noteB1, -1, noteA1)
 
 
@@ -124,15 +114,14 @@
 ff.view.buoy.NodeType2D.effigy = 0
 ff.view.buoy.NodeType2DFull.effigy = 0
 
-context = ff.view.lava.FenPDFContext(fen, rst, nodeview)
+context = ff.view.lava.FenPDFContext(fen, ppAct, nodeview)
 nodeview.setContext(context)
 textnodeview.setContext(context)
-context.setAccursed(note)
-context.setCursorOffset(5)
-context.setRSTNode(senten)
+context.setAccursed(noteA1)
+context.setCursorOffset(3)
 ff.view.buoy.MainNode2D.fen = fen
 ff.view.buoy.AbstractMainNode2D.context = context
-rst.util.generateBasicSpatialCoords(canvas, nodeview)
+
 
 
 
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.9 
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.10
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.9   Thu May 15 
11:12:00 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java       Thu May 15 
12:51:06 2003
@@ -18,11 +18,16 @@
     private static void p(String s) { System.out.println("AbstractMainNode2D:: 
"+s); }
 
     protected Object plane;
+    public Object getPlane() { return plane; }
+
     protected View2D view2d;
 
     public View2D getView2D() { return view2d; }
 
     protected float panX, panY;
+    public float getPanX() { return panX; }
+    public float getPanY() { return panY; }
+
     protected boolean cursor = true;
     public void setCursor(boolean cursor) { this.cursor = cursor; }
 
@@ -55,7 +60,7 @@
      */
     static public org.fenfire.view.lava.FenPDFContext context = null;
     public void keystroke(String s) {
-       context.handleKeyStroke(s, view2d);
+       context.handleKeyStroke(s, this);
     }
     public interface Render {
        void mainNodeToBeRender(AbstractMainNode2D main);
Index: fenfire/org/fenfire/view/lava/FenPDFContext.java
diff -u fenfire/org/fenfire/view/lava/FenPDFContext.java:1.3 
fenfire/org/fenfire/view/lava/FenPDFContext.java:1.4
--- fenfire/org/fenfire/view/lava/FenPDFContext.java:1.3        Thu May 15 
11:12:00 2003
+++ fenfire/org/fenfire/view/lava/FenPDFContext.java    Thu May 15 12:51:06 2003
@@ -30,11 +30,11 @@
 
     private Fen fen;
     private AlphContent alphContent;
-    private RSTActionsImpl rst;
+    private PPActions ppAct;
     private NodeFunction nodef;
-    public FenPDFContext(Fen fen, RSTActions rst, NodeFunction nodef) {
+    public FenPDFContext(Fen fen, PPActions act, NodeFunction nodef) {
        this.fen = fen;
-       this.rst = (RSTActionsImpl)rst;
+       this.ppAct = act;
        this.nodef = nodef;
        this.alphContent = new AlphContent(fen);
     }
@@ -77,205 +77,49 @@
     }
 
     
-    private Object rstNode;
-    public void setRSTNode(Object node) { 
-       if (RDFUtil.isNodeType(fen, node, RST.Canvas) ||
-           RDFUtil.isNodeType(fen, node, RST.Paragraph) ||
-           RDFUtil.isNodeType(fen, node, RST.Sentence) ||
-           RDFUtil.isNodeType(fen, node, RST.Node))
-           rstNode = node; // do nothing else
-       else throw new Error("No rst node to set!");
-    }
-
-    public void handleKeyStroke(String stroke, View2D view)
+    public void handleKeyStroke(String stroke, AbstractMainNode2D main)
     { try {
        // synchronized(fen) XXX
-       if (accursed == null)
-           throw new Error("no accursed set!");
+
        if (cursorOffset < 0)
            throw new Error("no cursoroffset!! "+ cursorOffset);
-       p("s: "+stroke+", v: "+view);
+       p("s: "+stroke+", v: "+main);
 
-       if (RDFUtil.isNodeType(fen, rstNode, RST.Sentence)) {
-           p("rstNode is set to sentence - no other node handlers 
implemented");
 
-           Object sentence = rstNode;
 
-           if (stroke.equals(" ")) {
-               p("space pressed!");
-
-               if (needForNewSentence(stroke, view))
-                   ;
-               else {
-                   int num = getNodeNumInSentence(accursed);
-                   Object split = accursed;
-                   /*
-                   p("content: `"+((Enfilade1D)fen.txtfunc.f(fen.constgraph, 
accursed)).makeString()+"`");
-
-                   Object prev = fen.graph.find1_X11(RST.nextNode, accursed);
-                   String spaceTest = ((Enfilade1D)fen.txtfunc.
-                                       f(fen.constgraph, prev)).makeString();
-                   */
-                   if (cursorOffset == 0) {
-                       p("No pre nodes!");
-                       alphContent.insertText(accursed, 0, " ", true);
-                   } else {
-                       split = RDFUtil.splitNode(fen, accursed, cursorOffset);
-                       alphContent.insertText(split, 0, " ", true);
-                       Object next = fen.graph.find1_11X(split, RST.nextNode);
-                       if (next != null) {
-                           fen.graph.rm_111(split, RST.nextNode, next);
-                       }
-                       rst.insertNode(sentence, split, num + 1);
-                   }
-                   num = getNodeNumInSentence(split);
-                   Object split2 = RDFUtil.splitNode(fen, split, 1);
-                   rst.insertNode(sentence, split2, num + 1);
-
-                   // set correct attributes after changes
-                   accursed = split2;
-                   rstNode = sentence;
-                   cursorOffset = 0;
-                   generateCoords(split2);
-               }
-               return;
-           }
-           else if (stroke.equals("Return")) {
-               p("enter makes a new sentence.");
-               int num = getSentenceNum(sentence);
-               Object para = rst.util.getParagraph(sentence);
-               Object prev = accursed;
-               sentence = rst.newSentence(para, num+1);
-
-               int spaces = getPrevIntend(sentence);
-
-               Object split = accursed;
-               if (cursorOffset > 0) {
-                   split = RDFUtil.splitNode(fen, accursed, cursorOffset);
-                   rst.insertNode(sentence, split, 0);
-               }
-               Object next = fen.graph.find1_11X(accursed, RST.nextNode);
-               // synchronized(fen) XXX
-               if (next != null)
-                   fen.graph.rm_111(accursed, RST.nextNode, next);
-
-               rst.insertNode(rstNode, RST.NewLine, 
-                              getNodeNumInSentence(prev)+1);
-
-               // set correct attributes after changes
-               accursed = split;
-               rstNode = sentence;
-               cursorOffset = 0;
+       if (stroke.equals("Return")) {
+           if (accursed==null) return;
 
-               // XXX ReturnPressed()... indent or smth
-               for (int i=0; i<spaces; i++) 
-                   handleKeyStroke(" ", view);
-               generateCoords(accursed);
-               return;
-           }
-           else if (stroke.equals("Backspace") ||
-                    stroke.equals("Tab")) {
-               p("not implemented. "+stroke);
-           }
-           else if (stroke.equals("Left") ||
-                    stroke.equals("Right")) {
-               p("not implemented. "+stroke);
-           }
-           else if (stroke.length() == 1) {
-               alphContent.insertText(accursed, cursorOffset, stroke, true);
-               cursorOffset++;
-               generateCoords(accursed);
-               return;
+           String acc = Nodes.toString(accursed);
+           ppAct.insertText(acc, cursorOffset, "\n");
+           cursorOffset++;
+           return;
+       }
+       else if (stroke.equals("Backspace") ||
+                stroke.equals("Tab")) {
+           p("not implemented. "+stroke);
+       }
+       else if (stroke.equals("Left") ||
+                stroke.equals("Right")) {
+           p("not implemented. "+stroke);
+       }
+       else if (stroke.length() == 1) {
+           if (accursed==null) {
+               String paper = Nodes.toString(main.getPlane());
+               String note = ppAct.newNote(paper, (int)main.getPanX(),
+                                         (int)main.getPanY(), "");
+               cursorOffset = 0;
+               accursed = Nodes.get(note);
            }
+           String acc = Nodes.toString(accursed);
+           ppAct.insertText(acc, cursorOffset, stroke);
+           cursorOffset++;
+           return;
        } else  p("No keystroke defined!");
     } catch (RemoteException e) {
        p("RemoteException ocurred! "+e);
        return;
     }} 
 
-    protected boolean needForNewSentence(String stroke, View2D view) {
-       return false; }
-
-    protected int getPrevIntend(Object sentence) {
-       return 0;
-    }
-
-
-    private void generateCoords(Object node)
-       throws RemoteException 
-    {
-       Object canvas = node;
-       if (! RDFUtil.isNodeType(fen, canvas, RST.Canvas)) {
-           if (! RDFUtil.isNodeType(fen, canvas, RST.Paragraph)){
-               if (! RDFUtil.isNodeType(fen, canvas, RST.Sentence)){
-                   if (RDFUtil.isNodeType(fen, canvas, RST.Node))
-                       canvas = rst.util.getSentence(canvas);
-                   else throw new Error("Not RST node!"+ node);
-               }
-               canvas = rst.util.getParagraph(canvas);
-           }
-           canvas = rst.util.getCanvas(canvas);
-       }
-       rst.util.generateBasicSpatialCoords(canvas, nodef);
-    }
-
-    private Object getFirstNode(Object sentence) 
-       throws RemoteException
-    {
-       if (! RDFUtil.isNodeType(fen, sentence, RST.Sentence)) 
-           throw new Error("sentence is not sentence! "+sentence);
-       return fen.graph.find1_11X(sentence, RST.nextNode);
-    }
-
-    private Object getLastNode(Object sentence) 
-       throws RemoteException
-    {
-       p("go last");
-       Object n = getFirstNode(sentence);
-       if (n == null) return null;
-
-       Object next = fen.graph.find1_11X(n, RST.nextNode);
-       while (next != null) {
-           n = next;
-           next = fen.graph.find1_11X(n, RST.nextNode);
-       }
-       p("go last DONE");
-       return n;
-    }
-
-    private int getNodeNumInSentence(Object node) 
-       throws RemoteException
-    {
-       p("go node");
-       Object n = getFirstNode(rst.util.getSentence(node));
-       Object next = fen.graph.find1_11X(n, RST.nextNode);
-       int i = 0;
-       while (n != node || next != null) {
-           n = next;
-           next = fen.graph.find1_11X(n, RST.nextNode);
-           i++;
-       }
-       p("go node DONE");
-       if (n != node && next == null)
-           throw new Error("node not found in sentence");
-       return i;
-    }
-    
-    private int getSentenceNum(Object sentence) {
-       if (! RDFUtil.isNodeType(fen, sentence, RST.Sentence)) 
-           throw new Error("sentence is not sentence! "+sentence);
-       
-       Object n = sentence;
-       Object prev = fen.graph.find1_X11(RST.nextSentence, n);
-       while (prev != null) {
-           n = prev;
-           prev = fen.graph.find1_X11(RST.nextSentence, n);
-       }
-       int i=0;
-       for (i=0; n!=sentence; i++) {
-           n = fen.graph.find1_11X(n, RST.nextSentence);
-       }
-       return i;
-    }
 
 }