[Gzz-commits] fenfire/org/fenfire modules/pp/BgVob.java modul...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/04/08 17:13:01

Modified files:
        org/fenfire/modules/pp: BgVob.java PPCanvasCursor.java 
                                PPCanvasNode.java Pp.java 
                                UniquePaperVob.java 
        org/fenfire/view: SpatialPlane.java 

Log message:
        looks as good as awt could ;)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/BgVob.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasCursor.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasNode.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/UniquePaperVob.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/modules/pp/BgVob.java
diff -u fenfire/org/fenfire/modules/pp/BgVob.java:1.2 
fenfire/org/fenfire/modules/pp/BgVob.java:1.3
--- fenfire/org/fenfire/modules/pp/BgVob.java:1.2       Mon Mar 31 07:37:47 2003
+++ fenfire/org/fenfire/modules/pp/BgVob.java   Tue Apr  8 17:13:01 2003
@@ -42,8 +42,8 @@
  * This vob stores the inside coordinates so clicks on it can be 
  * used to pan pretty easily.
  */
-public class BgVob extends org.nongnu.libvob.Vob {
-public static final String rcsid = "$Id: BgVob.java,v 1.2 2003/03/31 12:37:47 
mudyc Exp $";
+public class BgVob extends org.nongnu.libvob.AbstractVob {
+public static final String rcsid = "$Id: BgVob.java,v 1.3 2003/04/08 21:13:01 
mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
Index: fenfire/org/fenfire/modules/pp/PPCanvasCursor.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.6 
fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.7
--- fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.6      Tue Apr  8 
16:05:03 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasCursor.java  Tue Apr  8 17:13:01 2003
@@ -23,7 +23,7 @@
 /** XXX
  */
 public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.6 2003/04/08 
20:05:03 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.7 2003/04/08 
21:13:01 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("PPCanvasCursor::"+s); }
 
@@ -161,7 +161,7 @@
            // XXX SinglePaper.i(space, d, window, current).render(vs, into, 
c2fCS, c2fCSInv, hook);
        } else {
            int zo = (int)(zoom * 100000);
-           int geometry = vs.orthoBoxCS(0, "FocusGeometry",0, zo,0, 1,1, panx, 
pany);  
+           int geometry = vs.orthoBoxCS(into, "FocusGeometry",0, zo,0, 1,1, 
panx, pany);  
            
            vs.map.put(new UniquePaperVob(URN5Namespace.instance.generateId()), 
into, geometry);
            (new SpatialPlane(PP.noteType, PP.contains)).renderAWT(vs, into, 
geometry,
@@ -225,7 +225,6 @@
                box = oldVobScene.coords.transformPoints3(focusFrame, box, 
null);
                float size[] = new float[2];
                oldVobScene.coords.getSqSize(focusFrame, size);
-               pa(panx+"pt: "+pt[0] +", "+box[0]);
                panx -= ((pt[0] - box[0]) - size[0]/2)/ zoom;
                pany -= ((pt[1] - box[1]) - size[1]/2)/ zoom;
                
Index: fenfire/org/fenfire/modules/pp/PPCanvasNode.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.6 
fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.7
--- fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.6        Tue Apr  8 
16:05:03 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasNode.java    Tue Apr  8 17:13:01 2003
@@ -21,7 +21,7 @@
 import com.hp.hpl.mesa.rdf.jena.vocabulary.*;
 
 public class PPCanvasNode implements NodeBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.6 2003/04/08 
20:05:03 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.7 2003/04/08 
21:13:01 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPCanvasNode::"+s); 
}
 
@@ -107,7 +107,7 @@
            */
        } else {
            int zo = (int)(buoyZoom * 100000);
-           int geometry = vs.orthoCS(0, "FocusGeometry",0, zo,0, pan[0], 
pan[1]);  
+           int geometry = vs.orthoBoxCS(into, "FocusGeometry",0, zo,0, 1,1, 
pan[0], pan[1]);  
            
            vs.map.put(new UniquePaperVob(URN5Namespace.instance.generateId()), 
into, geometry);
            (new SpatialPlane(PP.noteType, PP.contains)).renderAWT(vs, into, 
geometry,
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.5 
fenfire/org/fenfire/modules/pp/Pp.java:1.6
--- fenfire/org/fenfire/modules/pp/Pp.java:1.5  Tue Apr  8 16:05:03 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java      Tue Apr  8 17:13:01 2003
@@ -28,7 +28,7 @@
 
 
 public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.5 2003/04/08 20:05:03 
mudyc Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.6 2003/04/08 21:13:01 
mudyc Exp $";
     public static final boolean dbg = true;
     protected static void p(String s) { if(dbg) pa(s); }
     protected static void pa(String s) { System.out.println("Pp::"+s); }
@@ -60,17 +60,13 @@
        String note = ppAct.newNote(paper, 0,0, "A test note");
 
        String paper2 = ppAct.newPaper();
-       String note2 = ppAct.newNote(paper2, 0,0, "A test note");
+       String note2 = ppAct.newNote(paper2, -50,0, "A test note");
        ppAct.assocNotes(note, 1, note2);
 
        note = ppAct.newNote(paper, 50,50, "10 10");
        ppAct.assocNotes(note, 1, note2);
        note = ppAct.newNote(paper, -100,100, "-10 10");
-       ppAct.assocNotes(note, 1, note2);
-       note = ppAct.newNote(paper, -100,-100, "-10 -10");
-       ppAct.assocNotes(note, 1, note2);
-       note = ppAct.newNote(paper, 100,-100, "10 -10");
-       ppAct.assocNotes(note, 1, note2);
+       ppAct.assocNotes(note2, 1, note);
 
 
        accursed = space.getModel().getResource(note);
@@ -207,6 +203,7 @@
                                    min, max);
        }
        buoys.put(""+buoyCS, linkId);
+       curVs.matcher.add(buoyCS, linkId);
 
        float[] fl = new float[3];
        c.getSqSize(buoyCS, fl);
Index: fenfire/org/fenfire/modules/pp/UniquePaperVob.java
diff -u fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.3 
fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.4
--- fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.3      Sat Apr  5 
15:26:35 2003
+++ fenfire/org/fenfire/modules/pp/UniquePaperVob.java  Tue Apr  8 17:13:01 2003
@@ -12,8 +12,8 @@
  * Draws a filled (possibly with several colors) background rectangle,
  * surrounded by a rectangle of the current foreground color.
  */
-public class UniquePaperVob extends Vob {
-public static final String rcsid = "$Id: UniquePaperVob.java,v 1.3 2003/04/05 
20:26:35 mudyc Exp $";
+public class UniquePaperVob extends AbstractVob {
+public static final String rcsid = "$Id: UniquePaperVob.java,v 1.4 2003/04/08 
21:13:01 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("UniquePaperVob::"+s); }
 
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.6 
fenfire/org/fenfire/view/SpatialPlane.java:1.7
--- fenfire/org/fenfire/view/SpatialPlane.java:1.6      Tue Apr  8 16:05:03 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java  Tue Apr  8 17:13:01 2003
@@ -26,7 +26,7 @@
  */
 
 public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.6 2003/04/08 
20:05:03 mudyc Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.7 2003/04/08 
21:13:01 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("SpatialPlane::"+s); 
}
 
@@ -66,17 +66,13 @@
        pt[0] += size[0]/2;
        pt[1] += size[1]/2;
        
-
        float[] pan = new float[]{1,1};
        vs.coords.getSqSize(geom, pan);
        float zoom = (vs.coords.transformPoints3(geom, new float[3], 
null))[0]/100000;
 
-       pa("pan x/y: " +pan[0]+ "/"+pan[1]);
-
        float[] bs = new float[2];
        cursorBox = -1;
         
-       
        Selector slctr = new SelectorImpl((Resource)container, cont, (RDFNode) 
null);
        StmtIterator iter = model.listStatements(slctr);
        Statement stmt = null;
@@ -90,7 +86,7 @@
 
            nodeview.getSize(n, bs, zoom);
            Pair matchKey = new Pair(container, n);
-           int box = vs.orthoCS(0, matchKey, 50, 
+           int box = vs.orthoCS(0, matchKey, pt[2]-.5f, 
                                 pt[0] + (pan[0] + coords[0]) * zoom,
                                 pt[1] + (pan[1] + coords[1]) * zoom,
                                 bs[0], bs[1]);