[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire modules/pp/Pp.java view/buo...
From: |
Matti Katila |
Subject: |
[Gzz-commits] fenfire/org/fenfire modules/pp/Pp.java view/buo... |
Date: |
Fri, 23 May 2003 17:17:43 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/05/23 17:17:43
Modified files:
org/fenfire/modules/pp: Pp.java
org/fenfire/view/buoy: AbstractMainNode2D.java
org/fenfire/view/lava: FenPDFContext.java
Log message:
fix fisheye events
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/FenPDFContext.java.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.38
fenfire/org/fenfire/modules/pp/Pp.java:1.39
--- fenfire/org/fenfire/modules/pp/Pp.java:1.38 Sun May 11 13:25:25 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java Fri May 23 17:17:42 2003
@@ -28,7 +28,7 @@
public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.38 2003/05/11 17:25:25
mudyc Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.39 2003/05/23 21:17:42
mudyc Exp $";
public static final boolean dbg = false;
protected static void pa(String s) { System.out.println("Pp::"+s); }
@@ -253,6 +253,9 @@
// BuoyLinkListener
ArrayList realLinks = new ArrayList();
+ public void link(int dir, int anchorCS, BuoyViewNodeType otherNode,
+ Object linkId, Object otherAnchor, int count) {
+ }
public void link(int dir, int anchorCS, BuoyViewNodeType otherNode,
Object linkId, Object otherAnchor) {
if(dbg) pa("link!");
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.16
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.17
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.16 Mon May 19
08:35:51 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java Fri May 23
17:17:43 2003
@@ -15,7 +15,7 @@
* command for moving on the spatial plane.
*/
public abstract class AbstractMainNode2D implements BuoyViewMainNode {
- public static boolean dbg = true;
+ public static boolean dbg = false;
private static void p(String s) { System.out.println("AbstractMainNode2D::
"+s); }
/** The object representing the plane currently shown in this buoy node.
@@ -100,15 +100,25 @@
oldVobScene.coords.inverseTransformPoints3(
box2screen, pt, pt);
oldVobScene.coords.getSqSize(box2screen, sq);
- if(pt[0] >= 0 && pt[0] < sq[0] &&
- pt[1] >= 0 && pt[1] < sq[1]) {
- pt[2] = 0;
- oldVobScene.coords.transformPoints3(
- box2screen, pt, pt);
- if(zout != null)
- zout[0] = pt[2];
- return true;
- }
+ if (dbg) p("sq: 1: "+sq[0]+", 3: "+sq[1]);
+ if (this instanceof MainNode2D) {
+ if(pt[0] >= 0 && pt[0] < sq[0] &&
+ pt[1] >= 0 && pt[1] < sq[1]) {
+ pt[2] = 0;
+ oldVobScene.coords
+ .transformPoints3(box2screen, pt, pt);
+ if(zout != null)
+ zout[0] = pt[2];
+ return true;
+ }
+ } else if (this instanceof FisheyeMainNode2D) {
+ oldVobScene.coords.transformPoints3(box2paper, pt, pt);
+ view2d.getSize(plane, v2dwh);
+ if(v2dwh[0] >= 0) {
+ if(pt[0] >= 0 && pt[0] < v2dwh[0] &&
+ pt[1] >= 0 && pt[1] < v2dwh[1]) return true;
+ }
+ } else throw new Error("No known main node view2d");
return false;
}
Index: fenfire/org/fenfire/view/lava/FenPDFContext.java
diff -u fenfire/org/fenfire/view/lava/FenPDFContext.java:1.21
fenfire/org/fenfire/view/lava/FenPDFContext.java:1.22
--- fenfire/org/fenfire/view/lava/FenPDFContext.java:1.21 Fri May 23
11:52:43 2003
+++ fenfire/org/fenfire/view/lava/FenPDFContext.java Fri May 23 17:17:43 2003
@@ -219,6 +219,7 @@
ScrollBlock sc = alph.addFile(new
File(fd.getDirectory()+fd.getFile()),
"application/pdf");
+ p("sc: "+sc+" foo: " + sc.getID());
return new FisheyeMainNode2D(sc, new PageScrollView2D(), 0,0);
}
else if (key.equals("LINK")) {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire modules/pp/Pp.java view/buo...,
Matti Katila <=