[Gzz-commits] gzz gfx/demo/buoyoing.py gzz/view/buoy/buoymana...

[Janne V. Kujala]

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

Modified files:
        gfx/demo       : buoyoing.py 
        gzz/view/buoy  : buoymanager.py pagespanNodes.py 

Log message:
        screenshot movement code

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/buoyoing.py.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/buoymanager.py.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/pagespanNodes.py.diff?tr1=1.39&tr2=1.40&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/buoyoing.py
diff -u gzz/gfx/demo/buoyoing.py:1.28 gzz/gfx/demo/buoyoing.py:1.29
--- gzz/gfx/demo/buoyoing.py:1.28       Sat Feb 15 04:22:45 2003
+++ gzz/gfx/demo/buoyoing.py    Sat Feb 15 05:02:49 2003
@@ -91,6 +91,7 @@
     setPan(trans, transX,transY)
     space.getCellTexter().setEnfilade(
            trans, pagespanNodes.makeEnf(span))
+    return trans
 
 xulinks = 1
 
@@ -130,7 +131,8 @@
     wholepage = pg0.getCurrent().subSpan(0,1)
     span = wholepage.subArea(50, 50, 400, 150)
     paper = newPaper()
-    addTrans(span, paper)
+    global linkid1
+    linkid1 = addTrans(span, paper)
     addNote(paper, 'Foobar', -30, 50)
 
     paper2 = newPaper()
@@ -173,9 +175,7 @@
 
 
 def screenshots():
-
     frame = 0
-    
     s = Scene()
         
     # FIXME: move s to initial position
@@ -184,11 +184,12 @@
     #    1) notice which buoy was clicked
     #    2) separate method: move to that buoy
     #    Then, call the 2nd method from outside.
+
+    s.mainNode.moveTo(50, 200)
     vs1 = w.createVobScene()
     s.scene(vs1)
 
-    # FIXME: move s to final position
-    s.followLinkByAnchor('urn:urn-5:xrbHJx-3HfHVW1aW0FMAG0fFWq-h:7')
+    s.followLinkByAnchor(linkid1)
     vs2 = w.createVobScene()
     s.scene(vs2)
 
@@ -204,5 +205,5 @@
     frame += 1
     
         
-if 0:
+if 1:
     screenshots()
Index: gzz/gzz/view/buoy/buoymanager.py
diff -u gzz/gzz/view/buoy/buoymanager.py:1.43 
gzz/gzz/view/buoy/buoymanager.py:1.44
--- gzz/gzz/view/buoy/buoymanager.py:1.43       Sat Feb 15 04:22:46 2003
+++ gzz/gzz/view/buoy/buoymanager.py    Sat Feb 15 05:02:49 2003
@@ -183,9 +183,11 @@
         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
-
+            if self.cs[key] != None:
+                a = self.cs[key][2]
+                if a == anchor:
+                    self.followLink(self.cs[key])
+                    return
+                
         print "Anchor not found!!!"
         
Index: gzz/gzz/view/buoy/pagespanNodes.py
diff -u gzz/gzz/view/buoy/pagespanNodes.py:1.39 
gzz/gzz/view/buoy/pagespanNodes.py:1.40
--- gzz/gzz/view/buoy/pagespanNodes.py:1.39     Fri Feb 14 13:17:22 2003
+++ gzz/gzz/view/buoy/pagespanNodes.py  Sat Feb 15 05:02:49 2003
@@ -228,6 +228,15 @@
        self.data.layout.request(self.fisheye.curx, self.fisheye.cury, 
                            self.data.layout.w, 1, .8, 2000)
 
+    def moveTo(self, x, y):
+        if x < 0: x = 0
+        if y < 0: y = 0
+        if x > self.data.layout.w: x = self.data.layout.w
+        if y > self.data.layout.h: y = self.data.layout.h
+        self.fisheye.setCenter(x, y)
+        gzz.client.AbstractUpdateManager.chg()
+        self.doReq()
+
     def mouse(self, mouseEvent, oldVS):
        if self.fisheye.event(mouseEvent):
            self.fisheye.setCoordsysParams()
@@ -251,13 +260,7 @@
            print "Retransformed:", tmp[0], tmp[1], tmp[2]
            x = size[0]
            y = size[1]
-           if x < 0: x = 0
-           if y < 0: y = 0
-           if x > self.data.layout.w: x = self.data.layout.w
-           if y > self.data.layout.h: y = self.data.layout.h
-           self.fisheye.setCenter(x, y)
-           gzz.client.AbstractUpdateManager.chg()
-           self.doReq()
+            self.moveTo(x, y)
            # self.setShift(oldVS)
            return 0
        return 0