[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire ./up.sh org/fenfire/modules/pp/PPCanvas...
|
From: |
Matti Katila |
|
Subject: |
[Gzz-commits] fenfire ./up.sh org/fenfire/modules/pp/PPCanvas... |
|
Date: |
Tue, 08 Apr 2003 16:05:03 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/04/08 16:05:03
Modified files:
. : up.sh
org/fenfire/modules/pp: PPCanvasCursor.java PPCanvasNode.java
Pp.java
org/fenfire/view: SpatialPlane.java
Log message:
more work for awt pp
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/up.sh.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasCursor.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasNode.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.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.5&tr2=1.6&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/modules/pp/PPCanvasCursor.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.5
fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.6
--- fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.5 Tue Apr 8
10:54:14 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasCursor.java Tue Apr 8 16:05:03 2003
@@ -23,7 +23,7 @@
/** XXX
*/
public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.5 2003/04/08
14:54:14 mudyc Exp $";
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.6 2003/04/08
20:05:03 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("PPCanvasCursor::"+s); }
@@ -161,7 +161,7 @@
// XXX SinglePaper.i(space, d, window, current).render(vs, into,
c2fCS, c2fCSInv, hook);
} else {
int zo = (int)(zoom * 100000);
- int geometry = vs.orthoCS(0, "FocusGeometry",0, zo,0, panx, pany);
+ int geometry = vs.orthoBoxCS(0, "FocusGeometry",0, zo,0, 1,1, panx,
pany);
vs.map.put(new UniquePaperVob(URN5Namespace.instance.generateId()),
into, geometry);
(new SpatialPlane(PP.noteType, PP.contains)).renderAWT(vs, into,
geometry,
@@ -198,8 +198,9 @@
if (m_state[2] == e.BUTTON1_MASK){
+ float[] pt = new float[] { e.getX(), e.getY(), 0 };
+
if (GraphicsAPI.getInstance() instanceof GLAPI) {
- float[] pt = new float[] { e.getX(), e.getY(), 0 };
// We must transform into Frame, and then the C2F coordinate
system
int mainctrCS =
((DefaultVobMatcher)oldVobScene.matcher).getCS(0, "Center");
@@ -219,9 +220,17 @@
// XXX current = current.h(d.contains);
AbstractUpdateManager.chg();
} else {
+ int focusFrame = oldVobScene.matcher.getCS("FocusFrame");
+ float box[] = new float[3];
+ box = oldVobScene.coords.transformPoints3(focusFrame, box,
null);
+ float size[] = new float[2];
+ oldVobScene.coords.getSqSize(focusFrame, size);
+ pa(panx+"pt: "+pt[0] +", "+box[0]);
+ panx -= ((pt[0] - box[0]) - size[0]/2)/ zoom;
+ pany -= ((pt[1] - box[1]) - size[1]/2)/ zoom;
-
-
+ // XXX current = current.h(d.contains);
+ AbstractUpdateManager.chg();
}
return false;
}
Index: fenfire/org/fenfire/modules/pp/PPCanvasNode.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.5
fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.6
--- fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.5 Tue Apr 8
10:54:14 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasNode.java Tue Apr 8 16:05:03 2003
@@ -9,6 +9,7 @@
import org.fenfire.view.*;
import org.fenfire.view.buoy.*;
import org.nongnu.libvob.*;
+import org.nongnu.libvob.impl.gl.*;
import org.nongnu.libvob.buoy.*;
import org.nongnu.storm.*;
@@ -20,7 +21,7 @@
import com.hp.hpl.mesa.rdf.jena.vocabulary.*;
public class PPCanvasNode implements NodeBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.5 2003/04/08
14:54:14 mudyc Exp $";
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.6 2003/04/08
20:05:03 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PPCanvasNode::"+s);
}
@@ -82,33 +83,37 @@
*/
public int renderBuoy(VobScene vs, int into, RDFNode node, Object content,
Object cachedSize){
- if (dbg) pa("renderBuoyCell:"+node);
-
int[] pan = getCoords(node);
+ float [] bs = new float[2];
+ nodeview.getSize(node, bs);
+ pan[0] += bs[0]/2;
+ pan[1] += bs[1]/2;
+
+ if (GraphicsAPI.getInstance() instanceof GLAPI) {
+ final int c2fCS =
+ vs.coords.ortho(0, 0, -pan[0]*buoyZoom, -pan[1]*buoyZoom,
buoyZoom, buoyZoom);
+ final int c2fCSInv =
+ vs.coords.ortho(0, 0, pan[0], pan[1], 1/buoyZoom, 1/buoyZoom);
+ vs.matcher.add(into, c2fCS, "C2F");
+ vs.matcher.add(into, c2fCSInv, "C2FINV");
+
+ //SinglePaper.i(space, d,win,c).render(vs, into, c2fCS, c2fCSInv,
null);
+ /*
+ int c2fCS = vs.orthoCS(into, "C2F",0,0,0, 10,10);
+ int c2fCSInv = vs.orthoCS(into, "C2FINV",0,0,0, 10,10);
+
+ setZoomPan(vs, into);
+ // XXX SinglePaper.i(space, d, window, current).render(vs, into,
c2fCS, c2fCSInv, hook);
+ */
+ } else {
+ int zo = (int)(buoyZoom * 100000);
+ int geometry = vs.orthoCS(0, "FocusGeometry",0, zo,0, pan[0],
pan[1]);
+
+ vs.map.put(new UniquePaperVob(URN5Namespace.instance.generateId()),
into, geometry);
+ (new SpatialPlane(PP.noteType, PP.contains)).renderAWT(vs, into,
geometry,
+ node,
nodeview, space.getModel(),null);
+ }
- SimpleVStreamTexter sct = (SimpleVStreamTexter)space.getNodeTexter();
- Enfilade1DImpl enf = (Enfilade1DImpl)sct.getEnfilade(node, null);
- java.util.List enfList= enf.getList();
- Span1D span = (Span1D) enfList.get(0);
-
- float [] bs = new float[3];
-
- //cv.getSize(c, ((ViewContext)new AbstractViewContext()), bs);
-
- //pan[0] += bs[0]/2;
- //pan[1] += bs[1]/2;
- pan[0] += 200/2;
- pan[1] += 200/2;
-
-
- final int c2fCS =
- vs.coords.ortho(0, 0, -pan[0]*buoyZoom, -pan[1]*buoyZoom,
buoyZoom, buoyZoom);
- final int c2fCSInv =
- vs.coords.ortho(0, 0, pan[0], pan[1], 1/buoyZoom, 1/buoyZoom);
- vs.matcher.add(into, c2fCS, "C2F");
- vs.matcher.add(into, c2fCSInv, "C2FINV");
-
- //SinglePaper.i(space, d,win,c).render(vs, into, c2fCS, c2fCSInv, null);
return into;
}
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.4
fenfire/org/fenfire/modules/pp/Pp.java:1.5
--- fenfire/org/fenfire/modules/pp/Pp.java:1.4 Tue Apr 8 10:54:14 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java Tue Apr 8 16:05:03 2003
@@ -19,7 +19,6 @@
import java.awt.event.*;
import java.io.*;
import java.util.*;
-import java.util.List;
import java.rmi.*;
import java.rmi.server.*;
@@ -29,7 +28,7 @@
public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.4 2003/04/08 14:54:14
mudyc Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.5 2003/04/08 20:05:03
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); }
@@ -42,6 +41,7 @@
private Frame frame;
private PPActions ppAct;
private Space space;
+ private NodeView nodeview;
private BuoyAdaptor adaptor = new BuoyAdaptor();
private BuoyViewMainNode focus;
@@ -148,12 +148,12 @@
}
}
- private NodeView nodeview = null;
// --------------------------------------------------
// Let's get in action!
+ private Map buoys = new HashMap();
private float ctrX=0, ctrY=0;
private VobScene curVs = null;
private int focusCtr = -1;
@@ -161,6 +161,7 @@
private float focusSizeFactor = 3f/5;
private void render(VobScene vs) {
+ buoys.clear();
curVs = vs;
vs.map.put(new SolidBackdropVob(Color.lightGray));
@@ -190,11 +191,10 @@
int anchorCenter = curVs.translateCS(anchorUnit, "TR55", 0.5f, 0.5f);
float r = ctrY * 0.9f;
- int buoyCS;
-
float min = (curVs.size.width * focusSizeFactor) / 7;
float max = (curVs.size.height * focusSizeFactor) / 3;
+ int buoyCS;
if (dir < 0){
buoyCS = c.buoyOnCircle(focusCtr, anchorCenter,
ctrX, ctrY, r,
@@ -206,17 +206,15 @@
ctrX+r, ctrY,
min, max);
}
+ buoys.put(""+buoyCS, linkId);
+
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]);
-
- //buoyCS = curVs.orthoBoxCS(0, null,0, 100,100, 1,1, 50,50);
- curVs.put(new RectBgVob(), buoyCS);
- //pa("link!!!");
+ adaptor.renderBuoy(curVs, buoyCS, linkId, otherAnchor, null);
+ //curVs.put(new RectBgVob(), buoyCS);
+ curVs.map.put(new SimpleConnection(.5f,.5f,.5f,.5f, Color.blue),
buoyCS, anchorCS);
}
// ------------------------------------------------------------
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.5
fenfire/org/fenfire/view/SpatialPlane.java:1.6
--- fenfire/org/fenfire/view/SpatialPlane.java:1.5 Tue Apr 8 10:56:52 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java Tue Apr 8 16:05:03 2003
@@ -26,7 +26,7 @@
*/
public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.5 2003/04/08
14:56:52 mudyc Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.6 2003/04/08
20:05:03 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("SpatialPlane::"+s);
}
@@ -48,7 +48,6 @@
public int getCursorBox() { return cursorBox; }
-
public void renderAWT(VobScene vs, int into, int geom,
RDFNode node, NodeView nodeview,
Model model, NodePlacementHook hook)
@@ -60,7 +59,6 @@
container = ShortRDF.getSubj(model, current, cont);
}
-
// get zoom geometry etc.
float[] size = new float[2];
vs.coords.getSqSize(into, size);
@@ -69,10 +67,12 @@
pt[1] += size[1]/2;
- float[] pan = new float[2];
+ float[] pan = new float[]{1,1};
vs.coords.getSqSize(geom, pan);
float zoom = (vs.coords.transformPoints3(geom, new float[3],
null))[0]/100000;
+ pa("pan x/y: " +pan[0]+ "/"+pan[1]);
+
float[] bs = new float[2];
cursorBox = -1;
@@ -88,8 +88,6 @@
coords[0] = ShortRDF.getInt(model, n, SPATIAL.coordX);
coords[1] = ShortRDF.getInt(model, n, SPATIAL.coordY);
- // get size XXX
-
nodeview.getSize(n, bs, zoom);
Pair matchKey = new Pair(container, n);
int box = vs.orthoCS(0, matchKey, 50,
@@ -97,31 +95,15 @@
pt[1] + (pan[1] + coords[1]) * zoom,
bs[0], bs[1]);
nodeview.place(n, vs, box);
- hook.placed(n, vs, box);
- //vs.put(new org.nongnu.libvob.vobs.RectBgVob(java.awt.Color.red),
box);
- }
-
- /*
- from nodeview nv.getSize(note, bs)
- */
+ if (hook != null) hook.placed(n, vs, 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;
}
- */
} catch (RDFException e) {
pa("Exception ocurred!: "+e);
throw new Error("PPLinker error: Failed to doLink!!");
Index: fenfire/up.sh
diff -u fenfire/up.sh:1.1 fenfire/up.sh:1.2
--- fenfire/up.sh:1.1 Mon Apr 7 04:46:01 2003
+++ fenfire/up.sh Tue Apr 8 16:05:02 2003
@@ -8,7 +8,7 @@
# cvs update
cd $DIR
for x in `ls -1|grep -v gzz|grep -v Z|grep -v mstmpimg`;
- do echo $x; #cd $DIR/$x && pwd && cvs -q up -dP;
+ do cd $DIR/$x && pwd && cvs -q up -dP;
done;
# make all projects
- [Gzz-commits] fenfire ./up.sh org/fenfire/modules/pp/PPCanvas...,
Matti Katila <=