[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire demo/actions.py demo/buoyoi...
|
From: |
Matti Katila |
|
Subject: |
[Gzz-commits] fenfire/org/fenfire demo/actions.py demo/buoyoi... |
|
Date: |
Wed, 30 Jul 2003 06:32:11 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Matti Katila <address@hidden> 03/07/30 06:32:10
Modified files:
org/fenfire/demo: actions.py buoyoing.py
org/fenfire/view: AreaSelectingView2D.java CanvasView2D.java
org/fenfire/view/buoy: AbstractMainNode2D.java
org/fenfire/view/lava: FastView.java
Removed files:
org/fenfire/util/lava: CoordsysCache.java
Log message:
removed CoordsysCache finally
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/actions.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.98&tr2=1.99&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/AreaSelectingView2D.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CanvasView2D.java.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/FastView.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/demo/actions.py
diff -u fenfire/org/fenfire/demo/actions.py:1.13
fenfire/org/fenfire/demo/actions.py:1.14
--- fenfire/org/fenfire/demo/actions.py:1.13 Sat Jul 19 08:55:10 2003
+++ fenfire/org/fenfire/demo/actions.py Wed Jul 30 06:32:10 2003
@@ -44,7 +44,7 @@
fX, fY = f.getPanX(), f.getPanY()
f.setPan( fX-x/f.zoom, fY-y/f.zoom)
#self.context.chgFast(self.oldVS)
- self.obj.chgFast(self.oldVS, None)
+ self.obj.chgFast(self.oldVS, -1)
class MovePanSlow(ff.util.ControlBinding.AbstractController):
def isChangeable(self): return 0
@@ -63,7 +63,7 @@
def isChangeable(self): return 1
def change(self, x, y):
self.obj.changeSize(x+y)
- self.obj.chgFast(self.oldVS, None)
+ self.obj.chgFast(self.oldVS, -1)
#self.context.chgFast(self.oldVS)
class UnSelectNodeOnPlane(AbstractContextController):
@@ -98,7 +98,7 @@
ox = ff.util.RDFUtil.getFloat(g, node, CANVAS2D.x)
oy = ff.util.RDFUtil.getFloat(g, node, CANVAS2D.y)
self.obj[3].moveNote(node, ox+x/f.zoom, oy+y/f.zoom )
- self.obj[0].chgFast(self.oldVS, None)
+ self.obj[0].chgFast(self.oldVS, -1)
####### Actions to control selection (Ctrl pressed)
@@ -111,9 +111,9 @@
xy = self.obj[0].getXYHit(self.oldVS, x,y)
oldXY = self.context.states.getPressPans()
self.obj[1].setArea(oldXY[0], oldXY[1], xy[0], xy[1])
- p(self.context.states.selection.area)
+ if dbg: p(self.context.states.selection.area)
self.context.states.selection.area = [oldXY[0], oldXY[1], xy[0], xy[1]]
- self.obj[0].chgFast(self.oldVS, None)
+ self.obj[0].chgFast(self.oldVS, -1)
####### Dispatcher for plane events etc.
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.98
fenfire/org/fenfire/demo/buoyoing.py:1.99
--- fenfire/org/fenfire/demo/buoyoing.py:1.98 Sat Jul 19 08:55:10 2003
+++ fenfire/org/fenfire/demo/buoyoing.py Wed Jul 30 06:32:10 2003
@@ -56,9 +56,8 @@
### debugs
-#ff.util.lava.CoordsysCache.dbg = 1
#ff.view.AreaSelectingView2D.dbg = 1
-ff.view.buoy.TransclusionConnector.dbg = 1
+#ff.view.buoy.TransclusionConnector.dbg = 1
#ff.impl.SimpleNodeContent.dbg = 1
Index: fenfire/org/fenfire/view/AreaSelectingView2D.java
diff -u fenfire/org/fenfire/view/AreaSelectingView2D.java:1.11
fenfire/org/fenfire/view/AreaSelectingView2D.java:1.12
--- fenfire/org/fenfire/view/AreaSelectingView2D.java:1.11 Mon Jul 28
04:22:32 2003
+++ fenfire/org/fenfire/view/AreaSelectingView2D.java Wed Jul 30 06:32:10 2003
@@ -39,9 +39,8 @@
pq = GLRen.createFixedPaperQuad(paper, 0, 0, 1, 1, 0, 10, 10, 10);
}
-
- private org.fenfire.util.lava.CoordsysCache coords =
- new org.fenfire.util.lava.CoordsysCache();
+ private final String CONCAT = "AreaSelectingView_concat";
+ private final String SELECT = "AreaSelectingView_selection";
public void render(VobScene vs, Object plane,
int matchingParent,
@@ -53,24 +52,29 @@
int paper2box = vs.invertCS(box2paper, "areaselectview_INv");
- int paper2screen = vs.concatCS(box2screen, "areaselectview_conc",
+ int paper2screen = vs.concatCS(box2screen, CONCAT,
paper2box);
- int cs = vs.orthoCS(paper2screen, "selection", 0, 1,2,3,4);
- Object key = vs.matcher.getKey(box2screen);
- if (dbg) p("key b2s: "+vs.matcher.getKey(box2screen));
- coords.set(key, cs);
+ int cs = vs.orthoCS(paper2screen, SELECT, 0, 1,2,3,4);
if (current != plane) setArea(0,0,0,0);
- chgFast(vs, key);
+ chgFast(vs, box2screen);
vs.put(pq, cs);
}
- public void chgFast(VobScene oldVS, Object key) {
- if (dbg) p("key Fast: "+key);
- oldVS.coords.setOrthoParams(coords.get(key), 0, x0,y0,x1-x0,y1-y0);
+ public void chgFast(VobScene oldVS, int parent) {
+ if (dbg) p("NEW: parent: "+parent+" to make chgFast:
"+oldVS.matcher.getKey(parent)
+ + " foo: "+
oldVS.matcher.getCS(oldVS.matcher.getKey(parent)));
+
+ if (dbg) p("parent cs: "+parent);
+ int concatCs = oldVS.matcher.getCS(parent, CONCAT);
+ int cs = oldVS.matcher.getCS(concatCs, SELECT);
+ if (dbg) p("cs: "+cs);
+
+ if (cs < 1) throw new Error(cs+" is not possible!");
+
+ oldVS.coords.setOrthoParams(cs, 0, x0,y0,x1-x0,y1-y0);
}
-
-
+
public void getSize(Object plane, float[] wh) {
if(child != null)
child.getSize(plane, wh);
Index: fenfire/org/fenfire/view/CanvasView2D.java
diff -u fenfire/org/fenfire/view/CanvasView2D.java:1.21
fenfire/org/fenfire/view/CanvasView2D.java:1.22
--- fenfire/org/fenfire/view/CanvasView2D.java:1.21 Mon Jul 28 04:22:32 2003
+++ fenfire/org/fenfire/view/CanvasView2D.java Wed Jul 30 06:32:10 2003
@@ -44,9 +44,9 @@
/** A View2D of a CANVAS2D, with a given node function.
*/
public class CanvasView2D extends View2D implements NodedView2D,
org.fenfire.view.lava.FastView {
-public static final String rcsid = "$Id: CanvasView2D.java,v 1.21 2003/07/28
08:22:32 tjl Exp $";
+public static final String rcsid = "$Id: CanvasView2D.java,v 1.22 2003/07/30
10:32:10 mudyc Exp $";
public static boolean dbg = false;
- private static void pa(String s) { System.out.println("CanvasView2D::"+s);
}
+ private static void p(String s) { System.out.println("CanvasView2D:: "+s);
}
private Fen fen;
private NodeFunction nodeView;
@@ -67,11 +67,8 @@
lineconn.glteardown = GLCache.getCallList("PopAttrib");
}
- //private Object container;
- private int paper2screen = -1;
- private org.fenfire.util.lava.CoordsysCache coords =
- new org.fenfire.util.lava.CoordsysCache();
- private Map containers = new HashMap(10);
+
+ private HashMap containers = new HashMap();
public void render(VobScene vs, Object container,
int matchingParent, int box2screen, int box2plane)
@@ -79,35 +76,36 @@
if (!RDFUtil.isNodeType(fen.graph, container, CANVAS2D.Canvas))
throw new Error("plane is NOT a container!");
- //this.container = container;
- Object key = vs.matcher.getKey(matchingParent);
- containers.put(key, container);
-
int paper2box = vs.invertCS(box2plane, "canvasview_INv");
- paper2screen = vs.concatCS(box2screen, "canvasview_conc",
+ int paper2screen = vs.concatCS(box2screen, "canvasview_conc",
paper2box);
+ containers.put(""+box2screen, container);
+
+ if (dbg) {
+ p("canvas container: "+container);
+ p("box2screen: "+box2screen);
+ p("matchingparent: "+matchingParent);
+ }
Iterator iter = fen.constgraph.findN_11X_Iter(container,
CANVAS2D.contains);
- if (dbg) pa("Canvas begin");
- //nodes.clear();
+ if (dbg) p("Canvas begin");
while (iter.hasNext()) {
Object n = iter.next();
+ if (dbg) p("placeable object: "+n);
org.nongnu.libvob.lava.placeable.Placeable p =
(org.nongnu.libvob.lava.placeable.Placeable)nodeView.f(fen.constgraph, n);
- Pair matchKey = new Pair(container, n);
int cs = vs.coords.orthoBox(paper2screen, 0,1,2,3,4,5,6);
- Object nodeKey = new Pair(key, n);
- coords.set(nodeKey, cs);
-
- vs.matcher.add(matchingParent, cs, matchKey);
+ vs.matcher.add(matchingParent, cs, new Pair(container, n));
vs.activate(cs);
+
if(cull) {
cs = vs.cullCS(cs, "CULL", box2screen);
}
p.place(vs, cs);
}
- chgFast(vs, key);
+ chgFast(vs, box2screen);
+
// show connections
Iterator iter1 = fen.constgraph.findN_11X_Iter(container,
@@ -132,13 +130,15 @@
}
}
- public void chgFast(VobScene oldVS, Object key) {
-
- Object container = containers.get(key);
+ public void chgFast(VobScene oldVS, int parent) {
+
+ Object container = containers.get(""+parent);
+ if (dbg) p("chgFast container: " + container);
Iterator iter = fen.constgraph.findN_11X_Iter(container,
CANVAS2D.contains);
while (iter.hasNext()) {
Object n = iter.next();
+ if (dbg) p("Object is: "+n);
float x = RDFUtil.getFloat(fen.graph, n, CANVAS2D.x);
float y = RDFUtil.getFloat(fen.graph, n, CANVAS2D.y);
@@ -146,10 +146,11 @@
(org.nongnu.libvob.lava.placeable.Placeable)nodeView
.f(fen.constgraph, n);
- // int cs = vs.coords.translate(paper2screen, x, y);
- if(dbg) pa("CANVAS: "+p.getWidth()+" "+p.getHeight());
+ if(dbg) p("size: "+p.getWidth()+" "+p.getHeight());
+
+ int cs = oldVS.matcher.getCS(parent, new Pair(container, n));
+ if (cs < 1) throw new Error(cs+" is not possible!");
- int cs = coords.get(new Pair(key, n));
oldVS.coords.setOrthoBoxParams(cs, 0,
x, y, 1, 1,
p.getWidth(), p.getHeight());
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.35
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.36
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.35 Mon Jul 28
04:22:32 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java Wed Jul 30
06:32:10 2003
@@ -267,12 +267,10 @@
return controller.handleEvent(this, e, oldVobScene);
}
- public void chgFast(VobScene oldVobScene, Object key) {
+ public void chgFast(VobScene oldVobScene, int parent) {
clipPan();
setZoomPan(oldVobScene, box2screen);
- Object realKey = oldVobScene.matcher.getKey(box2screen);
- if (dbg) p("key: "+realKey);
View2D view = getView2D();
while (view != null) {
if (view instanceof org.fenfire.view.lava.FastView)
@@ -282,7 +280,7 @@
* ...working on a better solution.
*/
((org.fenfire.view.lava.FastView)view)
- .chgFast(oldVobScene, realKey);
+ .chgFast(oldVobScene, box2screen);
view = view.getChildView2D();
}
}
Index: fenfire/org/fenfire/view/lava/FastView.java
diff -u fenfire/org/fenfire/view/lava/FastView.java:1.3
fenfire/org/fenfire/view/lava/FastView.java:1.4
--- fenfire/org/fenfire/view/lava/FastView.java:1.3 Thu Jul 17 12:28:19 2003
+++ fenfire/org/fenfire/view/lava/FastView.java Wed Jul 30 06:32:10 2003
@@ -20,5 +20,5 @@
* setOrthoParams.
* @see VobCoorder
*/
- void chgFast(VobScene oldVobScene, Object key);
+ void chgFast(VobScene oldVobScene, int parent);
}