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

[Asko Soukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/08/14 03:36:37

Modified files:
        org/fenfire/demo: mm.py 
        org/fenfire/view: TextNodeView.java 
Added files:
        docs/pegboard/textnodeview_locate_cursor--humppake: .cvsignore 
                                                            peg.rst 

Log message:
        cursor methods

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/pegboard/textnodeview_locate_cursor--humppake/.cvsignore?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/pegboard/textnodeview_locate_cursor--humppake/peg.rst?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mm.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextNodeView.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/mm.py
diff -u fenfire/org/fenfire/demo/mm.py:1.6 fenfire/org/fenfire/demo/mm.py:1.7
--- fenfire/org/fenfire/demo/mm.py:1.6  Wed Aug 13 19:41:11 2003
+++ fenfire/org/fenfire/demo/mm.py      Thu Aug 14 03:36:37 2003
@@ -36,12 +36,13 @@
 
 # set flag to load an old graph or creating new
 do_load_graph = 0
-if os.path.isfile(FILE):
-    print 'Loading the RDF graph from the file %s.' % (FILE)
-    do_load_graph = 1
-else:
-    print 'Creating a new RDF graph.'
-    do_load_graph = 0
+## Test data still in use
+#if os.path.isfile(FILE):
+#    print 'Loading the RDF graph from the file %s.' % (FILE)
+#    do_load_graph = 1
+#else:
+#    print 'Creating a new RDF graph.'
+#    do_load_graph = 0
 
 # Now, before reading the xu stuff, render something 
 # to try to prevent NV driver
@@ -329,13 +330,13 @@
             xy = jarray.zeros(2, 'f')
             nodeview.getXY(fen.graph, context.getAccursed(),
                                context.offset, xy)
-            xy[1] -= textstyle.getHeight(1) * 1.5
+            xy[1] -= textstyle.getHeight(1)
             context.offset = nodeview.getPos(fen.graph, context.getAccursed(), 
xy[0], xy[1])
        elif key == 'Down':
             xy = jarray.zeros(2, 'f')
             nodeview.getXY(fen.graph, context.getAccursed(),
                                context.offset, xy)
-            xy[1] += textstyle.getHeight(1) * 0.5
+            xy[1] += textstyle.getHeight(1)
             context.offset = nodeview.getPos(fen.graph, context.getAccursed(), 
xy[0], xy[1])
        elif key == 'Left':
             if context.offset > 0: context.offset -= 1
@@ -353,8 +354,6 @@
             nodeview.getXY(fen.graph, context.getAccursed(),
                                context.offset, xy)
             xy[0] = 0
-            # we must return a half of the line height back to stay on the 
same line
-            xy[1] -= textstyle.getHeight(1) * 0.5 # XXX scaling!
             context.offset = nodeview.getPos(fen.graph, context.getAccursed(), 
xy[0], xy[1])            
         if key == "End" or key == "Ctrl-E":
             # the end of line is reached by going to home of the line below
@@ -363,7 +362,7 @@
             nodeview.getXY(fen.graph, context.getAccursed(),
                                context.offset, xy)
             xy[0] = 0
-            xy[1] += textstyle.getHeight(1) * 0.5 # XXX scaling!
+            xy[1] += textstyle.getHeight(1)
             context.offset = nodeview.getPos(fen.graph, context.getAccursed(), 
xy[0], xy[1])
             text = alphContent.getText(fen.graph, context.getAccursed())
             if context.offset < len(text): context.offset -= 1
Index: fenfire/org/fenfire/view/TextNodeView.java
diff -u fenfire/org/fenfire/view/TextNodeView.java:1.13 
fenfire/org/fenfire/view/TextNodeView.java:1.14
--- fenfire/org/fenfire/view/TextNodeView.java:1.13     Wed Aug 13 19:41:11 2003
+++ fenfire/org/fenfire/view/TextNodeView.java  Thu Aug 14 03:36:37 2003
@@ -41,7 +41,7 @@
  */
 public class TextNodeView extends org.fenfire.view.lava.TextHandler 
        implements NodeFunction {
-public static final String rcsid = "$Id: TextNodeView.java,v 1.13 2003/08/13 
23:41:11 humppake Exp $";
+public static final String rcsid = "$Id: TextNodeView.java,v 1.14 2003/08/14 
07:36:37 humppake Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("TextNodeView::"+s); 
}
 
@@ -82,7 +82,7 @@
        int line = 0;
        if (y < 0) return 0;
        while (line < br.getLineCount()){
-           if (y >= br.getLineOffset(line)) line++;
+           if (y > br.getLineOffset(line)) line++;
            else break;
        }
 
@@ -119,7 +119,8 @@
        return pos;
     }
 
-    /** Get coordinates before the given character.
+    /** Get coordinates before the given character position.
+     * The Y coordinate is located below the line.
      */
     public void getXY(ConstGraph g, Object node, int pos, float[] xy) {
        Enfilade1D enf = (Enfilade1D)nodeContent.f(g, node);