[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] libvob org/nongnu/libvob/view/FisheyeState.java...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] libvob org/nongnu/libvob/view/FisheyeState.java... |
Date: |
Sat, 02 Aug 2003 03:47:04 -0400 |
CVSROOT: /cvsroot/libvob
Module name: libvob
Branch:
Changes by: Tuomas J. Lukka <address@hidden> 03/08/02 03:47:04
Modified files:
org/nongnu/libvob/view: FisheyeState.java
vob/demo : fisheye.py
Log message:
Fisheye works
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/view/FisheyeState.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/fisheye.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: libvob/org/nongnu/libvob/view/FisheyeState.java
diff -u libvob/org/nongnu/libvob/view/FisheyeState.java:1.8
libvob/org/nongnu/libvob/view/FisheyeState.java:1.9
--- libvob/org/nongnu/libvob/view/FisheyeState.java:1.8 Thu Jul 17 12:30:02 2003
+++ libvob/org/nongnu/libvob/view/FisheyeState.java Sat Aug 2 03:47:04 2003
@@ -36,7 +36,7 @@
* Uses clicks and drags by mouse button 3.
*/
public class FisheyeState {
-public static final String rcsid = "$Id: FisheyeState.java,v 1.8 2003/07/17
16:30:02 mudyc Exp $";
+public static final String rcsid = "$Id: FisheyeState.java,v 1.9 2003/08/02
07:47:04 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("FisheyeState::
"+s); }
@@ -54,6 +54,10 @@
* the fisheye state. Default: Button 2.
*/
public int MOUSE_BUTTON = java.awt.event.MouseEvent.BUTTON2_MASK;
+ /** The mouse button used for changing
+ * the fisheye state, the vob constant. Default: Button 2.
+ */
+ public int VOBMOUSE_BUTTON = 2;
private int curMouseX, curMouseY;
@@ -154,6 +158,39 @@
}
return false;
}
+
+ public boolean event(VobMouseEvent e) {
+ if(dbg) pa("Ev:"+e);
+ if(e.getType() == e.MOUSE_PRESSED) {
+ if(e.getButton() != VOBMOUSE_BUTTON) return false;
+ curMouseX = e.getX();
+ curMouseY = e.getY();
+ } else if(e.getType() == e.MOUSE_DRAGGED) {
+ if(e.getButton() != VOBMOUSE_BUTTON) return false;
+
+ int dx = e.getX() - curMouseX;
+ int dy = e.getY() - curMouseY;
+
+ curMouseX = e.getX();
+ curMouseY = e.getY();
+
+ curmag *= Math.exp(.005 * -dy);
+ cursize *= Math.exp(.005 * dx);
+
+ if(curmag < minmag) curmag = minmag;
+ if(curmag > maxmag) curmag = maxmag;
+
+ if(cursize < minsize) cursize = minsize;
+ if(cursize > maxsize) cursize = maxsize;
+
+ if(dbg) pa("Z: "+curmag+" "+cursize);
+
+ return true;
+
+ }
+ return false;
+ }
+
public void changeSize(float change) {
cursize *= Math.exp(.005 * change);
Index: libvob/vob/demo/fisheye.py
diff -u libvob/vob/demo/fisheye.py:1.4 libvob/vob/demo/fisheye.py:1.5
--- libvob/vob/demo/fisheye.py:1.4 Wed Jun 11 13:41:56 2003
+++ libvob/vob/demo/fisheye.py Sat Aug 2 03:47:04 2003
@@ -87,7 +87,9 @@
vs.map.put(dice, cs)
vs.map.put(self.mode[1])
def mouse(self, ev):
+ print "Ev: ",ev
if self.fisheye.event(ev):
+ print "Did fisheye"
self.fisheye.setCoordsysParams()
self.repl = 1
vob.AbstractUpdateManager.setNoAnimation()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] libvob org/nongnu/libvob/view/FisheyeState.java...,
Tuomas J. Lukka <=