[Gzz-commits] fenfire ./up.sh org/fenfire/modules/pp/BgVob.ja...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/04/14 08:18:56

Modified files:
        .              : up.sh 
        org/fenfire/modules/pp: BgVob.java PPCanvasCursor.java Pp.java 
                                SinglePaper.java UniquePaperVob.java 

Log message:
        some pp work

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/up.sh.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/BgVob.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasCursor.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/SinglePaper.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/UniquePaperVob.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/modules/pp/BgVob.java
diff -u fenfire/org/fenfire/modules/pp/BgVob.java:1.3 
fenfire/org/fenfire/modules/pp/BgVob.java:1.4
--- fenfire/org/fenfire/modules/pp/BgVob.java:1.3       Tue Apr  8 17:13:01 2003
+++ fenfire/org/fenfire/modules/pp/BgVob.java   Mon Apr 14 08:18:55 2003
@@ -43,9 +43,9 @@
  * used to pan pretty easily.
  */
 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 final String rcsid = "$Id: BgVob.java,v 1.4 2003/04/14 12:18:55 
mudyc Exp $";
     public static boolean dbg = false;
-    private static void pa(String s) { System.err.println(s); }
+    private static void pa(String s) { System.out.println("BgVob: "+s); }
 
     static HashMap bgvobs = new HashMap();
 
Index: fenfire/org/fenfire/modules/pp/PPCanvasCursor.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.10 
fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.11
--- fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.10     Wed Apr  9 
18:25:05 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasCursor.java  Mon Apr 14 08:18:55 2003
@@ -11,6 +11,7 @@
 import org.nongnu.libvob.impl.*;
 import org.nongnu.libvob.impl.gl.*;
 import org.nongnu.libvob.buoy.*;
+import org.nongnu.libvob.vobs.*;
 import com.hp.hpl.mesa.rdf.jena.model.*;
 import com.hp.hpl.mesa.rdf.jena.common.*;
 
@@ -23,7 +24,7 @@
 /** XXX
  */
 public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.10 
2003/04/09 22:25:05 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.11 
2003/04/14 12:18:55 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("PPCanvasCursor::"+s); }
 
@@ -114,10 +115,16 @@
 
        // center to the associated note/image/whatever..
        RDFNode node = context.getAccursed();
-        float [] bs = new float[3];
-       nodeview.getSize(node, bs);
-       panx = ShortRDF.getInt(space.getModel(), node, SPATIAL.coordX) + 
bs[0]/2;
-       pany = ShortRDF.getInt(space.getModel(), node, SPATIAL.coordY) + 
bs[1]/2;
+
+       if (ShortRDF.isNodeType(space.getModel(), node, PP.noteType)) {
+           float [] bs = new float[3];
+           nodeview.getSize(node, bs);
+           panx = ShortRDF.getInt(space.getModel(), node, SPATIAL.coordX) + 
bs[0]/2;
+           pany = ShortRDF.getInt(space.getModel(), node, SPATIAL.coordY) + 
bs[1]/2;
+       } else {
+           panx = 0;
+           pany = 0;
+       }
     }
 
 
@@ -136,6 +143,26 @@
     private int c2fCS = -1;
     public void renderMain(VobScene vs, int into) {
        RDFNode node = context.getAccursed();
+       RDFNode paper = node;
+       if (ShortRDF.isNodeType(space.getModel(), node, PP.paperType)) {
+           paper = ShortRDF.getObj(space.getModel(), node, PP.contains);
+
+           // draw "cursor"
+           float[] size = new float[2];
+           vs.coords.getSqSize(into, size);
+
+           float pt[] = vs.coords.transformPoints3(into, new float[3], null);
+
+           int cursor = vs.orthoBoxCS(0, "CURSOR_BOX", 15,
+                                      pt[0]+size[0]/2,
+                                      pt[1]+size[1]/2,
+                                      1,1,
+                                      size[0]/10,
+                                      size[1]/10);
+           vs.put(new LineVob(0,0,0,1, java.awt.Color.white), cursor);
+           pa("Cursor");
+       }
+       
        if (GraphicsAPI.getInstance() instanceof GLAPI) {
            c2fCS = vs.orthoCS(into, "C2F",0,0,0, 10,10);
            int c2fCSInv = vs.orthoCS(into, "C2FINV",0,0,0, 10,10);
@@ -146,11 +173,6 @@
            int zo = (int)(zoom * 100000);
            int geometry = vs.orthoBoxCS(into, "FocusGeometry",0, zo,0, 1,1, 
panx, pany);  
            
-           RDFNode paper = node;
-           if (ShortRDF.isNodeType(space.getModel(), node, PP.noteType)) {
-               paper = ShortRDF.getSubj(space.getModel(), node, PP.contains);
-           }
-
            vs.map.put(new UniquePaperVob(paper.toString()), into, geometry);
            (new SpatialPlane(PP.noteType, PP.contains)).renderAWT(vs, into, 
geometry,
                                                                   node, 
nodeview, space.getModel(),hook);
@@ -186,6 +208,11 @@
            m_state = new int[]{ e.getX(), e.getY(), e.getModifiers()};
            m_state_zoom = zoom;
            pan[0] = panx; pan[1] = pany;
+
+           //int focusFrame = oldVobScene.matcher.getCS("FocusFrame");
+           //oldVobScene.coords.getCSAt(focusFrame, e.getX(), e.getY()
+
+
            return false;
        }
        if (m_state == null) throw new Error("Mouse state not found!");
@@ -202,9 +229,10 @@
            if (GraphicsAPI.getInstance() instanceof GLAPI) {
                ;
            } else {
-               panx = pan[0] - (m_state[0] - e.getX())/zoom;
-               pany = pan[1] - (m_state[1] - e.getY())/zoom;
+               ;
            }
+           panx = pan[0] - (m_state[0] - e.getX())/zoom;
+           pany = pan[1] - (m_state[1] - e.getY())/zoom;
            return true;
        }
        
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.10 
fenfire/org/fenfire/modules/pp/Pp.java:1.11
--- fenfire/org/fenfire/modules/pp/Pp.java:1.10 Wed Apr  9 18:25:05 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java      Mon Apr 14 08:18:55 2003
@@ -29,7 +29,7 @@
 
 
 public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.10 2003/04/09 22:25:05 
mudyc Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.11 2003/04/14 12:18:55 
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); }
@@ -77,7 +77,7 @@
        ppAct.assocNotes(n4, -1, note);
 
 
-       accursed = space.getModel().getResource(n1);
+       accursed = space.getModel().getResource(paper);
 
 
        api.startUpdateManager(new Runnable() {
Index: fenfire/org/fenfire/modules/pp/SinglePaper.java
diff -u fenfire/org/fenfire/modules/pp/SinglePaper.java:1.3 
fenfire/org/fenfire/modules/pp/SinglePaper.java:1.4
--- fenfire/org/fenfire/modules/pp/SinglePaper.java:1.3 Wed Apr  9 08:14:34 2003
+++ fenfire/org/fenfire/modules/pp/SinglePaper.java     Mon Apr 14 08:18:55 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.3 2003/04/09 
12:14:34 mudyc Exp $";  
+private static final String rcsid = "$Id: SinglePaper.java,v 1.4 2003/04/14 
12:18:55 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("SinglePaper:"+s); }
 
@@ -94,8 +94,8 @@
      */
     void render(final VobScene vs, final int frameCS, final int panZoom, 
                    final int inversePanZoom,
-                   NodePlacementHook hook) {
-
+                   NodePlacementHook hook) 
+    {
        final NodePlacementHook hook_final = hook;
 
        // don't want to move this away from here..
Index: fenfire/org/fenfire/modules/pp/UniquePaperVob.java
diff -u fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.8 
fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.9
--- fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.8      Thu Apr 10 
05:55:49 2003
+++ fenfire/org/fenfire/modules/pp/UniquePaperVob.java  Mon Apr 14 08:18:55 2003
@@ -14,7 +14,7 @@
  * surrounded by a rectangle of the current foreground color.
  */
 public class UniquePaperVob extends AbstractVob {
-public static final String rcsid = "$Id: UniquePaperVob.java,v 1.8 2003/04/10 
09:55:49 mudyc Exp $";
+public static final String rcsid = "$Id: UniquePaperVob.java,v 1.9 2003/04/14 
12:18:55 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("UniquePaperVob::"+s); }
 
@@ -55,31 +55,26 @@
        float k = rand.nextFloat() * 2 -1;
        float j = (float)Math.cos(k - Math.PI/2);
 
-       float ratio = rand.nextFloat();
+       float ratio = rand.nextFloat()*0.7f + 1.5f;
        Color c1 = getUniqColor();
        Color c2 = getUniqColor();
 
-       float a=0;
-       for (boolean again=true; again;) {
-           try {
-               a =(float) Math.PI * rand.nextFloat();
-               Math.tan(a);
-               again = false;
-           } catch (ArithmeticException e) { again = true; }
-       }
+       float a =(float) Math.PI * rand.nextFloat();
        if (a > Math.PI/4 && a <= Math.PI *3f/4) {
            // verticals..
-           
-           float linew = mw/(rand.nextInt()%5 + 3);
+
+           float linew = mw/((Math.abs(rand.nextInt())%5) + 3);
            float begin_x;
            float f = mx + mw/2 + panx*zoom;
            
            // >> if too far we have to be at least mw away from mx. 
            while ( f < mx - 2*mw) {
+               try {
                f += Math.abs( ((ratio * linew)/j)*zoom );
                f += Math.abs( (((1-ratio) * linew)/j)*zoom );
+               } catch (Exception e) { pa("e:"+e); }
            }
-               
+
            // << if too near
            while( f > mx-2*mw ) {
                f -= Math.abs( ((ratio * linew)/j)*zoom );
@@ -135,11 +130,9 @@
 
        //pa("x"+x+"y"+y+"w"+w+"h"+h);
        
-
        g.setColor(Color.gray);
        g.fillRect(x, y, w, h);
        
-
        g.setColor(oldfg);
        g.setClip(oldClip);
     }
Index: fenfire/up.sh
diff -u fenfire/up.sh:1.2 fenfire/up.sh:1.3
--- fenfire/up.sh:1.2   Tue Apr  8 16:05:02 2003
+++ fenfire/up.sh       Mon Apr 14 08:18:55 2003
@@ -13,7 +13,8 @@
 
 # make all projects
 cd $DIR
-for x in `ls -1|grep -v gzz|grep -v Z||grep -v depend |grep -v fen |grep -v 
mstmpimg`;
-  do cd $DIR/$x && pwd && make -s;
-done;
-cd $DIR/fenfire && ant clean compile
+#for x in `ls -1|grep -v gzz|grep -v Z||grep -v depend |grep -v fen 
+#|grep -v mstmpimg`;
+#  do cd $DIR/$x && pwd && make -s;
+#done;
+#cd $DIR/fenfire && ant clean compile