[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire modules/pp/PPCanvasNode.jav...
From: |
Matti Katila |
Subject: |
[Gzz-commits] fenfire/org/fenfire modules/pp/PPCanvasNode.jav... |
Date: |
Wed, 16 Apr 2003 03:51:06 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/04/16 03:51:06
Modified files:
org/fenfire/modules/pp: PPCanvasNode.java Pp.java
org/fenfire/view: DefaultNodeView.java
Log message:
buoys
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasNode.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/DefaultNodeView.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/modules/pp/PPCanvasNode.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.16
fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.17
--- fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.16 Wed Apr 16
01:36:12 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasNode.java Wed Apr 16 03:51:05 2003
@@ -17,7 +17,7 @@
public class PPCanvasNode implements NodeBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.16 2003/04/16
05:36:12 mudyc Exp $";
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.17 2003/04/16
07:51:05 mudyc Exp $";
public static boolean dbg = true;
private static void p(String s) { if (dbg) pa(s); }
private static void pa(String s) { System.out.println("PPCanvasNode::"+s);
}
@@ -91,20 +91,13 @@
if (GraphicsAPI.getInstance() instanceof GLAPI) {
final int c2fCS =
- vs.coords.ortho(0, 0, -pan[0]*buoyZoom, -pan[1]*buoyZoom,
buoyZoom, buoyZoom);
+ vs.orthoCS(into, "C2F",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, nodeview).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,
nodeview).render(vs, into, c2fCS, c2fCSInv, hook);
- */
+ vs.orthoCS(into, "C2FINV",0, (float)pan[0], (float)pan[1],
1/buoyZoom, 1/buoyZoom);
+
+ SinglePaper.i(fen, node, win, nodeview)
+ .render(vs, into, c2fCS, c2fCSInv, null);
+
} else {
int zo = (int)(buoyZoom * 100000);
int geometry = vs.orthoBoxCS(into, "FocusGeometry",0, zo,0, 1,1,
pan[0], pan[1]);
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.24
fenfire/org/fenfire/modules/pp/Pp.java:1.25
--- fenfire/org/fenfire/modules/pp/Pp.java:1.24 Wed Apr 16 03:24:39 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java Wed Apr 16 03:51:05 2003
@@ -28,7 +28,7 @@
public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.24 2003/04/16 07:24:39
tjl Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.25 2003/04/16 07:51:05
mudyc Exp $";
public static final boolean dbg = false;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.out.println("Pp::"+s); }
@@ -214,9 +214,15 @@
ctrX = ((float)vs.size.width)/2;
ctrY = ((float)vs.size.height)/2;
- int frameCS = vs.orthoBoxCS(0, "FocusFrame", 200,
- ctrX - width/2, ctrY - height/2, 1, 1,
+
+ int focusCtr = vs.translateCS(0, "FocusCtr", ctrX,ctrY);
+ int frameCS = vs.orthoBoxCS(focusCtr, "FocusFrame", 200,
+ -width/2, -height/2, 1, 1,
width, height);
+
+ //int frameCS = vs.orthoBoxCS(0, "FocusFrame", 200,
+ // ctrX - width/2, ctrY - height/2, 1, 1,
+ // width, height);
vs.activate(frameCS);
if (focus == null)
Index: fenfire/org/fenfire/view/DefaultNodeView.java
diff -u fenfire/org/fenfire/view/DefaultNodeView.java:1.3
fenfire/org/fenfire/view/DefaultNodeView.java:1.4
--- fenfire/org/fenfire/view/DefaultNodeView.java:1.3 Wed Apr 16 02:59:40 2003
+++ fenfire/org/fenfire/view/DefaultNodeView.java Wed Apr 16 03:51:05 2003
@@ -11,13 +11,14 @@
import java.awt.*;
public class DefaultNodeView extends NodeView {
-private static final String rcsid = "$Id: DefaultNodeView.java,v 1.3
2003/04/16 06:59:40 mudyc Exp $";
+private static final String rcsid = "$Id: DefaultNodeView.java,v 1.4
2003/04/16 07:51:05 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("DefaultNodeView::"+s); }
public DefaultNodeView(Fen f) {
- text = new SimpleText();
fen = f;
+ text = new SimpleText();
+ page = new PageHandler() { };
}
public void place(Object node, VobScene vs, int box) {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire modules/pp/PPCanvasNode.jav...,
Matti Katila <=