[Gzz-commits] libvob include/vob/trans/LinearPrimitives.hxx t...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/16 06:37:57

Modified files:
        include/vob/trans: LinearPrimitives.hxx 
        test/vob/gl    : glvobcoorder.test 

Log message:
        Retain unitsq

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/trans/LinearPrimitives.hxx.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/gl/glvobcoorder.test.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: libvob/include/vob/trans/LinearPrimitives.hxx
diff -u libvob/include/vob/trans/LinearPrimitives.hxx:1.3 
libvob/include/vob/trans/LinearPrimitives.hxx:1.4
--- libvob/include/vob/trans/LinearPrimitives.hxx:1.3   Wed Apr 16 06:19:50 2003
+++ libvob/include/vob/trans/LinearPrimitives.hxx       Wed Apr 16 06:37:57 2003
@@ -222,6 +222,7 @@
      */
     class NadirUnitSq :
        public RotateCenteredXY,
+       public BoxPrimitiveTransform,
        public DependentPrimitiveTransform {
     public:
        enum { NDepends = 2 }; // parent and nadir
@@ -238,6 +239,9 @@
 
            a = angle * 180 / M_PI;
 
+       }
+       Pt getSqSize() const { 
+           return Pt(2*ox, 2*oy); 
        }
     };
     VOB_PRIMITIVETRANS_DEFINED(NadirUnitSq, "nadirUnitSq");
Index: libvob/test/vob/gl/glvobcoorder.test
diff -u libvob/test/vob/gl/glvobcoorder.test:1.11 
libvob/test/vob/gl/glvobcoorder.test:1.12
--- libvob/test/vob/gl/glvobcoorder.test:1.11   Tue Apr  8 11:26:10 2003
+++ libvob/test/vob/gl/glvobcoorder.test        Wed Apr 16 06:37:57 2003
@@ -308,4 +308,11 @@
     checkInterp(vs, vs2, interp , 1, cs1, [0, 1, 0], [-1, 0, 0])
     checkInterp(vs, vs2, interp , .5, cs1, [0, 1, 0], [-.5, 1, 0])
 
+def testBox():
+    cs1 = vs.orthoBoxCS(0, "A", 1, 2, 3, 4, 5, 6, 7)
+    wh = zeros(2, 'f')
+    vs.coords.getSqSize(cs1, wh)
+    failUnlessEqual(wh[0], 6);
+    failUnlessEqual(wh[1], 7);
+
 # : vim: set syntax=python :