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

[Matti Katila]

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

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

Log message:
        fix

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/SinglePaper.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/modules/pp/SinglePaper.java
diff -u fenfire/org/fenfire/modules/pp/SinglePaper.java:1.5 
fenfire/org/fenfire/modules/pp/SinglePaper.java:1.6
--- fenfire/org/fenfire/modules/pp/SinglePaper.java:1.5 Tue Apr 15 10:15:12 2003
+++ fenfire/org/fenfire/modules/pp/SinglePaper.java     Tue Apr 15 10:27:07 2003
@@ -9,7 +9,7 @@
 import org.nongnu.libvob.gl.*;
 import org.nongnu.libvob.impl.gl.*;
 
-import com.hp.hpl.mesa.rdf.jena.model.*;
+import org.fenfire.vocab.PP;
 
 
 /** A single PP plane/paper, with given view context.
@@ -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.5 2003/04/15 
14:15:12 mudyc Exp $";  
+private static final String rcsid = "$Id: SinglePaper.java,v 1.6 2003/04/15 
14:27:07 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("SinglePaper:"+s); }
 
@@ -74,6 +74,8 @@
 
     private Vob black = GLCache.getCallList("Color 0 0 0\n");
     //private CoordinatePlaneView coordinatePlaneView;
+    private SpatialPlane spatialplane = new SpatialPlane(PP.Note, PP.contains);
+
     private GraphicsAPI.Window window;
 
 
@@ -150,6 +152,8 @@
 
                    //coordinatePlaneView.render(vs, paper2screen_shifted,
                    //                 node, frameCS, space, hook_final);
+
+                   spatialplane.renderGL();
                }};
 
        if(useStencil)
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.10 
fenfire/org/fenfire/view/SpatialPlane.java:1.11
--- fenfire/org/fenfire/view/SpatialPlane.java:1.10     Tue Apr 15 10:15:12 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java  Tue Apr 15 10:27:07 2003
@@ -25,7 +25,7 @@
  */
 
 public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.10 2003/04/15 
14:15:12 mudyc Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.11 2003/04/15 
14:27:07 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("SpatialPlane::"+s); 
}
 
@@ -110,7 +110,7 @@
     public void renderGL(VobScene vs, int into, 
                       Object node, int cullCS, 
                       Fen fen, NodePlacementHook hook) 
-    { // try {
+    {
        if (frame == null) {
            frame = GLRen.createCallListBoxCoorded(
                "PushAttrib ENABLE_BIT\n" +
@@ -126,16 +126,13 @@
                "PopAttrib"
                );
        }
-       /*
-       Model mod = space.getModel();
-       RDFNode current = node;
-       RDFNode paper = current;
+       Object current = node;
+       Object container = current;
 
-       if (ShortRDF.isNodeType(mod, current, PP.noteType)) {
-           paper = ShortRDF.getSubj(mod, current, PP.contains);
+       if (RDFUtil.isNodeType(fen, current, cType)) {
+           container = fen.constgraph.find1_11X(current, cont);
        }
 
-       */
            /*
 
        float[] bs = new float[2];
@@ -223,12 +220,7 @@
            //  cursorBox = box;
 
        }
-    } catch (RDFException e) {
-       pa("Exception ocurred!: "+e);
-       throw new Error("PPLinker error: Failed to doLink!!");
-    }
        */
-
     }
 
 }