[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] libvob/org/nongnu/libvob/impl OrthoCoorder.java
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] libvob/org/nongnu/libvob/impl OrthoCoorder.java |
Date: |
Wed, 23 Apr 2003 12:50:51 -0400 |
CVSROOT: /cvsroot/libvob
Module name: libvob
Changes by: Tuomas J. Lukka <address@hidden> 03/04/23 12:50:51
Modified files:
org/nongnu/libvob/impl: OrthoCoorder.java
Log message:
Fix mudyc's test
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/impl/OrthoCoorder.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: libvob/org/nongnu/libvob/impl/OrthoCoorder.java
diff -u libvob/org/nongnu/libvob/impl/OrthoCoorder.java:1.12
libvob/org/nongnu/libvob/impl/OrthoCoorder.java:1.13
--- libvob/org/nongnu/libvob/impl/OrthoCoorder.java:1.12 Wed Apr 23
12:46:02 2003
+++ libvob/org/nongnu/libvob/impl/OrthoCoorder.java Wed Apr 23 12:50:51 2003
@@ -35,7 +35,7 @@
*/
public class OrthoCoorder extends VobCoorder {
-public static final String rcsid = "$Id: OrthoCoorder.java,v 1.12 2003/04/23
16:46:02 tjl Exp $";
+public static final String rcsid = "$Id: OrthoCoorder.java,v 1.13 2003/04/23
16:50:51 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("OrthoCoorder::"+s);
}
@@ -86,18 +86,20 @@
setInterpInfo(cs, this, cs, 0, xoffs, yoffs, xscale, yscale, info);
}
+ static float[] rect = new float[4];
public boolean contains(int cs, float px, float py, float[]
internalcoords) {
- float x=sys.cx(cs), y=sys.cy(cs),
- w=sys.cw(cs)*sys.w[cs],
- h=sys.ch(cs)*sys.h[cs];
+ rect[0] = 0;
+ rect[1] = 0;
+ rect[2] = sys.w[cs];
+ rect[3] = sys.h[cs];
- if(dbg) pa("contains x: "+x+", y: "+y+", w: "+w+", h: "+h);
+ sys.transformRect(cs, rect);
- if(px >= x && py >= y &&
- px < x + w && py < y + h) {
+ if(px >= rect[0] && py >= rect[1] &&
+ px < rect[0] + rect[2] && py < rect[1] + rect[3]) {
if(internalcoords != null) {
- internalcoords[0] = (px-x-w/2)/(w/2.0f);
- internalcoords[1] = (py-y-h/2)/(h/2.0f);
+ internalcoords[0] = (px-rect[0])/(rect[2]);
+ internalcoords[1] = (py-rect[1])/(rect[3]);
}
return true;
}
- [Gzz-commits] libvob/org/nongnu/libvob/impl OrthoCoorder.java, Matti Katila, 2003/04/05
- [Gzz-commits] libvob/org/nongnu/libvob/impl OrthoCoorder.java, Matti Katila, 2003/04/05
- [Gzz-commits] libvob/org/nongnu/libvob/impl OrthoCoorder.java, Matti Katila, 2003/04/07
- [Gzz-commits] libvob/org/nongnu/libvob/impl OrthoCoorder.java, Janne V. Kujala, 2003/04/07
- [Gzz-commits] libvob/org/nongnu/libvob/impl OrthoCoorder.java, Matti Katila, 2003/04/07
- [Gzz-commits] libvob/org/nongnu/libvob/impl OrthoCoorder.java, Matti Katila, 2003/04/07
- [Gzz-commits] libvob/org/nongnu/libvob/impl OrthoCoorder.java, Matti Katila, 2003/04/08
- [Gzz-commits] libvob/org/nongnu/libvob/impl OrthoCoorder.java, Tuomas J. Lukka, 2003/04/23
- [Gzz-commits] libvob/org/nongnu/libvob/impl OrthoCoorder.java,
Tuomas J. Lukka <=
- [Gzz-commits] libvob/org/nongnu/libvob/impl OrthoCoorder.java, Matti Katila, 2003/04/28