[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gzz/modules/pp PPMouseEvents.java PPView2.j...
|
From: |
Matti Katila |
|
Subject: |
[Gzz-commits] gzz/gzz/modules/pp PPMouseEvents.java PPView2.j... |
|
Date: |
Tue, 07 Jan 2003 06:27:30 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Matti Katila <address@hidden> 03/01/07 06:27:30
Modified files:
gzz/modules/pp : PPMouseEvents.java PPView2.java demotest.py
gzz/modules/pp/vob: VobCSGenerator.java
Log message:
nadir + clean
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPMouseEvents.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/VobCSGenerator.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
Patches:
Index: gzz/gzz/modules/pp/PPMouseEvents.java
diff -u gzz/gzz/modules/pp/PPMouseEvents.java:1.15
gzz/gzz/modules/pp/PPMouseEvents.java:1.16
--- gzz/gzz/modules/pp/PPMouseEvents.java:1.15 Fri Jan 3 14:40:57 2003
+++ gzz/gzz/modules/pp/PPMouseEvents.java Tue Jan 7 06:27:29 2003
@@ -28,7 +28,7 @@
*/
public class PPMouseEvents {
-public static final String rcsid = "$Id: PPMouseEvents.java,v 1.15 2003/01/03
19:40:57 mudyc Exp $";
+public static final String rcsid = "$Id: PPMouseEvents.java,v 1.16 2003/01/07
11:27:29 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println(s); }
@@ -38,7 +38,7 @@
private PPMouseEvents m_ev;
- // set from outside
+ // are set from outside
public VobScene vs;
public AbstractViewContext context;
@@ -194,6 +194,7 @@
public void event(MouseEvent ev, EventHandling.MousePressState p_state,
Object[] obs) {
context.setAccursed((Cell)obs[0]);
+
((DefaultVobMatcher)vs.matcher).keymapSingleCoordsys(((Integer)obs[1]).intValue(),
m_ev.kingCS);
AbstractUpdateManager.chg();
}
}
@@ -202,6 +203,7 @@
public void event(MouseEvent ev, EventHandling.MousePressState p_state,
Object[] obs) {
context.setAccursed((Cell)obs[0]);
+ ((DefaultVobMatcher)vs.matcher).keymapSingleCoordsys(m_ev.kingCS,
((Integer)obs[3]).intValue() );
AbstractUpdateManager.chg();
}
}
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.41
gzz/gzz/modules/pp/PPView2.java:1.42
--- gzz/gzz/modules/pp/PPView2.java:1.41 Mon Jan 6 06:11:22 2003
+++ gzz/gzz/modules/pp/PPView2.java Tue Jan 7 06:27:29 2003
@@ -36,7 +36,7 @@
import java.util.*;
public class PPView2 implements View {
-public static final String rcsid = "$Id: PPView2.java,v 1.41 2003/01/06
11:11:22 mudyc Exp $";
+public static final String rcsid = "$Id: PPView2.java,v 1.42 2003/01/07
11:27:29 mudyc Exp $";
public static boolean dbg = true;
private static void pa(String s) { System.err.println(s); }
@@ -281,20 +281,19 @@
int actr = vs.translateCS(anchorUnit, "TR12", .5f, .5f);
int buoycs = floater.buoyCoordsys(actr, key);
- /*
+
final int nadir_buoy =
((GLVobCoorder)vs.coords).nadirOrigin(buoycs, nadir_point_cs);
- vs.matcher.add(nadir_buoy, "NADIR");
- */
+ vs.matcher.add(nadir_buoy, "NADIR"+c.toString() );
//vs.matcher.add(nadir_buoy, new Pair(c, connectedFrom));
-
- final int frameCS = vs.orthoBoxCS(buoycs, "frame", 0,
+ //final int frameCS = vs.orthoBoxCS(buoycs, "frame", 0,
+ final int frameCS = vs.orthoBoxCS(nadir_buoy, "frame", 0,
-buoyVPWidth/2, -buoyVPHeight/2, 1, 1,
buoyVPWidth, buoyVPHeight);
vs.activate(frameCS);
ev_handler.onClick(frameCS, "Link CLICK",
- new Object[]{ c, connectedFrom});
+ new Object[]{ c, connectedFrom, new
Integer(anchor), new Integer(frameCS)});
ev_handler.onDrag(frameCS, "Drag buoy");
// XXX Pan
@@ -516,15 +515,16 @@
fr = vs.orthoBoxCS(ctr, "frame", 100,
-leftPanelRealWidth/2,
-leftPanelRealHeight/2,
1, 1, leftPanelRealWidth,
leftPanelRealHeight);
+ vs.matcher.add(ctr, "ctrl_home");
}
else {
fr = cs_gen.getNextCS();
}
- vs.matcher.add(fr, p);
+ //vs.matcher.add(fr, p);
vs.activate(fr);
- ev_handler.onClick(fr, "Shortcut link", new Object[]{p});
+ ev_handler.onClick(fr, "Shortcut link", new Object[]{p, new
Integer(fr)});
int c2f = vs.coords.ortho(0, 11, 0, 0,
Index: gzz/gzz/modules/pp/demotest.py
diff -u gzz/gzz/modules/pp/demotest.py:1.45 gzz/gzz/modules/pp/demotest.py:1.46
--- gzz/gzz/modules/pp/demotest.py:1.45 Tue Jan 7 04:20:24 2003
+++ gzz/gzz/modules/pp/demotest.py Tue Jan 7 06:27:29 2003
@@ -49,7 +49,7 @@
self.avc = gzz.view.AbstractViewContext()
if 0:
- #load from file
+ #load space from disk
self.space = gzz.impl.ModularSpace(self.filer.load(),
*tools.spaceArgList())
self.ppactions = gzz.modules.pp.PPActionsImpl(self.space)
self.d = PPDims(self.space)
Index: gzz/gzz/modules/pp/vob/VobCSGenerator.java
diff -u gzz/gzz/modules/pp/vob/VobCSGenerator.java:1.10
gzz/gzz/modules/pp/vob/VobCSGenerator.java:1.11
--- gzz/gzz/modules/pp/vob/VobCSGenerator.java:1.10 Fri Jan 3 05:20:54 2003
+++ gzz/gzz/modules/pp/vob/VobCSGenerator.java Tue Jan 7 06:27:29 2003
@@ -27,7 +27,7 @@
import gzz.gfx.gl.*;
public class VobCSGenerator {
-public static final String rcsid = "$Id: VobCSGenerator.java,v 1.10 2003/01/03
10:20:54 mudyc Exp $";
+public static final String rcsid = "$Id: VobCSGenerator.java,v 1.11 2003/01/07
11:27:29 mudyc Exp $";
static public boolean dbg=false;
static public void p(String s) { System.out.print(s); }
static public void pa(String s) { System.out.println(s); }
@@ -141,6 +141,7 @@
int ctr = ((GLVobCoorder)vs.coords).affineCoordsys(0, 100,
x_center, y_tmp
+ muutos/2,
1, 0, 0, 1);
+ vs.matcher.add(ctr, "ctrl"+i);
vob_cs[i] = vs.orthoBoxCS(ctr, "frame", 100,
-vob_width/2, -y_d/2, 1,1,