[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire modules/pp/PPActionsImpl.te...
From: |
Matti Katila |
Subject: |
[Gzz-commits] fenfire/org/fenfire modules/pp/PPActionsImpl.te... |
Date: |
Tue, 15 Apr 2003 10:57:14 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/04/15 10:57:14
Modified files:
org/fenfire/modules/pp: PPActionsImpl.test
org/fenfire/view: SpatialPlane.java
Log message:
waiting for tuomas..
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.test
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.4
fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.5
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.4 Mon Mar 31
07:37:47 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.test Tue Apr 15 10:57:14 2003
@@ -1,150 +1,2 @@
-#(c): Matti Katila
+# to be implemented
-from org.fenfire.vocab import PP, SPATIAL, ALPH
-from org.fenfire.modules.pp import *
-from org.fenfire.impl import ModularSpace, SimpleVStreamTexter
-from org.fenfire.util import URN5Namespace
-from org.nongnu.alph import impl
-from com.hp.hpl.mesa.rdf import jena
-from com.hp.hpl.mesa.rdf.jena.vocabulary import RDF
-
-def setUp():
- global model, space, ppact
- model = jena.mem.ModelMem()
- space = ModularSpace(SimpleVStreamTexter(
- impl.FakeSpanMaker(),
- impl.Enfilade1DImpl.Enfilade1DImplMaker()),
- model)
- ppact = PPActionsImpl(space)
-
-def checkIter(slctr):
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
- return stmt
-
-def testNewPaper():
- paper = ppact.newPaper()
- assert paper != ''
-
- slctr = jena.common.SelectorImpl(None, RDF.type, PP.paperType)
- stmt = checkIter(slctr)
- assert stmt.getSubject().toString() == paper
-
- # XXX does not check creation time
-
-def testNewNote():
- paper = URN5Namespace.instance.generateId()
- paperRes = jena.common.ResourceImpl(paper)
- note = ppact.newNote(paper, -123, 456, 'This is a new note')
- noteRes = jena.common.ResourceImpl(note)
-
- # type test - NoteType
- slctr = jena.common.SelectorImpl(noteRes, RDF.type, PP.noteType)
- stmt = checkIter(slctr)
- assert stmt.getSubject().toString() == note
-
- # has note any content?
- slctr = jena.common.SelectorImpl(noteRes, RDF.type, ALPH.cloneType)
- stmt = checkIter(slctr)
- assert stmt.getSubject().toString() == note
-
- # is node on paper?
- slctr = jena.common.SelectorImpl(paperRes, PP.contains, noteRes)
- stmt = checkIter(slctr)
- assert stmt.getSubject().toString() == paper
- assert stmt.getObject().toString() == note
-
- # x coord ok?
- slctr = jena.common.SelectorImpl(noteRes, SPATIAL.coordX, None)
- stmt = checkIter(slctr)
- assert stmt.getObject().toString() == '-123'
-
- # y coord ok?
- slctr = jena.common.SelectorImpl(noteRes, SPATIAL.coordY, None)
- stmt = checkIter(slctr)
- assert stmt.getObject().toString() == '456'
-
- # depth ok?
- slctr = jena.common.SelectorImpl(noteRes, PP.depth, None)
- stmt = checkIter(slctr)
- assert stmt.getObject().toString() == '10'
-
-def testAssoc():
- assocPos()
- assocNeg()
-
-def assocPos():
- paper = URN5Namespace.instance.generateId()
- noteA = ppact.newNote(paper, 12, 45, 'This is A')
- noteARes = jena.common.ResourceImpl(noteA)
- noteB = ppact.newNote(paper, 23, 56, 'This is B')
- noteBRes = jena.common.ResourceImpl(noteB)
-
- ppact.assocNotes(noteA, 1, noteB)
-
- # noteA -> ?
- slctr = jena.common.SelectorImpl(None, PP.association, noteARes)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 0
-
- slctr = jena.common.SelectorImpl(noteARes, PP.association, None)
- stmt = checkIter(slctr)
- assert stmt.getObject().toString() == noteB
-
- # ? <- noteB
- slctr = jena.common.SelectorImpl(noteBRes, PP.association, None)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 0
-
- slctr = jena.common.SelectorImpl(None, PP.association, noteBRes)
- stmt = checkIter(slctr)
- assert stmt.getSubject().toString() == noteA
-
-
-def assocNeg():
- paper = URN5Namespace.instance.generateId()
- noteA = ppact.newNote(paper, 12, 45, 'This is A')
- noteARes = jena.common.ResourceImpl(noteA)
- noteB = ppact.newNote(paper, 23, 56, 'This is B')
- noteBRes = jena.common.ResourceImpl(noteB)
-
- ppact.assocNotes(noteA, -1, noteB)
-
- # noteA -> ?
- slctr = jena.common.SelectorImpl(noteARes, PP.association, None)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 0
-
- slctr = jena.common.SelectorImpl(None, PP.association, noteARes)
- stmt = checkIter(slctr)
- assert stmt.getSubject().toString() == noteB
-
- # ? <- noteB
- slctr = jena.common.SelectorImpl(None, PP.association, noteBRes)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 0
-
- slctr = jena.common.SelectorImpl(noteBRes, PP.association, None)
- stmt = checkIter(slctr)
- assert stmt.getObject().toString() == noteA
-
-
-def testInsertAndDeleteText():
- paper = URN5Namespace.instance.generateId()
- note = ppact.newNote(paper, -12, -45, 'This is a test')
- noteRes = jena.common.ResourceImpl(note)
- print note
-
- ppact.insertText(note, 5, 'FOO! ')
-
- # insert test
- #assert stmt.getObject().toString() == 'This FOO! is a test'
-
- #delete test
- ppact.deleteText(note, 5, 8)
- #assert stmt.getObject().toString() == 'This ! is a test'
-
- print 'XXX untested, unimplemented'
-
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.13
fenfire/org/fenfire/view/SpatialPlane.java:1.14
--- fenfire/org/fenfire/view/SpatialPlane.java:1.13 Tue Apr 15 10:43:42 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java Tue Apr 15 10:57:14 2003
@@ -25,7 +25,7 @@
*/
public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.13 2003/04/15
14:43:42 mudyc Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.14 2003/04/15
14:57:14 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("SpatialPlane::"+s);
}
@@ -137,89 +137,29 @@
float[] bs = new float[2];
cursorBox = -1;
- //Object node = nodeview.context.getAccurse();
-
- /*
- NodeView orig_nv = context.getNodeView();
-
- Selector slctr = new SelectorImpl(node, PP.contains, (RDFNode) null);
- StmtIterator iter = model.listStatements(slctr);
- Statement stmt = null;
- while (iter.hasNext()) {
- RDFNode node = ((Statement)iter.next()).getSubject();
-
- SimpleVStreamTexter sct =
(SimpleVStreamTexter)space.getCellTexter();
- Enfilade1DImpl enf = (Enfilade1DImpl)sct.getEnfilade(node, null);
- java.util.List enfList= enf.getList();
- Span1D span = (Span1D) enfList.get(0);
-
- if (span instanceof TextSpan) {
- if(hook != null)
- context.setCellView(new NodeViewPlugin(orig_cv, hook));
- else
- context.setCellView(orig_cv);
- } // PageSpan!!!
- else {
- if(hook != null)
- context.setCellView(
- new CellViewPlugin(new
PageSpanCellView(), hook));
- else
- context.setCellView(new PageSpanCellView());
- drawFrame = true;
- }
- }
-
- NodeView nv = context.getNodeView();
-
- Selector slctr = new SelectorImpl((Resource)node, PP.contains,
(RDFNode) null);
- StmtIterator iter = model.listStatements(slctr);
- Statement stmt = null;
+ Iterator iter = fen.constgraph.findN_11X_Iter(container, cont);
while (iter.hasNext()) {
- stmt = iter.next();
- Resource note = (Resource)stmt.getObject();
-
- int[] coords = new int[2];
+ Object n = iter.next();
// get coords
- coords[0] = ShortRDF.getInt(model, note, SPATIAL.coordX);
- coords[1] = ShortRDF.getInt(model, note, SPATIAL.coordY);
-
- // get size XXX
- boolean drawFrame = false;
-
- */
- /*
- from nodeview nv.getSize(note, bs)
-
- */
+ int[] coords = new int[2];
+ coords[0] = RDFUtil.getInt(fen, n, SPATIAL.coordX);
+ coords[1] = RDFUtil.getInt(fen, n, SPATIAL.coordY);
- /*
- Pair matchKey = new Pair(node, note);
-
- int box;
- box = vs.orthoBoxCS(into, matchKey, 0,
- coords[0], coords[1],
- 1, 1, bs[0], bs[1]);
+ nodeview.getSize(n, bs);
+ Pair matchKey = new Pair(container, n);
+ int box = vs.orthoCS(into, matchKey, 0, coords[0], coords[1],
bs[0], bs[1]);
+ nodeview.place(n, vs, box);
+ if (hook != null) hook.placed(n, vs, box);
- if (drawFrame)
- vs.map.put(frame, box);
-
- if (vs.coords instanceof GLVobCoorder && cullCS > 0) {
- int cull = ((GLVobCoorder)vs.coords).cull(box, cullCS);
- vs.matcher.add(box, cull, matchKey+"cull");
- box = cull;
- }
-
- // XXX cv.place(item, vs, box, context);
- vs.activate(box);
-
- // XXX
- // if(item.equals(cur))
- // cursorBox = box;
+ // XXX?
+ //vs.activate(box);
+ if(current.equals(n))
+ cursorBox = box;
}
- */
+
}
}
- [Gzz-commits] fenfire/org/fenfire modules/pp/PPActionsImpl.te...,
Matti Katila <=