[Gzz-commits] gzz gzz/view/buoy/buoymanager.py test/gzz/gfx/g...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/02/05 07:32:39

Modified files:
        gzz/view/buoy  : buoymanager.py 
        test/gzz/gfx/gl: glvobcoorder.test 

Log message:
        translateargswrong

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/buoymanager.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/gl/glvobcoorder.test.diff?tr1=1.32&tr2=1.33&r1=text&r2=text

Patches:
Index: gzz/gzz/view/buoy/buoymanager.py
diff -u gzz/gzz/view/buoy/buoymanager.py:1.5 
gzz/gzz/view/buoy/buoymanager.py:1.6
--- gzz/gzz/view/buoy/buoymanager.py:1.5        Wed Feb  5 07:27:36 2003
+++ gzz/gzz/view/buoy/buoymanager.py    Wed Feb  5 07:32:39 2003
@@ -38,7 +38,7 @@
 
        vs.put(background((.5,.8,.5)))
 
-       center = vs.translateCS(0, "Center", 0, 400, 300)
+       center = vs.translateCS(0, "Center", 400, 300)
 
        main = vs.orthoBoxCS(center, "MAINVP", 0, 
                                -100, -100, .2, .2, 1000, 1000)
Index: gzz/test/gzz/gfx/gl/glvobcoorder.test
diff -u gzz/test/gzz/gfx/gl/glvobcoorder.test:1.32 
gzz/test/gzz/gfx/gl/glvobcoorder.test:1.33
--- gzz/test/gzz/gfx/gl/glvobcoorder.test:1.32  Wed Feb  5 07:27:36 2003
+++ gzz/test/gzz/gfx/gl/glvobcoorder.test       Wed Feb  5 07:32:39 2003
@@ -177,13 +177,30 @@
     # center of the box by nadirUnitSq
     # center = 600, 600
     cs_orthobox = c1.orthoBox(0, 0, 500, 500, .2, .2, 1000, 1000)
-    cs_nadir = c1.translate(0, 0, 1000)
+    cs_nadir = c1.translate(0, 600, 1000)
     cs_rot = c1.nadirUnitSq(cs_orthobox, cs_nadir)
 
     checkTrans(vs1, cs_rot,
-       [500, 500, 0],
-       [600, 600, 0],
+       [500, 500, 0, 600, 500, 0],
+       [600, 600, 0, 620, 600, 0],
        .1)
+
+    center = vs1.translateCS(0, "Center", 400, 300)
+
+    main = vs1.orthoBoxCS(center, "MAINVP", 0, 
+                           -100, -100, .2, .2, 1000, 1000)
+
+    nadirCS = vs1.translateCS(0, "NADIRORIGIN", 400, 1500)
+
+    n =  vs1.coords.nadirUnitSq(main, nadirCS)
+
+
+    checkTrans(vs1, n,
+       [0, 0, 0, 500, 500, 0],
+       [300, 200, 0, 400, 300, 0],
+       .1)
+
+
 
 import gfx.libpaper.papermill
 from gfx.libpaper.papermill import ThePaperMill