[ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/21 15:23:59

Modified files:
        org/fenfire/bin: fenpdf10.py 
        org/fenfire/fenpdf: fenpdf.py 
        org/fenfire/structure: Canvas2D.java 

Log message:
        patch-23
        Fix tests
        patch-24
        Test for canvas
        patch-25
        Add treetime to FenPDF object -- now all structure there

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdf.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/structure/Canvas2D.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.64 
fenfire/org/fenfire/bin/fenpdf10.py:1.65
--- fenfire/org/fenfire/bin/fenpdf10.py:1.64    Thu Aug 21 14:31:01 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Thu Aug 21 15:23:59 2003
@@ -288,7 +288,7 @@
         vob.AbstractUpdateManager.chg()
         return 1
 
-fenPDF = ff.fenpdf.fenpdf.FenPDF(fen)
+fenPDF = ff.fenpdf.fenpdf.FenPDF(fen, treetime)
 
 
 papers = ff.fenpdf.appearance.papers.Papers()
Index: fenfire/org/fenfire/fenpdf/fenpdf.py
diff -u fenfire/org/fenfire/fenpdf/fenpdf.py:1.3 
fenfire/org/fenfire/fenpdf/fenpdf.py:1.4
--- fenfire/org/fenfire/fenpdf/fenpdf.py:1.3    Thu Aug 21 14:31:02 2003
+++ fenfire/org/fenfire/fenpdf/fenpdf.py        Thu Aug 21 15:23:59 2003
@@ -33,7 +33,7 @@
     """
 
 
-    def __init__(self, fen):
+    def __init__(self, fen, treeTime):
        self.fen = fen
 
        self.events = _Empty()
@@ -41,6 +41,9 @@
        self.structure = _Empty()
 
        self.structure.structLink = ff.structure.StructLink.create(fen.graph)
+       self.structure.alphContent = ff.util.AlphContent(fen)
+       self.structure.canvas2d = ff.structure.Canvas2D.create(fen.graph)
+       self.structure.treeTime = treeTime
 
 
 
Index: fenfire/org/fenfire/structure/Canvas2D.java
diff -u fenfire/org/fenfire/structure/Canvas2D.java:1.2 
fenfire/org/fenfire/structure/Canvas2D.java:1.3
--- fenfire/org/fenfire/structure/Canvas2D.java:1.2     Thu Aug 21 14:31:02 2003
+++ fenfire/org/fenfire/structure/Canvas2D.java Thu Aug 21 15:23:59 2003
@@ -16,12 +16,35 @@
     ConstGraph constGraph;
     Graph graph;
 
-    public Canvas2D(ConstGraph g) {
-       if(g instanceof Graph) 
-           this.graph = (Graph)g;
+    private Canvas2D(ConstGraph g) {
        this.constGraph = g;
     }
 
+    private Canvas2D(Graph g) {
+       this.graph = g;
+       this.constGraph = g;
+    }
+
+    /** Copy the iterator into a set, then return an iterator 
+     * into the set.
+     * XXX Generalize into utility routine
+     */
+    private Iterator copyIterator(Iterator it) {
+       Set s = new HashSet();
+       while(it.hasNext()) s.add(it.next());
+       return s.iterator();
+    }
+
+    /** Create a new Canvas2D.
+     */
+    static public Canvas2D create(ConstGraph g) {
+       return new Canvas2D(g);
+    }
+    static public Canvas2D create(Graph g) {
+       return new Canvas2D(g);
+    }
+
+
     /** Return true if the given node is a canvas.
      */
     public boolean isCanvas(Object node) {
@@ -77,6 +100,22 @@
        // XXX
        graph.set1_11X(node, CANVAS2D.x, Nodes.getStringLiteral(""+x) );
        graph.set1_11X(node, CANVAS2D.y, Nodes.getStringLiteral(""+y) );
+    }
+
+    /** Remove the node from the canvas and remove the coordinates.
+     */
+    public void removeNode(Object node) {
+        Object canvas = graph.find1_X11(CANVAS2D.contains, node);
+        graph.rm_111(canvas, CANVAS2D.contains, node);
+    }
+
+    /** Delete a canvas, and all nodes' placements within it.
+     */
+    public void deleteCanvas(Object canvas) {
+       Iterator it = copyIterator(getNodesOn(canvas));
+       while(it.hasNext())
+           removeNode(it.next());
+       graph.rm_111(canvas, RDF.type, CANVAS2D.Canvas);
     }