[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz gzz/client/awt/AWTScreen.java test/gzz/view...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz gzz/client/awt/AWTScreen.java test/gzz/view... |
Date: |
Tue, 15 Oct 2002 13:42:20 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/10/15 13:42:19
Modified files:
gzz/client/awt : AWTScreen.java
test/gzz/view : cellvobfactory.test
test/tools : gfx.py
Log message:
Failing (bg color) for awt test
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/awt/AWTScreen.java.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/view/cellvobfactory.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/tools/gfx.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: gzz/gzz/client/awt/AWTScreen.java
diff -c gzz/gzz/client/awt/AWTScreen.java:1.23
gzz/gzz/client/awt/AWTScreen.java:1.24
*** gzz/gzz/client/awt/AWTScreen.java:1.23 Mon Oct 14 14:15:19 2002
--- gzz/gzz/client/awt/AWTScreen.java Tue Oct 15 13:42:19 2002
***************
*** 35,44 ****
public abstract class AWTScreen
extends GraphicsAPI.Window
implements MouseListener, MouseMotionListener, Obs,
JUpdateManager.EventProcessor {
! public static final String rcsid = "$Id: AWTScreen.java,v 1.23 2002/10/14
18:15:19 tjl Exp $";
public static boolean dbg = false;
- private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.out.println(s); }
public Color fg = Color.black;
--- 35,43 ----
public abstract class AWTScreen
extends GraphicsAPI.Window
implements MouseListener, MouseMotionListener, Obs,
JUpdateManager.EventProcessor {
! public static final String rcsid = "$Id: AWTScreen.java,v 1.24 2002/10/15
17:42:19 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println(s); }
public Color fg = Color.black;
***************
*** 95,100 ****
--- 94,100 ----
*/
public void renderAnim(VobScene prev, VobScene next, float fract, float
lod, boolean showFinal) {
renderAnimImage(prev, next, fract, lod);
+ if(dbg) pa("renderan: "+prev+" "+next+" "+cache);
Graphics gr = canvas.getGraphics();
if (gr == null) return;
canvas.paint(gr);
***************
*** 114,119 ****
--- 114,120 ----
public int[] readPixels(int x, int y, int w, int h) {
int[] pix = new int[w*h];
+ if(dbg) pa("Readpixels: "+x+" "+y+" "+w+" "+h+" "+cache);
PixelGrabber pg = new PixelGrabber(cache.getSource(),
x, y, w, h, pix, 0, w);
try {
***************
*** 176,182 ****
fract = 1-fract;
}
if(osc == null) osc = sc;
! p("Going to render: "+sc+" "+osc+" "+fract);
if(dbg) sc.dump();
if(dbg) osc.dump();
--- 177,183 ----
fract = 1-fract;
}
if(osc == null) osc = sc;
! if(dbg) pa("Going to render: "+sc+" "+osc+" "+fract);
if(dbg) sc.dump();
if(dbg) osc.dump();
***************
*** 200,206 ****
public void zzProcessEvent(AWTEvent e) {
! if(dbg) p("ZZProcessEvent "+e);
if(e instanceof KeyEvent) {
KeyEvent ke = (KeyEvent)e;
String name = InputEventUtil.getKeyEventName(ke);
--- 201,207 ----
public void zzProcessEvent(AWTEvent e) {
! if(dbg) pa("ZZProcessEvent "+e);
if(e instanceof KeyEvent) {
KeyEvent ke = (KeyEvent)e;
String name = InputEventUtil.getKeyEventName(ke);
Index: gzz/test/gzz/view/cellvobfactory.test
diff -c gzz/test/gzz/view/cellvobfactory.test:1.1
gzz/test/gzz/view/cellvobfactory.test:1.2
*** gzz/test/gzz/view/cellvobfactory.test:1.1 Tue Oct 15 11:04:57 2002
--- gzz/test/gzz/view/cellvobfactory.test Tue Oct 15 13:42:19 2002
***************
*** 36,42 ****
def getCursorOffset(self, *args):
return 0
! def testSingle():
vs = getvs()
vs.map.put(SolidBgVob(Color.blue))
--- 36,56 ----
def getCursorOffset(self, *args):
return 0
! bgc = (0, 0, 255)
!
! def checkbox(x, y, w, h, color):
! # Check that edges are background-colored
! checkAvgColor(x-2, y-2, w+20, 1, bgc)
! checkAvgColor(x-2, y-2, 1, h+20, bgc)
! checkAvgColor(x-2, y+h+1, w+20, 1, bgc)
! checkAvgColor(x+w+1, y-2, 1, h+20, bgc)
!
! # Check that center is of given color
! checkAvgColor(x+3, y+3, w-6, h-6, color)
!
! # Finally, should check edge color!
!
! def testSingle__failing_solidbgvob():
vs = getvs()
vs.map.put(SolidBgVob(Color.blue))
***************
*** 48,52 ****
--- 62,68 ----
cvf.place(cell, vs, box, context)
render(vs)
+
+ checkbox(100, 100, 200, 50, (255,255,255))
# : vim: set syntax=python :
Index: gzz/test/tools/gfx.py
diff -c gzz/test/tools/gfx.py:1.2 gzz/test/tools/gfx.py:1.3
*** gzz/test/tools/gfx.py:1.2 Tue Oct 15 11:04:57 2002
--- gzz/test/tools/gfx.py Tue Oct 15 13:42:19 2002
***************
*** 4,9 ****
--- 4,10 ----
print dir(gzz.client)
win = gzz.client.GraphicsAPI.getInstance().createWindow()
+ win.setLocation(0, 0, 500, 500)
print "GW: ",win
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz gzz/client/awt/AWTScreen.java test/gzz/view...,
Tuomas J. Lukka <=