[Gzz-commits] fenfire docs/pegboard/fenpdf_v1_spec_1--tjl/peg...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/07/30 05:11:46

Modified files:
        docs/pegboard/fenpdf_v1_spec_1--tjl: peg.rst 
        org/fenfire/view/buoy: AbstractNodeType2D.java NodeType2D.java 
                               PPConnector.java 
                               TransclusionConnector.java 

Log message:
        Avoid pairs of pairs... Maybe the generic triple is NOT a good class to 
use here...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/pegboard/fenpdf_v1_spec_1--tjl/peg.rst.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/NodeType2D.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPConnector.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/TransclusionConnector.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: fenfire/docs/pegboard/fenpdf_v1_spec_1--tjl/peg.rst
diff -u fenfire/docs/pegboard/fenpdf_v1_spec_1--tjl/peg.rst:1.3 
fenfire/docs/pegboard/fenpdf_v1_spec_1--tjl/peg.rst:1.4
--- fenfire/docs/pegboard/fenpdf_v1_spec_1--tjl/peg.rst:1.3     Tue Jul 29 
10:06:36 2003
+++ fenfire/docs/pegboard/fenpdf_v1_spec_1--tjl/peg.rst Wed Jul 30 05:11:45 2003
@@ -4,8 +4,8 @@
 
 :Authors:  Tuomas J. Lukka
 :Date-Created: 2003-07-28
-:Last-Modified: $Date: 2003/07/29 14:06:36 $
-:Revision: $Revision: 1.3 $
+:Last-Modified: $Date: 2003/07/30 09:11:45 $
+:Revision: $Revision: 1.4 $
 :Status:   Incomplete
 :Stakeholders: benja, mudyc, humppake
 :Scope:    Major
@@ -31,9 +31,14 @@
 
   OTOH, clinks have their uses.
 
+  Hmm, for v1.0 maybe we should have *either* clinks *or*
+  pdf transclusions but not both?
+
 - RDF for cursors / bookmarks? Is just two views good enough
   for browsing? Accidental severing of contacts. Need some way to get anywhere.
 
+  PROPOSED RESOLUTION: TREETIME for now.
+
 - "overall view" of the whole space? -- embed to 2D somehow for a map?
 
   RESOLVED: Later. Needs experiments first
@@ -42,6 +47,8 @@
   Gives more actions for the mouse, but may be confusing; the UI is definitely
   not self-explanatory then.
 
+  RESOLVED: Later.
+
 - Should left-button click+drag select or move?
 
   PROPOSED RESOLUTION: move. Shift for select. Clicking and dragging
@@ -50,13 +57,15 @@
 - Do we need bookmarks and overall views - would simply connecting the previous
   and next canvas and pageimagescrolls in time order?
 
-- What were benja's suggestions - couldn't find a PEG
+  PROPOSED RESOLUTION: Use TREETIME and provide interface for it.
 
 - Should the elements in the system contain their insertion time?
   As wallclock time or a tree (when merging)?
 
   PROPOSED RESOLUTION: Use TREETIME and provide interface for it.
 
+- What were benja's suggestions - couldn't find a PEG
+
 Introduction
 ============
 
@@ -74,7 +83,8 @@
 FenPDF 1.0 is kind of a "director's cut" (a term Ted sometimes used), 
 and it's expected that there will be parallel versions, with different
 names and identities that do almost the same thing but differently.
-These are good for experiments and competition is healthy.
+These are good for experiments and competition is healthy -- the same
+components can be assembled differently by different people.
 
 This spec is **extremely** conservative as to which features are taken 
 in. We need a working baseline 1.0 that remains the same and functional.
@@ -229,7 +239,10 @@
 Context Menus
 -------------
 
-For any object, "Delete this X" where X is "Text", "Paper", "PDF file", ...
+On struct-connected buoys: "Unlink this buoy"
+
+For any object, "Delete this X" where X is "Text", "Paper", "PDF file", 
"transclusion"
+
 
 Visible buttons
 ---------------
@@ -260,6 +273,8 @@
 
 The buttons shall be placed to the upper left corner, stacked vertically, and 
shall
 be relatively small (10-15pixels high)
+
+Some space between action buttons and toggles.
 
 Versioning / Merging
 ====================
Index: fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java:1.4 
fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java:1.5
--- fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java:1.4   Fri Jun 27 
18:18:41 2003
+++ fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java       Wed Jul 30 
05:11:46 2003
@@ -27,6 +27,7 @@
 package org.fenfire.view.buoy;
 import org.fenfire.view.View2D;
 import org.fenfire.util.Pair;
+import org.fenfire.util.Triple;
 import org.nongnu.libvob.*;
 import org.nongnu.libvob.impl.DefaultVobMatcher;
 import org.nongnu.libvob.buoy.*;
@@ -49,10 +50,9 @@
 
     public BuoyViewMainNode createMainNode(Object linkId, 
                                           Object anchor) {
-       Pair p = (Pair)anchor;
-       Object plane = p.first;
-       Pair q = (Pair)p.second;
-       Rectangle rect = (Rectangle)q.first;
+       Triple t = (Triple)anchor;
+       Object plane = t.first;
+       Rectangle rect = (Rectangle)t.second;
 
        return mainNodeFactory.create(plane, view2d,
                              rect.x+rect.width/2f,
Index: fenfire/org/fenfire/view/buoy/NodeType2D.java
diff -u fenfire/org/fenfire/view/buoy/NodeType2D.java:1.11 
fenfire/org/fenfire/view/buoy/NodeType2D.java:1.12
--- fenfire/org/fenfire/view/buoy/NodeType2D.java:1.11  Fri Jun 27 18:18:41 2003
+++ fenfire/org/fenfire/view/buoy/NodeType2D.java       Wed Jul 30 05:11:46 2003
@@ -28,6 +28,7 @@
 import org.fenfire.view.View2D;
 import org.fenfire.view.NodedView2D;
 import org.fenfire.util.Pair;
+import org.fenfire.util.Triple;
 import org.nongnu.libvob.*;
 import org.nongnu.libvob.impl.DefaultVobMatcher;
 import org.nongnu.libvob.buoy.*;
@@ -52,9 +53,8 @@
     
     public Object getSize(Object linkId, Object anchor,
                          float wh[]) {
-       Pair p = (Pair)anchor;
-       Pair q = (Pair)p.second;
-       Rectangle rect = (Rectangle)q.first;
+       Triple t = (Triple)anchor;
+       Rectangle rect = (Rectangle)t.second;
        wh[0] = rect.width;
        wh[1] = rect.height;
        return null;
@@ -68,12 +68,11 @@
            vs.map.put( eff, into);
            return into;
        }
-       Pair p = (Pair)anchor;
-       Object plane = p.first;
+       Triple t = (Triple)anchor;
+       Object plane = t.first;
 
-       Pair q = (Pair)p.second;
-       Rectangle rect = (Rectangle)q.first;
-       Object node = q.second; // may be null if this
+       Rectangle rect = (Rectangle)t.second;
+       Object node = t.third; // may be null if this
                                // is not a noded View2D
        
        float[] tmp = new float[2];
Index: fenfire/org/fenfire/view/buoy/PPConnector.java
diff -u fenfire/org/fenfire/view/buoy/PPConnector.java:1.17 
fenfire/org/fenfire/view/buoy/PPConnector.java:1.18
--- fenfire/org/fenfire/view/buoy/PPConnector.java:1.17 Mon Jul 28 04:22:33 2003
+++ fenfire/org/fenfire/view/buoy/PPConnector.java      Wed Jul 30 05:11:46 2003
@@ -40,7 +40,7 @@
 /** Make the kinds of links familiar from PP structure.
  */
 public class PPConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: PPConnector.java,v 1.17 2003/07/28 
08:22:33 tjl Exp $";
+public static final String rcsid = "$Id: PPConnector.java,v 1.18 2003/07/30 
09:11:46 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPConnector::"+s); }
 
@@ -94,7 +94,7 @@
                Object obj = iter.next();
                Object plane = fen.constgraph.find1_X11(CANVAS2D.contains, obj);
                if (container == plane) continue;
-               Pair anchor = new Pair(plane, new Pair(getRect(obj), obj));
+               Object anchor = new Triple(plane, getRect(obj), obj);
                if (dbg) pa("rect:"+getRect(obj));
                l.link(1, cs, nodeType, new Pair(node, obj), anchor, shift);
                 shift++;
@@ -107,7 +107,7 @@
                Object obj = iter.next();
                Object plane = fen.constgraph.find1_X11(CANVAS2D.contains, obj);
                if (container == plane) continue;
-               Pair anchor = new Pair(plane, new Pair(getRect(obj), obj));
+               Object anchor = new Triple(plane, getRect(obj), obj);
                if (dbg) pa("rect:"+getRect(obj));
                l.link(-1, cs, nodeType, new Pair(obj, node), anchor, shift);
                 shift++;
Index: fenfire/org/fenfire/view/buoy/TransclusionConnector.java
diff -u fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.16 
fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.17
--- fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.16       Mon Jul 
28 04:22:33 2003
+++ fenfire/org/fenfire/view/buoy/TransclusionConnector.java    Wed Jul 30 
05:11:46 2003
@@ -44,7 +44,7 @@
 /** Hang transclusion buoys.
  */
 public class TransclusionConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: TransclusionConnector.java,v 1.16 
2003/07/28 08:22:33 tjl Exp $";
+public static final String rcsid = "$Id: TransclusionConnector.java,v 1.17 
2003/07/30 09:11:46 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("TransclusionConnector:: "+s); }
 
@@ -148,7 +148,7 @@
                        if(dbg) pa("No plane!");
                        continue;
                    }
-                   Object anchor = new Pair(plane, new Pair(getRect(node), 
null));
+                   Object anchor = new Triple(plane, getRect(node), null);
                    l.link(-1, cs, normalNodeNodeType,
                            new Pair(node, span.getScrollBlock()),
                            anchor);