[Gzz-commits] gzz gfx/demo/buoyoing.py gzz/modules/pp2/PPCanv...

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        03/02/15 04:22:46

Modified files:
        gfx/demo       : buoyoing.py 
        gzz/modules/pp2: PPCanvasNode.java 
        gzz/view/buoy  : buoymanager.py 

Log message:
        trying to follow links from screenshot code

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/buoyoing.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasNode.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/buoymanager.py.diff?tr1=1.42&tr2=1.43&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/buoyoing.py
diff -u gzz/gfx/demo/buoyoing.py:1.27 gzz/gfx/demo/buoyoing.py:1.28
--- gzz/gfx/demo/buoyoing.py:1.27       Sat Feb 15 01:16:56 2003
+++ gzz/gfx/demo/buoyoing.py    Sat Feb 15 04:22:45 2003
@@ -178,18 +178,18 @@
     
     s = Scene()
         
-    vs1 = w.createVobScene()
     # FIXME: move s to initial position
     #  - to do this, 1) separate the mouse() code
     #    in buoymanager to two parts: 
     #    1) notice which buoy was clicked
     #    2) separate method: move to that buoy
     #    Then, call the 2nd method from outside.
+    vs1 = w.createVobScene()
     s.scene(vs1)
 
-    vs2 = w.createVobScene()
     # FIXME: move s to final position
-    
+    s.followLinkByAnchor('urn:urn-5:xrbHJx-3HfHVW1aW0FMAG0fFWq-h:7')
+    vs2 = w.createVobScene()
     s.scene(vs2)
 
     for fract in (0, 1/3., 2/3., 1):
Index: gzz/gzz/modules/pp2/PPCanvasNode.java
diff -u gzz/gzz/modules/pp2/PPCanvasNode.java:1.16 
gzz/gzz/modules/pp2/PPCanvasNode.java:1.17
--- gzz/gzz/modules/pp2/PPCanvasNode.java:1.16  Fri Feb 14 08:41:31 2003
+++ gzz/gzz/modules/pp2/PPCanvasNode.java       Sat Feb 15 04:22:46 2003
@@ -37,7 +37,7 @@
 /** XXX
  */
 public class PPCanvasNode implements CellBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.16 2003/02/14 
13:41:31 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.17 2003/02/15 
09:22:46 jvk Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPCanvasNode:"+s); }
 
@@ -88,8 +88,8 @@
     }
 
     public Object getSize(Cell c, Object content, float[] wh) {
-       wh[0] = 200;
-       wh[1] = 200;
+       wh[0] = 250;
+       wh[1] = 250;
        return null;
     }
 
Index: gzz/gzz/view/buoy/buoymanager.py
diff -u gzz/gzz/view/buoy/buoymanager.py:1.42 
gzz/gzz/view/buoy/buoymanager.py:1.43
--- gzz/gzz/view/buoy/buoymanager.py:1.42       Fri Feb 14 12:29:14 2003
+++ gzz/gzz/view/buoy/buoymanager.py    Sat Feb 15 04:22:46 2003
@@ -145,9 +145,6 @@
 
     def key(self, key):
         if key == "Print":
-            vs = w.createVobScene()
-            self.scene(vs)
-            w.renderStill(vs, 0)
             saveanim.saveframe("buoyoing.png", w)
             
        gzz.client.AbstractUpdateManager.chg()
@@ -168,9 +165,27 @@
             if ev.getID() != ev.MOUSE_CLICKED:
                 return
 
-            self.animationCS_buoy = [cs, link, self.vs]
-            self.animationCS_main = [self.mainCS, link, self.vs]
+            self.followLink(link)
+            gzz.client.AbstractUpdateManager.chg()
 
-           self.mainNode = link[0].createMainNode(link[1], link[2], self)
-           gzz.client.AbstractUpdateManager.chg()
            
+    def followLink(self, link):
+        cs = link[3]
+        self.animationCS_buoy = [cs, link, self.vs]
+        self.animationCS_main = [self.mainCS, link, self.vs]
+
+
+        print "Following link", link
+
+        self.mainNode = link[0].createMainNode(link[1], link[2], self)
+
+    def followLinkByAnchor(self, anchor):
+        print "Searching for anchor", anchor
+        for key in self.cs.keys():
+            print "Comparing to", self.cs[key]
+            if self.cs[key] != None and self.cs[key][2] == anchor:
+                self.followLink(self.cs[key])
+                return
+
+        print "Anchor not found!!!"
+