[Gzz-commits] fenfire/org/fenfire modules/pp/PPCanvasCursor.j...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/04/15 10:43:42

Modified files:
        org/fenfire/modules/pp: PPCanvasCursor.java PPCanvasNode.java 
                                SinglePaper.java 
        org/fenfire/view: NodeView.java SpatialPlane.java 

Log message:
        asdf

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasCursor.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasNode.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/SinglePaper.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/NodeView.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/modules/pp/PPCanvasCursor.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.13 
fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.14
--- fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.13     Tue Apr 15 
10:15:12 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasCursor.java  Tue Apr 15 10:43:42 2003
@@ -24,7 +24,7 @@
 /** XXX
  */
 public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.13 
2003/04/15 14:15:12 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.14 
2003/04/15 14:43:42 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("PPCanvasCursor::"+s); }
 
@@ -167,7 +167,8 @@
            int c2fCSInv = vs.orthoCS(into, "C2FINV",0,0,0, 10,10);
            
            setZoomPan(vs, into);
-           SinglePaper.i(fen, node, window).render(vs, into, c2fCS, c2fCSInv, 
hook);
+           SinglePaper.i(fen, node, window, nodeview)
+               .render(vs, into, c2fCS, c2fCSInv, hook);
        } else {
            int zo = (int)(zoom * 100000);
            int geometry = vs.orthoBoxCS(into, "FocusGeometry",0, zo,0, 1,1, 
panx, pany);  
Index: fenfire/org/fenfire/modules/pp/PPCanvasNode.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.11 
fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.12
--- fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.11       Tue Apr 15 
10:15:12 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasNode.java    Tue Apr 15 10:43:42 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.11 2003/04/15 
14:15:12 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.12 2003/04/15 
14:43:42 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPCanvasNode::"+s); 
}
 
@@ -100,13 +100,13 @@
            vs.matcher.add(into, c2fCS, "C2F");
            vs.matcher.add(into, c2fCSInv, "C2FINV");
 
-           //SinglePaper.i(space, d,win,c).render(vs, into, c2fCS, c2fCSInv, 
null);
+           //SinglePaper.i(space, d,win,c, nodeview).render(vs, into, c2fCS, 
c2fCSInv, null);
            /*
            int c2fCS = vs.orthoCS(into, "C2F",0,0,0, 10,10);
            int c2fCSInv = vs.orthoCS(into, "C2FINV",0,0,0, 10,10);
            
            setZoomPan(vs, into);
-           // XXX SinglePaper.i(space, d, window, current).render(vs, into, 
c2fCS, c2fCSInv, hook);
+           // XXX SinglePaper.i(space, d, window, current, 
nodeview).render(vs, into, c2fCS, c2fCSInv, hook);
            */
        } else {
            int zo = (int)(buoyZoom * 100000);
Index: fenfire/org/fenfire/modules/pp/SinglePaper.java
diff -u fenfire/org/fenfire/modules/pp/SinglePaper.java:1.7 
fenfire/org/fenfire/modules/pp/SinglePaper.java:1.8
--- fenfire/org/fenfire/modules/pp/SinglePaper.java:1.7 Tue Apr 15 10:34:08 2003
+++ fenfire/org/fenfire/modules/pp/SinglePaper.java     Tue Apr 15 10:43:42 2003
@@ -17,7 +17,7 @@
  * the background and the vobs inside the plane.
  */
 public class SinglePaper {
-private static final String rcsid = "$Id: SinglePaper.java,v 1.7 2003/04/15 
14:34:08 mudyc Exp $";  
+private static final String rcsid = "$Id: SinglePaper.java,v 1.8 2003/04/15 
14:43:42 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("SinglePaper:"+s); }
 
@@ -35,23 +35,26 @@
     /** Get instance 
      */
     public static SinglePaper i(Fen fen, Object node,
-                               GraphicsAPI.Window win) {
-       i().set(fen, win, node);
+                               GraphicsAPI.Window win, NodeView nodeview) {
+       i().set(fen, win, node, nodeview);
        return i();
     }
 
     /** Set the instance. This is usually made with i() method.
      */
-    public void set(Fen fen, GraphicsAPI.Window win, Object node) {
+    public void set(Fen fen, GraphicsAPI.Window win, 
+                   Object node, NodeView nodeview) {
        this.fen = fen;
        //this.coordinatePlaneView = new CoordinatePlaneView();
        this.window = win;
        this.node = node;
+       this.nv = nodeview;
     }
 
     private TextStyle style = GraphicsAPI.getInstance().getTextStyle("Sans", 
0, 20);
     private Fen fen;
     private Object node;
+    private NodeView nv;
     // Visual characteristics of the virtual paper and ripple
 
     /** The scale of the background.
@@ -154,7 +157,7 @@
                    //                 node, frameCS, space, hook_final);
 
                    spatialplane.renderGL(vs, paper2screen_shifted,
-                                         node, frameCS, fen, hook_final);
+                                         node, frameCS, fen, hook_final, nv);
                }};
 
        if(useStencil)
Index: fenfire/org/fenfire/view/NodeView.java
diff -u fenfire/org/fenfire/view/NodeView.java:1.4 
fenfire/org/fenfire/view/NodeView.java:1.5
--- fenfire/org/fenfire/view/NodeView.java:1.4  Tue Apr 15 10:15:12 2003
+++ fenfire/org/fenfire/view/NodeView.java      Tue Apr 15 10:43:42 2003
@@ -11,7 +11,7 @@
     // for asking content
     protected Fen fen;
 
-    protected NodeView.Context nodeViewContext;
+    protected NodeView.Context context;
 
     // NodeView places nodes one by one.
     protected Object current;
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.12 
fenfire/org/fenfire/view/SpatialPlane.java:1.13
--- fenfire/org/fenfire/view/SpatialPlane.java:1.12     Tue Apr 15 10:34:08 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java  Tue Apr 15 10:43:42 2003
@@ -25,7 +25,7 @@
  */
 
 public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.12 2003/04/15 
14:34:08 mudyc Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.13 2003/04/15 
14:43:42 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("SpatialPlane::"+s); 
}
 
@@ -109,7 +109,7 @@
      */
     public void renderGL(VobScene vs, int into, 
                       Object node, int cullCS, 
-                      Fen fen, NodePlacementHook hook) 
+                      Fen fen, NodePlacementHook hook, NodeView nodeview) 
     {
        if (frame == null) {
            frame = GLRen.createCallListBoxCoorded(
@@ -137,9 +137,9 @@
        float[] bs = new float[2];
        cursorBox = -1;
        
-       Object node = context.getAccurse();
-       
+       //Object node = nodeview.context.getAccurse();
        
+       /*
        NodeView orig_nv = context.getNodeView();
        
        Selector slctr = new SelectorImpl(node, PP.contains, (RDFNode) null);