[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire docs/pegboard/canvas_text--mudyc/peg.rs...
|
From: |
Matti Katila |
|
Subject: |
[Gzz-commits] fenfire docs/pegboard/canvas_text--mudyc/peg.rs... |
|
Date: |
Fri, 02 May 2003 20:57:00 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/05/02 20:57:00
Modified files:
docs/pegboard/canvas_text--mudyc: peg.rst
org/fenfire/demo: buoyoing.py
org/fenfire/impl: SimpleNodeContent.java
org/fenfire/util: AlphContent.java
org/fenfire/view: CanvasView2D.java PaperView2D.java
org/fenfire/view/buoy: AbstractMainNode2D.java MainNode2D.java
NodeType2D.java NodeType2DFull.java
PPConnector.java
TransclusionConnector.java
Log message:
various fixes
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/pegboard/canvas_text--mudyc/peg.rst.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/SimpleNodeContent.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/AlphContent.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CanvasView2D.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PaperView2D.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/MainNode2D.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/NodeType2D.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/NodeType2DFull.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPConnector.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/TransclusionConnector.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
Patches:
Index: fenfire/docs/pegboard/canvas_text--mudyc/peg.rst
diff -u fenfire/docs/pegboard/canvas_text--mudyc/peg.rst:1.2
fenfire/docs/pegboard/canvas_text--mudyc/peg.rst:1.3
--- fenfire/docs/pegboard/canvas_text--mudyc/peg.rst:1.2 Thu May 1
20:41:59 2003
+++ fenfire/docs/pegboard/canvas_text--mudyc/peg.rst Fri May 2 20:56:59 2003
@@ -5,8 +5,8 @@
:Author: Matti Katila
:Date: 2003-05-02
:Stakeholders:
-:Revision: $Revision: 1.2 $
-:Last-Modified: $Date: 2003/05/02 00:41:59 $
+:Revision: $Revision: 1.3 $
+:Last-Modified: $Date: 2003/05/03 00:56:59 $
:Type: User Interface, Spatial canvas RDF structure, Text format
:Status: Incomplete
@@ -26,7 +26,7 @@
Issues
------
-- If we generate rst to pdf does it brake the
+- If we generate rst to pdf does it break the
xanalogical link doesn't it?
RESOLVED:
@@ -36,6 +36,10 @@
build a new article from annotations and link xanalogically
the annotation canvas to pdf generated from it?
+ Actually this is out of scope of this peg.
+ This peg's purpose is to tell about additional structure to handle
+ text easily in text canvases.
+
- Would Nile like text editability be too complex for pp?
@@ -72,7 +76,12 @@
- spatial placing of different paragraphs into one canvas.
- one paragraph includes sentences one after the other.
- - sentence includes nodes(as words) one after the other.
+ - sentence includes nodes(as words, letters, spaces, numbers etc.)
+ one after the other.
+ - nodes are contained to canvas.
+
+Nodes' coordinates are generated because of they are additive to
+paragraph's coordinates.
Goal
@@ -89,6 +98,11 @@
One issue would be how text format is handled and does this proposal
approach it in different manner.
+
+Irrelevant
+----------
+
PDF generating from rst converted to latex. This would make FenPDF
-also as a article productive wholeness.
+also as a article productive wholeness. Because of xanalogical suicide
+this is out of scope.
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.36
fenfire/org/fenfire/demo/buoyoing.py:1.37
--- fenfire/org/fenfire/demo/buoyoing.py:1.36 Thu May 1 20:22:40 2003
+++ fenfire/org/fenfire/demo/buoyoing.py Fri May 2 20:56:59 2003
@@ -24,6 +24,9 @@
dbg = 0
+def pa(*s):
+ print 'fenfire.demo.buoyoing::',s
+
import sys
import jarray
import java
@@ -33,7 +36,7 @@
print "LOADING BUOYOING"
if dbg:
for (k,v) in sys.modules.items():
- print k,"\t",v
+ pa( k,"\t",v)
from org import fenfire as ff
from org.fenfire.swamp import Nodes
@@ -48,6 +51,7 @@
import vob
+
ff.util.PageSpanPaper.paperMill = vob.gl.PaperMill.getInstance()
ff.util.PageSpanPaper.paperMillWindow = vob.putil.demowindow.w
@@ -80,37 +84,30 @@
w.renderStill(vs, 0)
if 1:
- #global linkid1
paperA = ppAct.newPaper()
- note1 = Nodes.get(ppAct.newNote(paperA, 0,0, 'This is a test!'))
- note1c = Nodes.get(ppAct.newNote(paperA, -30,-30, 'This is a test2!'))
- note1b = Nodes.get(ppAct.newNote(paperA, 100, 100, ''))
+ noteA1 = Nodes.get(ppAct.newNote(paperA, -30,-30, 'This is a test!'))
+ noteA2 = Nodes.get(ppAct.newNote(paperA, -60,-70, 'This is a test2!'))
+ noteA3 = Nodes.get(ppAct.newNote(paperA, 100, 100, ''))
span = sc.getCurrent().getPage(0).subArea(100, 100, 300, 200);
- fen.txt.set(note1b, enfMaker.makeEnfilade(span))
- #linkid1 = addTrans(span, paper)
+ fen.txt.set(noteA3, enfMaker.makeEnfilade(span))
paperB = ppAct.newPaper()
- note2 = Nodes.get(ppAct.newNote(paperB, 1000,500, 'This is an another
test!'))
+ noteB1 = Nodes.get(ppAct.newNote(paperB, 1000,500, 'This is an another
test!'))
- ppAct.assocNotes(note1, 1, note2)
+ ppAct.assocNotes(noteB1, 1, noteA1)
canvas = rst.newRSTCanvas()
parag = rst.newParagraph(canvas, 10,10)
senten = rst.newSentence(parag,0)
note = ff.swamp.Nodes.N()
- text = (ff.util.AlphContent(fen)).setText('This is rst canvas test', note,
1)
+ ff.util.AlphContent(fen).setText(note, 'This is rst canvas test', 1)
rst.insertNode(senten, note, 0)
rst.generateBasicSpatialCoords(canvas)
- # something is really broken because it hangs on loop and
- # eats all available cpu if do uncomment this line.
- # rstactions and ppactions do produces same basic structure
- # so it isn't understandable. Different with this too is in
- # text structure. rstactions can be made to allow sentences etc.
- #ppAct.assocNotes(note1c, 1, ff.swamp.Nodes.toString(note))
- ppAct.assocNotes(note1, -1, note2)
- print 'Association done!'
+ ppAct.assocNotes(noteA2, 1, Nodes.toString(note))
+ ppAct.assocNotes(noteB1, -1, noteA1)
+
textstyle = vob.GraphicsAPI.getInstance().getTextStyle("sans", 0, 24)
textnodeview = ff.view.TextNodeView(fen.txtfunc, textstyle, 1)
@@ -134,7 +131,7 @@
plane = Nodes.get(paperA)
mainNode = ff.view.buoy.MainNode2D(plane, irregu)
-# mainNode = ff.view.buoy.MainNode2D(plane, paperview)
+#mainNode = ff.view.buoy.MainNode2D(plane, paperview)
#connector = ff.view.buoy.PPConnector(fen, paperviewonly)
#connector.hackForTesting = 1
@@ -158,7 +155,6 @@
print "\t",k,"\t",em[k]
print "DUMPED!"
-
class Scene(vob.buoy.buoymanager.RealBuoyManager):
def __init__(self):
vob.buoy.buoymanager.RealBuoyManager.__init__(self, mainNode,
[ppconnector, tconnector])
@@ -220,7 +216,6 @@
saveanim.saveframe("/tmp/buoyframeWithHand.png", w)
if k == "S":
- print 'FOOO'
screenshots()
if k == "Ctrl-PrinT":
screenshots()
Index: fenfire/org/fenfire/impl/SimpleNodeContent.java
diff -u fenfire/org/fenfire/impl/SimpleNodeContent.java:1.9
fenfire/org/fenfire/impl/SimpleNodeContent.java:1.10
--- fenfire/org/fenfire/impl/SimpleNodeContent.java:1.9 Mon Apr 28 04:57:27 2003
+++ fenfire/org/fenfire/impl/SimpleNodeContent.java Fri May 2 20:56:59 2003
@@ -24,9 +24,9 @@
*/
public class SimpleNodeContent implements NodeContent {
- public static boolean dbg = true;
-public static final String rcsid = "$Id: SimpleNodeContent.java,v 1.9
2003/04/28 08:57:27 tjl Exp $";
- private static void pa(String s) { System.out.println("AlphContent: "+s); }
+public static final String rcsid = "$Id: SimpleNodeContent.java,v 1.10
2003/05/03 00:56:59 mudyc Exp $";
+ public static boolean dbg = false;
+ private static void pa(String s) { System.out.println("SimpleContent::
"+s); }
SpanReader spanReader;
javax.xml.parsers.SAXParser saxParser;
Index: fenfire/org/fenfire/util/AlphContent.java
diff -u fenfire/org/fenfire/util/AlphContent.java:1.9
fenfire/org/fenfire/util/AlphContent.java:1.10
--- fenfire/org/fenfire/util/AlphContent.java:1.9 Thu Apr 24 09:29:12 2003
+++ fenfire/org/fenfire/util/AlphContent.java Fri May 2 20:57:00 2003
@@ -13,9 +13,9 @@
/** Help class to work with Alph
*/
public class AlphContent {
- public static boolean dbg = true;
-public static final String rcsid = "$Id: AlphContent.java,v 1.9 2003/04/24
13:29:12 tjl Exp $";
- private static void pa(String s) { System.out.println("AlphContent: "+s); }
+public static final String rcsid = "$Id: AlphContent.java,v 1.10 2003/05/03
00:57:00 mudyc Exp $";
+ public static boolean dbg = false;
+ private static void pa(String s) { System.out.println("AlphContent:: "+s);
}
//private XuIndexer xuIndex;
Index: fenfire/org/fenfire/view/CanvasView2D.java
diff -u fenfire/org/fenfire/view/CanvasView2D.java:1.9
fenfire/org/fenfire/view/CanvasView2D.java:1.10
--- fenfire/org/fenfire/view/CanvasView2D.java:1.9 Thu May 1 20:22:40 2003
+++ fenfire/org/fenfire/view/CanvasView2D.java Fri May 2 20:57:00 2003
@@ -20,8 +20,8 @@
/** A View2D on a PP-like canvas.
*/
public class CanvasView2D extends View2D {
-public static final String rcsid = "$Id: CanvasView2D.java,v 1.9 2003/05/02
00:22:40 mudyc Exp $";
- public static boolean dbg = true;
+public static final String rcsid = "$Id: CanvasView2D.java,v 1.10 2003/05/03
00:57:00 mudyc Exp $";
+ public static boolean dbg = false;
private static void pa(String s) { System.out.println("CanvasView2D::"+s);
}
private Fen fen;
@@ -43,7 +43,7 @@
Iterator iter = fen.constgraph.findN_11X_Iter(container,
PAPER.contains);
- pa("Canvas begin");
+ if (dbg) pa("Canvas begin");
while (iter.hasNext()) {
Object n = iter.next();
@@ -64,10 +64,8 @@
if(cull) {
cs = vs.cullCS(cs, "CULL", box2screen);
}
- if (dbg) pa("place");
p.place(vs, cs);
- if (dbg) pa("place ..DONE");
}
- pa("Canvas DONE");
+ if (dbg) pa("Canvas DONE");
}
}
Index: fenfire/org/fenfire/view/PaperView2D.java
diff -u fenfire/org/fenfire/view/PaperView2D.java:1.9
fenfire/org/fenfire/view/PaperView2D.java:1.10
--- fenfire/org/fenfire/view/PaperView2D.java:1.9 Thu May 1 20:22:40 2003
+++ fenfire/org/fenfire/view/PaperView2D.java Fri May 2 20:57:00 2003
@@ -12,8 +12,8 @@
* this other view is rendered on top of the paper.
*/
public class PaperView2D extends View2D {
-public static final String rcsid = "$Id: PaperView2D.java,v 1.9 2003/05/02
00:22:40 mudyc Exp $";
- public static boolean dbg = true;
+public static final String rcsid = "$Id: PaperView2D.java,v 1.10 2003/05/03
00:57:00 mudyc Exp $";
+ public static boolean dbg = false;
private static void pa(String s) { System.out.println("PaperView2D::"+s); }
public PaperMill paperMill;
@@ -42,7 +42,9 @@
Object plane,
int matchingParent,
int box2screen, int box2paper
- ) {
+ )
+ {
+ if (dbg) pa("begin render");
if(paperMill == null)
paperMill = PaperMill.getInstance();
@@ -71,6 +73,7 @@
if(child != null)
child.render(vs, plane, matchingParent,
box2screen, box2paper);
+ if (dbg) pa("begin render..DONE");
}
public void getSize(Object plane, float[] wh) {
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.2
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.3
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.2 Mon Apr 28
07:46:49 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java Fri May 2
20:57:00 2003
@@ -14,7 +14,7 @@
*/
public abstract class AbstractMainNode2D implements BuoyViewMainNode {
public static boolean dbg = true;
- private static void pa(String s) { System.out.println(s); }
+ private static void pa(String s) {
System.out.println("AbstractMainNode2D:: "+s); }
protected Object plane;
protected View2D view2d;
@@ -76,4 +76,21 @@
AbstractUpdateManager.chg();
}
+
+
+
+ /** Ugly hack! Fix fix fix..
+ */
+ static public org.fenfire.Fen fen = null;
+ /** Ugly hack! Fix fix fix..
+ */
+ static public org.fenfire.modules.pp.RSTActionsImpl rst = null;
+
+
+ public void keystroke(String s) {
+ pa("Key:"+s);
+ }
+
+
+
}
Index: fenfire/org/fenfire/view/buoy/MainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/MainNode2D.java:1.13
fenfire/org/fenfire/view/buoy/MainNode2D.java:1.14
--- fenfire/org/fenfire/view/buoy/MainNode2D.java:1.13 Mon Apr 28 07:46:49 2003
+++ fenfire/org/fenfire/view/buoy/MainNode2D.java Fri May 2 20:57:00 2003
@@ -39,7 +39,7 @@
*/
public class MainNode2D extends AbstractMainNode2D {
public static boolean dbg = true;
- private static void pa(String s) { System.out.println(s); }
+ private static void pa(String s) { System.out.println("MainNode2D:: "+s); }
protected float zoom;
Index: fenfire/org/fenfire/view/buoy/NodeType2D.java
diff -u fenfire/org/fenfire/view/buoy/NodeType2D.java:1.8
fenfire/org/fenfire/view/buoy/NodeType2D.java:1.9
--- fenfire/org/fenfire/view/buoy/NodeType2D.java:1.8 Tue Apr 29 21:00:00 2003
+++ fenfire/org/fenfire/view/buoy/NodeType2D.java Fri May 2 20:57:00 2003
@@ -40,7 +40,7 @@
*/
public class NodeType2D extends AbstractNodeType2D {
public static boolean dbg = false;
- private static void pa(String s) { System.out.println(s); }
+ private static void pa(String s) { System.out.println("NodeType2D:: "+s); }
public static int effigy = 0;
@@ -60,6 +60,7 @@
public int renderBuoy(VobScene vs, int into, Object linkId,
Object anchor, Object cachedSize) {
+ if (dbg) pa("start renderBuoy");
if(effigy != 0) {
Vob eff = org.nongnu.libvob.gl.GLRen.createQuad(effigy-1, 0,0);
vs.map.put( eff, into);
@@ -72,7 +73,7 @@
float[] tmp = new float[2];
vs.coords.getSqSize(into, tmp);
float w = tmp[0], h = tmp[1];
- pa("rect "+rect+" coords "+w+","+h);
+ if (dbg) pa("rect "+rect+" coords "+w+","+h);
float scale = w / rect.width;
if(scale < h / rect.height) scale = h / rect.height;
@@ -87,6 +88,7 @@
view2d.render(vs, plane, into, into, box2paper);
+ if (dbg) pa("start renderBuoy..DONE");
return vs.coords.translate(into, w/2f, h/2f);
}
}
Index: fenfire/org/fenfire/view/buoy/NodeType2DFull.java
diff -u fenfire/org/fenfire/view/buoy/NodeType2DFull.java:1.3
fenfire/org/fenfire/view/buoy/NodeType2DFull.java:1.4
--- fenfire/org/fenfire/view/buoy/NodeType2DFull.java:1.3 Tue Apr 29
21:00:00 2003
+++ fenfire/org/fenfire/view/buoy/NodeType2DFull.java Fri May 2 20:57:00 2003
@@ -16,7 +16,7 @@
*/
public class NodeType2DFull extends AbstractNodeType2D {
public static boolean dbg = false;
- private static void pa(String s) { System.out.println(s); }
+ private static void pa(String s) { System.out.println("NodeType2DFull::
"+s); }
public static int effigy = 0;
@@ -36,6 +36,7 @@
float [] tmpSqSize = new float[2];
public int renderBuoy(VobScene vs, int into, Object linkId,
Object anchor, Object cachedSize) {
+ if (dbg) pa("renderBuoy");
if(effigy != 0) {
Vob eff = org.nongnu.libvob.gl.GLRen.createQuad(effigy-1, 0,0);
vs.map.put( eff, into);
@@ -60,6 +61,7 @@
view2d.render(vs, plane, into, into, box2paper);
+ if (dbg) pa("renderBuoy..DONE");
return vs.coords.translate(into, rect.x / scale, rect.y / scale);
}
}
Index: fenfire/org/fenfire/view/buoy/PPConnector.java
diff -u fenfire/org/fenfire/view/buoy/PPConnector.java:1.7
fenfire/org/fenfire/view/buoy/PPConnector.java:1.8
--- fenfire/org/fenfire/view/buoy/PPConnector.java:1.7 Thu May 1 20:22:40 2003
+++ fenfire/org/fenfire/view/buoy/PPConnector.java Fri May 2 20:57:00 2003
@@ -16,7 +16,7 @@
/** Make the kinds of links familiar from PP structure.
*/
public class PPConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: PPConnector.java,v 1.7 2003/05/02
00:22:40 mudyc Exp $";
+public static final String rcsid = "$Id: PPConnector.java,v 1.8 2003/05/03
00:57:00 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PPConnector::"+s); }
@@ -59,6 +59,7 @@
Object obj = iter.next();
Object plane = fen.constgraph.find1_X11(PAPER.contains, obj);
Pair anchor = new Pair(plane, getRect(obj));
+ if (dbg) pa("rect:"+getRect(obj));
l.link(1, cs, nodeType, new Pair(node, obj), anchor);
}
@@ -68,6 +69,7 @@
Object obj = iter.next();
Object plane = fen.constgraph.find1_X11(PAPER.contains, obj);
Pair anchor = new Pair(plane, getRect(obj));
+ if (dbg) pa("rect:"+getRect(obj));
l.link(-1, cs, nodeType, new Pair(obj, node), anchor);
}
}
@@ -75,6 +77,7 @@
public int dx = -100, dy = -200, w = 400, h = 400;
protected java.awt.Rectangle getRect(Object node) {
+ if (node == null) throw new Error("Impossible!");
int x = RDFUtil.getInt(fen, node, SPATIAL.coordX);
int y = RDFUtil.getInt(fen, node, SPATIAL.coordY);
return new java.awt.Rectangle(x+dx, y+dy, w, h);
Index: fenfire/org/fenfire/view/buoy/TransclusionConnector.java
diff -u fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.6
fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.7
--- fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.6 Thu May
1 20:22:40 2003
+++ fenfire/org/fenfire/view/buoy/TransclusionConnector.java Fri May 2
20:57:00 2003
@@ -20,8 +20,8 @@
/** Hang transclusion buoys.
*/
public class TransclusionConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: TransclusionConnector.java,v 1.6
2003/05/02 00:22:40 mudyc Exp $";
- public static boolean dbg = true;
+public static final String rcsid = "$Id: TransclusionConnector.java,v 1.7
2003/05/03 00:57:00 mudyc Exp $";
+ public static boolean dbg = false;
private static void pa(String s) {
System.out.println("TransclusionConnector:: "+s); }
@@ -62,7 +62,8 @@
DefaultVobMatcher m = (DefaultVobMatcher)vs.matcher;
if(dbg) pa("Trying transclusion addbuoys");
if(mn2d.getView2D() == normalNodeNodeType.getView2D()) {
- pa("TransclusionConnector: canvas -> scrolls");
+ if (dbg)
+ pa("TransclusionConnector: canvas -> scrolls");
// Loop over the placed nodes' keys
for(Iterator i=m.getKeys(parentCs).iterator(); i.hasNext();) {
Object key = i.next();
@@ -88,7 +89,8 @@
}
} else if(mn2d.getView2D() == pageImageScrollNodeType.getView2D()) {
- pa("TransclusionConnector: Pagescroll -> outside");
+ if (dbg)
+ pa("TransclusionConnector: Pagescroll -> outside");
for(Iterator i=m.getKeys(parentCs).iterator(); i.hasNext();) {
Object key = i.next();
if(!(key instanceof PageImageSpan)) continue;
- [Gzz-commits] fenfire docs/pegboard/canvas_text--mudyc/peg.rs...,
Matti Katila <=