[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire ./build.xml org/fenfire/demo/buoyoing.p...
|
From: |
Matti Katila |
|
Subject: |
[Gzz-commits] fenfire ./build.xml org/fenfire/demo/buoyoing.p... |
|
Date: |
Thu, 01 May 2003 20:22:41 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/05/01 20:22:41
Modified files:
. : build.xml
org/fenfire/demo: buoyoing.py
org/fenfire/modules/pp: PPActionsImpl.java PPActionsImpl.test
PPCanvasCursor.java Pp.java
SinglePaper.java
org/fenfire/view: CanvasView2D.java PaperView2D.java
org/fenfire/view/buoy: PPConnector.java
TransclusionConnector.java
org/fenfire/vocab: PP.java RDF.java
Added files:
org/fenfire/modules/pp: RSTActions.java RSTActionsImpl.java
RSTActionsImpl.test
org/fenfire/vocab: PAPER.java
Log message:
some text canvas work
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/build.xml.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/RSTActions.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/RSTActionsImpl.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/RSTActionsImpl.test?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.java.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.test.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasCursor.java.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/SinglePaper.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CanvasView2D.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PaperView2D.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/PPConnector.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/TransclusionConnector.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/vocab/PAPER.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/vocab/PP.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/vocab/RDF.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: fenfire/build.xml
diff -u fenfire/build.xml:1.34 fenfire/build.xml:1.35
--- fenfire/build.xml:1.34 Wed Apr 23 11:37:14 2003
+++ fenfire/build.xml Thu May 1 20:22:40 2003
@@ -32,6 +32,7 @@
<target name="compilermi" depends="compilejava">
<rmic base="${build}" includes="**/PPActionsImpl*.class"/>
+ <rmic base="${build}" includes="**/RSTActionsImpl*.class"/>
</target>
<target name="test" depends="test-awt,test-gl"/>
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.35
fenfire/org/fenfire/demo/buoyoing.py:1.36
--- fenfire/org/fenfire/demo/buoyoing.py:1.35 Wed Apr 30 08:13:43 2003
+++ fenfire/org/fenfire/demo/buoyoing.py Thu May 1 20:22:40 2003
@@ -68,6 +68,7 @@
fen.enfiladeOverlap = fen.txt.getTransclusionIndex()
ppAct = ff.modules.pp.PPActionsImpl(fen)
+rst = ff.modules.pp.RSTActionsImpl(fen)
# Now, before reading the xu stuff, render something
# to try to prevent NV driver
@@ -79,15 +80,10 @@
w.renderStill(vs, 0)
if 1:
- global linkid1
-
- # try out some notes..
- #pg0 = pagescrolls[0]
-
- #wholepage = pg0.getCurrent().subSpan(0,1)
- #span = wholepage.subArea(70, 50, 400, 100)
+ #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, ''))
span = sc.getCurrent().getPage(0).subArea(100, 100, 300, 200);
@@ -99,6 +95,23 @@
ppAct.assocNotes(note1, 1, note2)
+ 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)
+ 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!'
+
textstyle = vob.GraphicsAPI.getInstance().getTextStyle("sans", 0, 24)
textnodeview = ff.view.TextNodeView(fen.txtfunc, textstyle, 1)
pagenodeview = ff.view.PageNodeView(fen.txtfunc)
@@ -109,11 +122,7 @@
view = ff.view.CanvasView2D(fen, nodeview)
view.cull = 1
paperview = ff.view.PaperView2D(vob.putil.demowindow.w, view)
-
irregu = ff.view.IrregularViewportView2D(paperview)
-# irregu = paperview
-
-# paperviewonly = ff.view.PaperView2D(vob.putil.demowindow.w, None)
ff.view.buoy.NodeType2D.effigy = 0
ff.view.buoy.NodeType2DFull.effigy = 0
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.23
fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.24
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.23 Fri Apr 25
07:19:39 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.java Thu May 1 20:22:40 2003
@@ -16,7 +16,7 @@
/** The implementation of PPActions.
*/
public class PPActionsImpl extends UnicastRemoteObject implements PPActions {
-public static final String rcsid = "$Id: PPActionsImpl.java,v 1.23 2003/04/25
11:19:39 tjl Exp $";
+public static final String rcsid = "$Id: PPActionsImpl.java,v 1.24 2003/05/02
00:22:40 mudyc Exp $";
public static final boolean dbg = false;
protected static void pa(String s) { System.out.println("PPActionsImpl:
"+s); }
@@ -93,18 +93,18 @@
if(dbg) {
pa("Before:");
- Iterator iter = fen.constgraph.findN_11X_Iter(paper, PP.contains);
+ Iterator iter = fen.constgraph.findN_11X_Iter(paper,
PAPER.contains);
while (iter.hasNext()) {
pa(" "+iter.next());
}
}
// and join note to paper
- fen.graph.add(paper, PP.contains, note);
+ fen.graph.add(paper, PAPER.contains, note);
if(dbg) {
pa("After:");
- Iterator iter = fen.constgraph.findN_11X_Iter(paper, PP.contains);
+ Iterator iter = fen.constgraph.findN_11X_Iter(paper,
PAPER.contains);
while (iter.hasNext()) {
pa(" "+iter.next());
}
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.test
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.7
fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.8
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.7 Sun Apr 27
16:19:24 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.test Thu May 1 20:22:40 2003
@@ -1,3 +1,4 @@
+# -*-python-*-
#/(to be implemented
from org import fenfire
Index: fenfire/org/fenfire/modules/pp/PPCanvasCursor.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.30
fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.31
--- fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.30 Mon Apr 28
07:17:16 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasCursor.java Thu May 1 20:22:40 2003
@@ -22,7 +22,7 @@
/** PPCanvas which has been selected/created to be the focus one.
*/
public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.30
2003/04/28 11:17:16 mudyc Exp $";
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.31
2003/05/02 00:22:40 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("PPCanvasCursor::"+s); }
@@ -96,7 +96,7 @@
Object node = context.getAccursed();
Object paper = node;
if (RDFUtil.isNodeType(fen, node, PP.Note)) {
- paper = fen.constgraph.find1_X11(PP.contains, node);
+ paper = fen.constgraph.find1_X11(PAPER.contains, node);
// draw "cursor"
float[] size = new float[2];
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.36
fenfire/org/fenfire/modules/pp/Pp.java:1.37
--- fenfire/org/fenfire/modules/pp/Pp.java:1.36 Mon Apr 28 07:17:16 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java Thu May 1 20:22:40 2003
@@ -28,7 +28,7 @@
public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.36 2003/04/28 11:17:16
mudyc Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.37 2003/05/02 00:22:40
mudyc Exp $";
public static final boolean dbg = false;
protected static void pa(String s) { System.out.println("Pp::"+s); }
@@ -196,7 +196,7 @@
Object paper = getAccursed();
if (RDFUtil.isNodeType(fen, getAccursed(), PP.Note)) {
- paper = fen.constgraph.find1_X11(getAccursed(), PP.contains);
+ paper = fen.constgraph.find1_X11(getAccursed(), PAPER.contains);
}
return paper.toString();
Index: fenfire/org/fenfire/modules/pp/SinglePaper.java
diff -u fenfire/org/fenfire/modules/pp/SinglePaper.java:1.14
fenfire/org/fenfire/modules/pp/SinglePaper.java:1.15
--- fenfire/org/fenfire/modules/pp/SinglePaper.java:1.14 Mon Apr 28
07:17:16 2003
+++ fenfire/org/fenfire/modules/pp/SinglePaper.java Thu May 1 20:22:40 2003
@@ -9,7 +9,7 @@
import org.nongnu.libvob.gl.*;
import org.nongnu.libvob.impl.gl.*;
-import org.fenfire.vocab.PP;
+import org.fenfire.vocab.*;
/** A single PP plane/paper, with given view context.
@@ -17,7 +17,7 @@
* the background and the vobs inside the plane.
*/
public class SinglePaper {
-private static final String rcsid = "$Id: SinglePaper.java,v 1.14 2003/04/28
11:17:16 mudyc Exp $";
+private static final String rcsid = "$Id: SinglePaper.java,v 1.15 2003/05/02
00:22:40 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("SinglePaper::"+s); }
@@ -55,7 +55,7 @@
private Fen fen;
private NodeView nv;
private GraphicsAPI.Window window;
- private SpatialPlane spatialplane = new SpatialPlane(PP.Note, PP.contains);
+ private SpatialPlane spatialplane = new SpatialPlane(PP.Note,
PAPER.contains);
// Visual characteristics of the virtual paper and ripple
Index: fenfire/org/fenfire/view/CanvasView2D.java
diff -u fenfire/org/fenfire/view/CanvasView2D.java:1.8
fenfire/org/fenfire/view/CanvasView2D.java:1.9
--- fenfire/org/fenfire/view/CanvasView2D.java:1.8 Tue Apr 29 20:40:17 2003
+++ fenfire/org/fenfire/view/CanvasView2D.java Thu May 1 20:22:40 2003
@@ -20,7 +20,7 @@
/** A View2D on a PP-like canvas.
*/
public class CanvasView2D extends View2D {
-public static final String rcsid = "$Id: CanvasView2D.java,v 1.8 2003/04/30
00:40:17 mudyc Exp $";
+public static final String rcsid = "$Id: CanvasView2D.java,v 1.9 2003/05/02
00:22:40 mudyc Exp $";
public static boolean dbg = true;
private static void pa(String s) { System.out.println("CanvasView2D::"+s);
}
@@ -42,8 +42,8 @@
paper2box);
Iterator iter = fen.constgraph.findN_11X_Iter(container,
- PP.contains);
-
+ PAPER.contains);
+ pa("Canvas begin");
while (iter.hasNext()) {
Object n = iter.next();
@@ -64,7 +64,10 @@
if(cull) {
cs = vs.cullCS(cs, "CULL", box2screen);
}
+ if (dbg) pa("place");
p.place(vs, cs);
+ if (dbg) pa("place ..DONE");
}
+ pa("Canvas DONE");
}
}
Index: fenfire/org/fenfire/view/PaperView2D.java
diff -u fenfire/org/fenfire/view/PaperView2D.java:1.8
fenfire/org/fenfire/view/PaperView2D.java:1.9
--- fenfire/org/fenfire/view/PaperView2D.java:1.8 Tue Apr 29 20:40:17 2003
+++ fenfire/org/fenfire/view/PaperView2D.java Thu May 1 20:22:40 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.8 2003/04/30
00:40:17 mudyc Exp $";
private static void pa(String s) { System.out.println("PaperView2D::"+s); }
public PaperMill paperMill;
Index: fenfire/org/fenfire/view/buoy/PPConnector.java
diff -u fenfire/org/fenfire/view/buoy/PPConnector.java:1.6
fenfire/org/fenfire/view/buoy/PPConnector.java:1.7
--- fenfire/org/fenfire/view/buoy/PPConnector.java:1.6 Tue Apr 29 20:45:18 2003
+++ fenfire/org/fenfire/view/buoy/PPConnector.java Thu May 1 20:22:40 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.6 2003/04/30
00:45:18 mudyc Exp $";
+public static final String rcsid = "$Id: PPConnector.java,v 1.7 2003/05/02
00:22:40 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PPConnector::"+s); }
@@ -57,7 +57,7 @@
Iterator iter = fen.constgraph.findN_11X_Iter(node, PP.association);
while (iter.hasNext()) {
Object obj = iter.next();
- Object plane = fen.constgraph.find1_X11(PP.contains, obj);
+ Object plane = fen.constgraph.find1_X11(PAPER.contains, obj);
Pair anchor = new Pair(plane, getRect(obj));
l.link(1, cs, nodeType, new Pair(node, obj), anchor);
}
@@ -66,7 +66,7 @@
iter = fen.constgraph.findN_X11_Iter(PP.association, node);
while (iter.hasNext()) {
Object obj = iter.next();
- Object plane = fen.constgraph.find1_X11(PP.contains, obj);
+ Object plane = fen.constgraph.find1_X11(PAPER.contains, obj);
Pair anchor = new Pair(plane, getRect(obj));
l.link(-1, cs, nodeType, new Pair(obj, node), anchor);
}
Index: fenfire/org/fenfire/view/buoy/TransclusionConnector.java
diff -u fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.5
fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.6
--- fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.5 Mon Apr
28 07:46:49 2003
+++ fenfire/org/fenfire/view/buoy/TransclusionConnector.java Thu May 1
20:22:40 2003
@@ -20,9 +20,9 @@
/** Hang transclusion buoys.
*/
public class TransclusionConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: TransclusionConnector.java,v 1.5
2003/04/28 11:46:49 tjl Exp $";
+public static final String rcsid = "$Id: TransclusionConnector.java,v 1.6
2003/05/02 00:22:40 mudyc Exp $";
public static boolean dbg = true;
- private static void pa(String s) { System.out.println("PPLinker:"+s); }
+ private static void pa(String s) {
System.out.println("TransclusionConnector:: "+s); }
private Fen fen;
@@ -101,7 +101,7 @@
for(Iterator nodes =
fen.enfiladeOverlap.getMatches(tmpEnf).iterator(); nodes.hasNext(); ) {
Object node = nodes.next();
if(dbg) pa("TRC: overlap "+node);
- Object plane = fen.constgraph.find1_X11(PP.contains, node);
+ Object plane = fen.constgraph.find1_X11(PAPER.contains,
node);
if(plane == null) {
if(dbg) pa("No plane!");
continue;
Index: fenfire/org/fenfire/vocab/PP.java
diff -u fenfire/org/fenfire/vocab/PP.java:1.3
fenfire/org/fenfire/vocab/PP.java:1.4
--- fenfire/org/fenfire/vocab/PP.java:1.3 Tue Apr 15 10:15:13 2003
+++ fenfire/org/fenfire/vocab/PP.java Thu May 1 20:22:41 2003
@@ -8,10 +8,15 @@
* notes can be associated together.
*/
public class PP {
-public static final String rcsid = "$Id: PP.java,v 1.3 2003/04/15 14:15:13
mudyc Exp $";
+public static final String rcsid = "$Id: PP.java,v 1.4 2003/05/02 00:22:41
mudyc Exp $";
protected static void pa(String s) { System.out.println("PP: "+s); }
// Propertys
+
+ /** This is deprecated by PAPER.contains
+ * @see PAPER
+ * @deprecated
+ */
static public Object contains;
static public Object association;
@@ -28,6 +33,7 @@
String unDef = "http://fenfire.org/vocabulary/undef.html";;
// Propertys
+ /** @deprecated */
contains = Nodes.get(ppVoc+"#contains");
association = Nodes.get(ppVoc + "#association");
Index: fenfire/org/fenfire/vocab/RDF.java
diff -u fenfire/org/fenfire/vocab/RDF.java:1.1
fenfire/org/fenfire/vocab/RDF.java:1.2
--- fenfire/org/fenfire/vocab/RDF.java:1.1 Tue Apr 15 06:56:33 2003
+++ fenfire/org/fenfire/vocab/RDF.java Thu May 1 20:22:41 2003
@@ -6,12 +6,12 @@
/** XXX
*/
public class RDF {
-public static final String rcsid = "$Id: RDF.java,v 1.1 2003/04/15 10:56:33
mudyc Exp $";
+public static final String rcsid = "$Id: RDF.java,v 1.2 2003/05/02 00:22:41
mudyc Exp $";
static public Object type;
static {
- String voc = "http://XXXXXXXXX/RDF";;
- type = Nodes.get(voc + "#type");
+ String voc = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";;
+ type = Nodes.get(voc + "type");
}
}
- [Gzz-commits] fenfire ./build.xml org/fenfire/demo/buoyoing.p...,
Matti Katila <=