[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire Space.java impl/AbstractSpa...
From: |
Matti Katila |
Subject: |
[Gzz-commits] fenfire/org/fenfire Space.java impl/AbstractSpa... |
Date: |
Fri, 04 Apr 2003 18:25:06 -0500 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/04/04 18:25:06
Modified files:
org/fenfire : Space.java
org/fenfire/impl: AbstractSpace.java
org/fenfire/modules/pp: PPCanvasCursor.java Pp.java
UniquePaperVob.java
org/fenfire/view: NodePlacementHook.java SpatialPlane.java
org/fenfire/view/buoy: BuoyAdaptor.java
Log message:
twiddling around..
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/Space.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/AbstractSpace.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasCursor.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/UniquePaperVob.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/NodePlacementHook.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.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/BuoyAdaptor.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/Space.java
diff -u fenfire/org/fenfire/Space.java:1.3 fenfire/org/fenfire/Space.java:1.4
--- fenfire/org/fenfire/Space.java:1.3 Mon Mar 31 07:37:47 2003
+++ fenfire/org/fenfire/Space.java Fri Apr 4 18:25:06 2003
@@ -14,7 +14,7 @@
*/
public interface Space {
-String rcsid = "$Id: Space.java,v 1.3 2003/03/31 12:37:47 mudyc Exp $";
+String rcsid = "$Id: Space.java,v 1.4 2003/04/04 23:25:06 mudyc Exp $";
/** There are many plases where model is needed
* and this provides it.
@@ -24,6 +24,11 @@
/** XXX
*/
Enfilade1D getEnfilade(RDFNode node);
+
+ /** XXX
+ */
+ boolean isTextNode(RDFNode node);
+
/** Get a subject node by its ID.
* @diagram zzstruct
Index: fenfire/org/fenfire/impl/AbstractSpace.java
diff -u fenfire/org/fenfire/impl/AbstractSpace.java:1.4
fenfire/org/fenfire/impl/AbstractSpace.java:1.5
--- fenfire/org/fenfire/impl/AbstractSpace.java:1.4 Mon Mar 31 09:29:15 2003
+++ fenfire/org/fenfire/impl/AbstractSpace.java Fri Apr 4 18:25:06 2003
@@ -23,7 +23,7 @@
*
*/
/*
- * Written by Tuomas Lukka and Tuukka Hastrup
+ * Written by Tuomas Lukka, Tuukka Hastrup and Matti J. Katila
*/
package org.fenfire.impl;
@@ -31,7 +31,7 @@
import org.fenfire.util.*;
import org.fenfire.vocab.*;
import org.nongnu.alph.*;
-
+import java.util.*;
import com.hp.hpl.mesa.rdf.jena.vocabulary.RDF;
import com.hp.hpl.mesa.rdf.jena.model.*;
import com.hp.hpl.mesa.rdf.jena.common.*;
@@ -43,7 +43,7 @@
*/
public abstract class AbstractSpace implements Space{
-public static final String rcsid = "$Id: AbstractSpace.java,v 1.4 2003/03/31
14:29:15 mudyc Exp $";
+public static final String rcsid = "$Id: AbstractSpace.java,v 1.5 2003/04/04
23:25:06 mudyc Exp $";
private static void pa(String s) {
System.out.println("AbstractSpace::"+s); }
protected ModularNodeTexter nodeTexter;
@@ -72,6 +72,18 @@
}
+ public boolean isTextNode(RDFNode node) {
+ Enfilade1D enf = getEnfilade(node);
+ if (enf == null) return false;
+
+ ArrayList l = (ArrayList)enf.getList();
+ for (int i=0; i<l.size(); i++) {
+ if (((Span)l.get(i)) instanceof TextSpan)
+ continue;
+ else return false;
+ }
+ return true;
+ }
/*
public Dim getDim(String s) {
Index: fenfire/org/fenfire/modules/pp/PPCanvasCursor.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.2
fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.3
--- fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.2 Mon Mar 31
07:37:47 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasCursor.java Fri Apr 4 18:25:06 2003
@@ -23,7 +23,7 @@
/** XXX
*/
public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.2 2003/03/31
12:37:47 mudyc Exp $";
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.3 2003/04/04
23:25:06 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("PPCanvasCursor::"+s); }
@@ -163,9 +163,9 @@
int focusCtr = vs.matcher.getCS("FocusCtr");
int zo = (int)(zoom * 100000);
- int geometry = vs.orthoCS(focusCtr, "FocusGeometry",0, zo,0, panx,
pany);
+ int geometry = vs.orthoCS(0, "FocusGeometry",0, zo,0, panx, pany);
- vs.map.put(new UniquePaperVob(URN5Namespace.instance.generateId()),
into, geometry);
+ //vs.map.put(new
UniquePaperVob(URN5Namespace.instance.generateId()), into, geometry);
(new SpatialPlane(PP.noteType, PP.contains)).renderAWT(vs, into,
geometry, node, space, hook);
}
}
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.1
fenfire/org/fenfire/modules/pp/Pp.java:1.2
--- fenfire/org/fenfire/modules/pp/Pp.java:1.1 Mon Mar 31 07:37:47 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java Fri Apr 4 18:25:06 2003
@@ -8,6 +8,7 @@
import org.fenfire.view.buoy.*;
import org.nongnu.libvob.*;
+import org.nongnu.libvob.impl.*;
import org.nongnu.libvob.buoy.*;
import org.nongnu.libvob.impl.DefaultVobMatcher;
import org.nongnu.libvob.vobs.*;
@@ -28,7 +29,7 @@
public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.1 2003/03/31 12:37:47
mudyc Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.2 2003/04/04 23:25:06
mudyc Exp $";
public static final boolean dbg = true;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.out.println("Pp::"+s); }
@@ -56,10 +57,21 @@
String paper = ppAct.newPaper();
String note = ppAct.newNote(paper, 0,0, "A test note");
+
String paper2 = ppAct.newPaper();
String note2 = ppAct.newNote(paper2, 0,0, "A test note");
ppAct.assocNotes(note, 1, note2);
+ note = ppAct.newNote(paper, 10,10, "10 10");
+ ppAct.assocNotes(note, 1, note2);
+ note = ppAct.newNote(paper, -10,10, "-10 10");
+ ppAct.assocNotes(note, 1, note2);
+ note = ppAct.newNote(paper, -10,-10, "-10 -10");
+ ppAct.assocNotes(note, 1, note2);
+ note = ppAct.newNote(paper, 10,-10, "10 -10");
+ ppAct.assocNotes(note, 1, note2);
+
+
accursed = space.getModel().getResource(note);
@@ -112,13 +124,13 @@
pa("Mouse: " + m);
VobScene vs = screen.getVobSceneForEvents();
- int cs = vs.coords.getCSAt(0, m.getX(), m.getY(),
- null);
- pa("CS: "+cs);
- if (cs < 0) return;
-
+ vs.map.dump();
+ int cs = vs.coords.getCSAt(0, m.getX(), m.getY(), null);
+ pa("CS: "+cs+" at x: "+m.getX()+", y: "+m.getY() );
+ if (cs < 0) return;
+ AbstractUpdateManager.setNoAnimation();
AbstractUpdateManager.chg();
}
public void setScreen(Screen s) { this.screen = s; }
@@ -135,31 +147,33 @@
private float ctrX=0, ctrY=0;
private VobScene curVs = null;
+ private int focusCtr = -1;
private void render(VobScene vs) {
curVs = vs;
vs.map.put(new SolidBackdropVob(Color.lightGray));
+
+ int tmp = vs.orthoBoxCS(0, "Nothing", 100,0,0, 1,1,vs.size.width,
vs.size.height);
+ vs.activate(tmp);
float width = (float)vs.size.getWidth() * 3.f/5;
float height = (float)vs.size.getHeight() * 3.f/5;
ctrX = ((float)vs.size.width)/2;
ctrY = ((float)vs.size.height)/2;
- int focusCtr = vs.translateCS(0, "FocusCtr", ctrX,ctrY);
+ focusCtr = vs.translateCS(0, "FocusCtr", ctrX,ctrY);
+ //vs.activate(focusCtr);
float x = -width/2;
- int frameCS = vs.orthoBoxCS(focusCtr, "FocusFrame", 10,
+ int frameCS = vs.orthoBoxCS(focusCtr, "FocusFrame", 0,
x, -height/2, 1, 1,
width, height);
vs.activate(frameCS);
+ pa("frame: "+frameCS+", focus: "+focusCtr+", tmp: "+tmp);
- if (focus == null) {
- focus = adaptor.createMainNode(null, accursed, this);
- }
if (focus == null)
- pa("Foo");
+ focus = adaptor.createMainNode(null, accursed, this);
focus.renderMain(vs, frameCS);
-
}
// ------------------------------------------------------------
@@ -168,28 +182,33 @@
public void link(int dir, int anchorCS, BuoyViewNodeType otherNode,
Object linkId, Object otherAnchor) {
+ OrthoCoorder c = (OrthoCoorder)curVs.coords;
int anchorUnit = curVs.unitSqCS(anchorCS, "UN");
int anchorCenter = curVs.translateCS(anchorUnit, "TR55", 0.5f, 0.5f);
float r = ctrY * 0.9f;
int buoyCS;
- /*
+
if (dir < 0){
- buoyCS = curVs.coords.buoyOnCircle(0, anchorCenter,
- ctrX, ctrY, r,
- ctrX-r, ctrY,
- .1);
+ buoyCS = c.buoyOnCircle(focusCtr, anchorCenter,
+ ctrX, ctrY, r,
+ ctrX-r, ctrY,
+ 50,50);
} else {
- buoyCS = curVs.coords.buoyOnCircle(0, anchorCenter,
- ctrX, ctrY, r,
- ctrX+r, ctrY,
- .1);
+ buoyCS = c.buoyOnCircle(focusCtr, anchorCenter,
+ ctrX, ctrY, r,
+ ctrX+r, ctrY,
+ 50,50);
}
- */
- pa("link!!!");
-
-
+ float[] fl = new float[3];
+ c.getSqSize(buoyCS, fl);
+ pa("size: "+fl[0]+", "+fl[1]);
+ fl = c.transformPoints3(buoyCS, new float[3], null);
+ pa("transform: "+ fl[0] + ", "+fl[1]+", "+fl[2]);
+ curVs.put(new RectBgVob(), buoyCS);
+
+ pa("link!!!");
}
Index: fenfire/org/fenfire/modules/pp/UniquePaperVob.java
diff -u fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.1
fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.2
--- fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.1 Mon Mar 31
07:37:47 2003
+++ fenfire/org/fenfire/modules/pp/UniquePaperVob.java Fri Apr 4 18:25:06 2003
@@ -13,9 +13,9 @@
* surrounded by a rectangle of the current foreground color.
*/
public class UniquePaperVob extends Vob {
-public static final String rcsid = "$Id: UniquePaperVob.java,v 1.1 2003/03/31
12:37:47 mudyc Exp $";
+public static final String rcsid = "$Id: UniquePaperVob.java,v 1.2 2003/04/04
23:25:06 mudyc Exp $";
public static boolean dbg = false;
- private static void pa(String s) { System.err.println(s); }
+ private static void pa(String s) {
System.out.println("UniquePaperVob::"+s); }
private final Object uniqId;
@@ -44,7 +44,7 @@
int panx = geom.width, pany = geom.height;
pa("mx: "+mx+", gx: "+geom.x+", panx: "+panx+", pany: "+pany);
- float zoom = ((float)(geom.x - mx))/100000;
+ float zoom = ((float)(geom.x))/100000;
int gx = geom.x;
pa("Zoom: "+zoom);
Index: fenfire/org/fenfire/view/NodePlacementHook.java
diff -u fenfire/org/fenfire/view/NodePlacementHook.java:1.1
fenfire/org/fenfire/view/NodePlacementHook.java:1.2
--- fenfire/org/fenfire/view/NodePlacementHook.java:1.1 Tue Mar 25 19:36:06 2003
+++ fenfire/org/fenfire/view/NodePlacementHook.java Fri Apr 4 18:25:06 2003
@@ -7,9 +7,9 @@
/** An interface for code to be run when a cell has been placed in a box.
*/
public interface NodePlacementHook {
-String rcsid = "$Id: NodePlacementHook.java,v 1.1 2003/03/26 00:36:06 mudyc
Exp $";
+String rcsid = "$Id: NodePlacementHook.java,v 1.2 2003/04/04 23:25:06 mudyc
Exp $";
/** A node was placed.
*/
// XXX void placed(RDFNode node, VobScene sc, int b, ViewContext context);
- void placed(RDFNode node, VobScene sc, int b);
+ void placed(RDFNode node, VobScene vs, int b);
}
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.2
fenfire/org/fenfire/view/SpatialPlane.java:1.3
--- fenfire/org/fenfire/view/SpatialPlane.java:1.2 Mon Mar 31 09:29:15 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java Fri Apr 4 18:25:06 2003
@@ -26,7 +26,7 @@
*/
public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.2 2003/03/31
14:29:15 mudyc Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.3 2003/04/04
23:25:06 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("SpatialPlane::"+s);
}
@@ -107,6 +107,8 @@
drawFrame = true;
}
+ hook.placed(n, vs, box);
+ pa("node placed!");
//if (drawFrame)
// vs.map.put(frame, box);
Index: fenfire/org/fenfire/view/buoy/BuoyAdaptor.java
diff -u fenfire/org/fenfire/view/buoy/BuoyAdaptor.java:1.1
fenfire/org/fenfire/view/buoy/BuoyAdaptor.java:1.2
--- fenfire/org/fenfire/view/buoy/BuoyAdaptor.java:1.1 Mon Mar 31 07:37:47 2003
+++ fenfire/org/fenfire/view/buoy/BuoyAdaptor.java Fri Apr 4 18:25:06 2003
@@ -41,7 +41,7 @@
*/
public class BuoyAdaptor implements BuoyViewNodeType {
public static boolean dbg = false;
- private static void pa(String s) { System.out.println("BuoyAdaptor:"+s); }
+ private static void pa(String s) { System.out.println("BuoyAdaptor::"+s); }
/** The node node types used by the current instance.
*/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire Space.java impl/AbstractSpa...,
Matti Katila <=