[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire/modules/pp PPCanvasCursor.j...
From: |
Matti Katila |
Subject: |
[Gzz-commits] fenfire/org/fenfire/modules/pp PPCanvasCursor.j... |
Date: |
Tue, 08 Apr 2003 10:54:14 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/04/08 10:54:14
Modified files:
org/fenfire/modules/pp: PPCanvasCursor.java PPCanvasNode.java
Pp.java
Log message:
fixes..
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasCursor.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/PPCanvasNode.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/Pp.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/modules/pp/PPCanvasCursor.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.4
fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.5
--- fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.4 Sat Apr 5
15:26:34 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasCursor.java Tue Apr 8 10:54:14 2003
@@ -23,7 +23,7 @@
/** XXX
*/
public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.4 2003/04/05
20:26:34 mudyc Exp $";
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.5 2003/04/08
14:54:14 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("PPCanvasCursor::"+s); }
@@ -102,14 +102,16 @@
private NodePlacementHook hook;
private GraphicsAPI.Window window;
private Space space;
-
+ private NodeView nodeview;
public PPCanvasCursor(RDFNode node,
NodePlacementHook hook,
- GraphicsAPI.Window w, Space space) {
+ GraphicsAPI.Window w,
+ Space space, NodeView nv) {
this.node = node;
this.hook = hook;
this.window = w;
this.space = space;
+ this.nodeview = nv;
/*
SimpleVStreamTexter sct = (SimpleVStreamTexter)space.getNodeTexter();
@@ -162,7 +164,8 @@
int geometry = vs.orthoCS(0, "FocusGeometry",0, zo,0, panx, pany);
vs.map.put(new UniquePaperVob(URN5Namespace.instance.generateId()),
into, geometry);
- (new SpatialPlane(PP.noteType, PP.contains)).renderAWT(vs, into,
geometry, node, space, hook);
+ (new SpatialPlane(PP.noteType, PP.contains)).renderAWT(vs, into,
geometry,
+ node,
nodeview, space.getModel(),hook);
}
}
Index: fenfire/org/fenfire/modules/pp/PPCanvasNode.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.4
fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.5
--- fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.4 Mon Mar 31
07:37:47 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasNode.java Tue Apr 8 10:54:14 2003
@@ -20,15 +20,17 @@
import com.hp.hpl.mesa.rdf.jena.vocabulary.*;
public class PPCanvasNode implements NodeBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.4 2003/03/31
12:37:47 mudyc Exp $";
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.5 2003/04/08
14:54:14 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PPCanvasNode::"+s);
}
private Space space;
private GraphicsAPI.Window win;
- public PPCanvasNode(Space s, GraphicsAPI.Window w) {
+ private NodeView nodeview;
+ public PPCanvasNode(Space s, GraphicsAPI.Window w, NodeView nodeview) {
this.space = s;
this.win = w;
+ this.nodeview = nodeview;
}
/** The zoom to be used for the buoys.
@@ -37,7 +39,7 @@
/** The zoom to be used for the link creation buoys.
*/
- public float linkbuoyZoom = .5f;
+ public float linkBuoyZoom = .5f;
/** True if this view "owns" a certain node.
*/
@@ -111,7 +113,7 @@
}
public BuoyViewMainNode createMainNode(RDFNode node, Object content,
NodePlacementHook hook) {
- return new PPCanvasCursor(node, hook, win, space);
+ return new PPCanvasCursor(node, hook, win, space, nodeview);
}
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.3
fenfire/org/fenfire/modules/pp/Pp.java:1.4
--- fenfire/org/fenfire/modules/pp/Pp.java:1.3 Sat Apr 5 15:26:35 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java Tue Apr 8 10:54:14 2003
@@ -29,7 +29,7 @@
public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.3 2003/04/05 20:26:35
mudyc Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.4 2003/04/08 14:54:14
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); }
@@ -54,6 +54,7 @@
new Enfilade1DImpl.Enfilade1DImplMaker()),
new ModelMem());
ppAct = new PPActionsImpl(space);
+ nodeview = new DefaultNodeView(space);
String paper = ppAct.newPaper();
String note = ppAct.newNote(paper, 0,0, "A test note");
@@ -91,7 +92,7 @@
adaptor.nodes = new NodeBuoyViewNodeType[]{
- new PPCanvasNode(space, scr.window)};
+ new PPCanvasNode(space, scr.window, nodeview)};
adaptor.nodeLinkers = new BuoyNodeViewLinker[]{
new PPLinker(space)};
@@ -138,6 +139,16 @@
}
};
+ // --------------------------------------------------
+ // WievContext
+
+ public class PPView implements NodeView.Context {
+ public void nodeIsToBePlaced(RDFNode node, NodeView nv) {
+ // do nothing
+ }
+ }
+
+ private NodeView nodeview = null;
// --------------------------------------------------
// Let's get in action!
@@ -146,12 +157,15 @@
private float ctrX=0, ctrY=0;
private VobScene curVs = null;
private int focusCtr = -1;
+
+ private float focusSizeFactor = 3f/5;
+
private void render(VobScene vs) {
curVs = vs;
vs.map.put(new SolidBackdropVob(Color.lightGray));
- float width = (float)vs.size.getWidth() * 3.f/5;
- float height = (float)vs.size.getHeight() * 3.f/5;
+ float width = (float)vs.size.getWidth() * focusSizeFactor;
+ float height = (float)vs.size.getHeight() * focusSizeFactor;
ctrX = ((float)vs.size.width)/2;
ctrY = ((float)vs.size.height)/2;
@@ -177,17 +191,20 @@
float r = ctrY * 0.9f;
int buoyCS;
+
+ float min = (curVs.size.width * focusSizeFactor) / 7;
+ float max = (curVs.size.height * focusSizeFactor) / 3;
if (dir < 0){
buoyCS = c.buoyOnCircle(focusCtr, anchorCenter,
ctrX, ctrY, r,
ctrX-r, ctrY,
- 50,50);
+ min, max);
} else {
buoyCS = c.buoyOnCircle(focusCtr, anchorCenter,
ctrX, ctrY, r,
ctrX+r, ctrY,
- 50,50);
+ min, max);
}
float[] fl = new float[3];
c.getSqSize(buoyCS, fl);
- [Gzz-commits] fenfire/org/fenfire/modules/pp PPCanvasCursor.j...,
Matti Katila <=