Python Computer Graphics Kit

Revision: 285
          http://cgkit.svn.sourceforge.net/cgkit/?rev=285&view=rev
Author:   mbaas
Date:     2009-02-10 07:49:42 +0000 (Tue, 10 Feb 2009)

Log Message:
-----------
The point cloud reader now tracks the number of points that have been read.

Modified Paths:
--------------
    cgkit/trunk/cgkit/pointcloud.py
    cgkit/trunk/pyrex/c/_pointcloud.c
    cgkit/trunk/pyrex/pyx/_pointcloud.pyx
    cgkit/trunk/unittests/test_pointcloud.py

Modified: cgkit/trunk/cgkit/pointcloud.py
===================================================================
--- cgkit/trunk/cgkit/pointcloud.py	2009-02-09 22:04:25 UTC (rev 284)
+++ cgkit/trunk/cgkit/pointcloud.py	2009-02-10 07:49:42 UTC (rev 285)
@@ -128,6 +128,7 @@
         
         self._handle = handle
 
+        self.name = fileName
         self.variables = []
         self.npoints = None
         self.bbox = None
@@ -175,9 +176,16 @@
         if ptclib.PtcGetPointCloudInfo(handle, "world2ndc", m)==1:
             self.world2ndc = list(m)
 
+        if self.npoints is None:
+            raise IOError("Could not obtain the number of points in point cloud file %s."%fileName)
+        if self.npoints<0:
+            raise ValueError("The number of points in the point cloud file is negative (%s)."%self.npoints)
         if self.datasize is None:
             raise IOError("Could not obtain datasize value from point cloud file %s."%fileName)
 
+        # The number of points that can still be read before eof is hit
+        self._numPointsLeft = self.npoints
+
         # Set up storage for reading individual data points
         self._pos = (3*ctypes.c_float)()
         self._normal = (3*ctypes.c_float)()
@@ -206,14 +214,19 @@
         Returns a tuple (pos, normal, radius, dataDict) where pos and normal
         are 3-tuples of floats, radius is a single float and dataDict a
         dictionary with the extra variables that are attached to the point.
-        If no more point is available None is returned.
+        If no more point is available an EOFError exception is thrown.
+        An IOErrror handle is thrown when an error occurs during reading or
+        when the file has already been closed.
         """
         if self._handle is None:
-            raise IOError("The point cloud file has already been closed.")
+            raise IOError("The point cloud file has already been closed (%s)"%self.name)
+        if self._numPointsLeft==0:
+            raise EOFError("There are no more points left to read from point cloud file %s"%self.name)
         
+        self._numPointsLeft -= 1
         res = self._PtcReadDataPoint(self._handle, self._pos, self._normal, self._radius, self._data)
         if res==0:
-            return None
+            raise IOError("Error while reading data point from point cloud file %s"%self.name)
         else:
             dataDict = {}
             data = self._data
@@ -233,8 +246,11 @@
         
         The return value is the number of points that have actually
         been read (additional items in the buffers remain at their previous
-        value).
+        value). When 0 is returned, the end of the file has been reached.
         """
+        if numPoints<=0:
+            return 0
+        
         # Are there 4 individual buffers?
         if type(buffer) is tuple:
             if len(buffer)!=4:
@@ -260,10 +276,13 @@
             radPtr = normPtr+3*sizeOfFloat
             dataPtr = radPtr+sizeOfFloat
         
+        num = min(numPoints, self._numPointsLeft)
+        
         # Read the points
-        n = _pointcloud.readDataPoints(ctypes.addressof(self._PtcReadDataPoint), self._handle, numPoints,
-                                       pntPtr, pntStride, normPtr, normStride, radPtr, radStride, dataPtr, dataStride)
-        return n
+        self._numPointsLeft -= num
+        _pointcloud.readDataPoints(ctypes.addressof(self._PtcReadDataPoint), self._handle, num,
+                                   pntPtr, pntStride, normPtr, normStride, radPtr, radStride, dataPtr, dataStride)
+        return num
 
     def iterPoints(self):
         """Iterate over all the points in the file.
@@ -271,11 +290,8 @@
         Yields tuples (point,normal,radius,data) for every point in the file.
         This is equivalent to calling readDataPoint() repeatedly.
         """
-        while 1:
-            data = self.readDataPoint()
-            if data is None:
-                break
-            yield data
+        while self._numPointsLeft>0:
+            yield self.readDataPoint()
             
     def iterBatches(self, batchSize=1000, combinedBuffer=False, numpyArray=False):
         """Iterate over point batches.
@@ -295,7 +311,7 @@
         if numpyArray and not _numpy_available:
             raise ImportError("numpy is not available") 
         
-        num = self.npoints
+        num = self._numPointsLeft
         buffer = None
         bufLen = 0
         while num>0:

Modified: cgkit/trunk/pyrex/c/_pointcloud.c
===================================================================
--- cgkit/trunk/pyrex/c/_pointcloud.c	2009-02-09 22:04:25 UTC (rev 284)
+++ cgkit/trunk/pyrex/c/_pointcloud.c	2009-02-10 07:49:42 UTC (rev 285)
@@ -1,4 +1,4 @@
-/* Generated by Pyrex 0.9.8.5 on Sun Feb  8 11:51:47 2009 */
+/* Generated by Pyrex 0.9.8.5 on Tue Feb 10 07:47:20 2009 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -57,13 +57,16 @@
 typedef int (*__pyx_t_11_pointcloud_PtcWriteDataPointPtr)(__pyx_t_11_pointcloud_PtcPointCloud,float *,float *,float,float *);
 
 
-static char __pyx_k1[] = "Failed to write data point into point cloud file";
+static char __pyx_k1[] = "Failed to read data point from point cloud file";
+static char __pyx_k2[] = "Failed to write data point into point cloud file";
 
 
 static PyObject *__pyx_k1p;
+static PyObject *__pyx_k2p;
 
 static __Pyx_StringTabEntry __pyx_string_tab[] = {
   {&__pyx_k1p, 0, __pyx_k1, sizeof(__pyx_k1)},
+  {&__pyx_k2p, 0, __pyx_k2, sizeof(__pyx_k2)},
   {0, 0, 0, 0}
 };
 
@@ -72,7 +75,7 @@
 /* Implementation of _pointcloud */
 
 static PyObject *__pyx_f_11_pointcloud_readDataPoints(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
-static char __pyx_doc_11_pointcloud_readDataPoints[] = "Read a sequence of data points.\n    \n    readFuncLoc is the location of the PtcReadDataPoint function pointer.\n    ptcHandle is the open point cloud handle. numPoints is the number of\n    points that should be read.\n    All the *Buf variables are the respective buffers where the data is written\n    to. *Stride is the number of floats to advance the pointers to get to the\n    next data location. The buffers must be large enough to hold numPoints\n    items.\n    The return value is the number of points that were actually read.\n    ";
+static char __pyx_doc_11_pointcloud_readDataPoints[] = "Read a sequence of data points.\n    \n    readFuncLoc is the location of the PtcReadDataPoint function pointer.\n    ptcHandle is the open point cloud handle. numPoints is the number of\n    points that should be read.\n    All the *Buf variables are the respective buffers where the data is written\n    to. *Stride is the number of floats to advance the pointers to get to the\n    next data location. The buffers must be large enough to hold numPoints\n    items.\n    numPoints must at least be the number of points that are still left\n    in the file (otherwise the function may generate an exception or return\n    bogus values, whatever the underlying RenderMan implementation does).\n    ";
 static PyObject *__pyx_f_11_pointcloud_readDataPoints(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
   long __pyx_v_readFuncLoc;
   long __pyx_v_ptcHandle;
@@ -96,73 +99,75 @@
   PyObject *__pyx_r;
   int __pyx_1;
   PyObject *__pyx_2 = 0;
+  PyObject *__pyx_3 = 0;
   static char *__pyx_argnames[] = {"readFuncLoc","ptcHandle","numPoints","pointBuf","pointStride","normalBuf","normalStride","radiusBuf","radiusStride","dataBuf","dataStride",0};
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "llllililili", __pyx_argnames, &__pyx_v_readFuncLoc, &__pyx_v_ptcHandle, &__pyx_v_numPoints, &__pyx_v_pointBuf, &__pyx_v_pointStride, &__pyx_v_normalBuf, &__pyx_v_normalStride, &__pyx_v_radiusBuf, &__pyx_v_radiusStride, &__pyx_v_dataBuf, &__pyx_v_dataStride)) return 0;
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":61 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":63 */
   __pyx_v_PtcReadDataPoint = (((__pyx_t_11_pointcloud_PtcReadDataPointPtr *)__pyx_v_readFuncLoc)[0]);
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":62 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":64 */
   __pyx_v_pointCloud = ((__pyx_t_11_pointcloud_PtcPointCloud)__pyx_v_ptcHandle);
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":71 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":73 */
   __pyx_v_pntPtr = ((float *)__pyx_v_pointBuf);
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":72 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":74 */
   __pyx_v_normalPtr = ((float *)__pyx_v_normalBuf);
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":73 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":75 */
   __pyx_v_radiusPtr = ((float *)__pyx_v_radiusBuf);
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":74 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":76 */
   __pyx_v_dataPtr = ((float *)__pyx_v_dataBuf);
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":77 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":79 */
   __pyx_v_n = 0;
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":78 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":80 */
   while (1) {
     __pyx_1 = (__pyx_v_n < __pyx_v_numPoints);
     if (!__pyx_1) break;
 
-    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":79 */
+    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":81 */
     __pyx_v_res = __pyx_v_PtcReadDataPoint(__pyx_v_pointCloud,__pyx_v_pntPtr,__pyx_v_normalPtr,__pyx_v_radiusPtr,__pyx_v_dataPtr);
 
-    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":80 */
+    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":82 */
     __pyx_1 = (__pyx_v_res == 0);
     if (__pyx_1) {
-      goto __pyx_L3;
+      __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 83; goto __pyx_L1;}
+      Py_INCREF(__pyx_k1p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k1p);
+      __pyx_3 = PyObject_CallObject(PyExc_IOError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 83; goto __pyx_L1;}
+      Py_DECREF(__pyx_2); __pyx_2 = 0;
+      __Pyx_Raise(__pyx_3, 0, 0);
+      Py_DECREF(__pyx_3); __pyx_3 = 0;
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 83; goto __pyx_L1;}
       goto __pyx_L4;
     }
     __pyx_L4:;
 
-    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":82 */
+    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":84 */
     __pyx_v_pntPtr += __pyx_v_pointStride;
 
-    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":83 */
+    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":85 */
     __pyx_v_normalPtr += __pyx_v_normalStride;
 
-    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":84 */
+    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":86 */
     __pyx_v_radiusPtr += __pyx_v_radiusStride;
 
-    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":85 */
+    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":87 */
     __pyx_v_dataPtr += __pyx_v_dataStride;
 
-    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":86 */
+    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":88 */
     __pyx_v_n += 1;
   }
-  __pyx_L3:;
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":89 */
-  __pyx_2 = PyInt_FromLong(__pyx_v_n); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; goto __pyx_L1;}
-  __pyx_r = __pyx_2;
-  __pyx_2 = 0;
-  goto __pyx_L0;
-
   __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
   Py_XDECREF(__pyx_2);
+  Py_XDECREF(__pyx_3);
   __Pyx_AddTraceback("_pointcloud.readDataPoints");
   __pyx_r = 0;
   __pyx_L0:;
@@ -198,63 +203,63 @@
   static char *__pyx_argnames[] = {"writeFuncLoc","ptcHandle","numPoints","pointBuf","pointStride","normalBuf","normalStride","radiusBuf","radiusStride","dataBuf","dataStride",0};
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "llllililili", __pyx_argnames, &__pyx_v_writeFuncLoc, &__pyx_v_ptcHandle, &__pyx_v_numPoints, &__pyx_v_pointBuf, &__pyx_v_pointStride, &__pyx_v_normalBuf, &__pyx_v_normalStride, &__pyx_v_radiusBuf, &__pyx_v_radiusStride, &__pyx_v_dataBuf, &__pyx_v_dataStride)) return 0;
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":107 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":106 */
   __pyx_v_PtcWriteDataPoint = (((__pyx_t_11_pointcloud_PtcWriteDataPointPtr *)__pyx_v_writeFuncLoc)[0]);
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":108 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":107 */
   __pyx_v_pointCloud = ((__pyx_t_11_pointcloud_PtcPointCloud)__pyx_v_ptcHandle);
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":117 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":116 */
   __pyx_v_pntPtr = ((float *)__pyx_v_pointBuf);
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":118 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":117 */
   __pyx_v_normalPtr = ((float *)__pyx_v_normalBuf);
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":119 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":118 */
   __pyx_v_radiusPtr = ((float *)__pyx_v_radiusBuf);
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":120 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":119 */
   __pyx_v_dataPtr = ((float *)__pyx_v_dataBuf);
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":123 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":122 */
   __pyx_v_n = 0;
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":124 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":123 */
   while (1) {
     __pyx_1 = (__pyx_v_n < __pyx_v_numPoints);
     if (!__pyx_1) break;
 
-    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":125 */
+    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":124 */
     __pyx_v_res = __pyx_v_PtcWriteDataPoint(__pyx_v_pointCloud,__pyx_v_pntPtr,__pyx_v_normalPtr,(__pyx_v_radiusPtr[0]),__pyx_v_dataPtr);
 
-    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":126 */
+    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":125 */
     __pyx_1 = (__pyx_v_res == 0);
     if (__pyx_1) {
-      __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;}
-      Py_INCREF(__pyx_k1p);
-      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k1p);
-      __pyx_3 = PyObject_CallObject(PyExc_IOError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;}
+      __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; goto __pyx_L1;}
+      Py_INCREF(__pyx_k2p);
+      PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k2p);
+      __pyx_3 = PyObject_CallObject(PyExc_IOError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; goto __pyx_L1;}
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       __Pyx_Raise(__pyx_3, 0, 0);
       Py_DECREF(__pyx_3); __pyx_3 = 0;
-      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;}
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; goto __pyx_L1;}
       goto __pyx_L4;
     }
     __pyx_L4:;
 
-    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":128 */
+    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":127 */
     __pyx_v_pntPtr += __pyx_v_pointStride;
 
-    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":129 */
+    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":128 */
     __pyx_v_normalPtr += __pyx_v_normalStride;
 
-    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":130 */
+    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":129 */
     __pyx_v_radiusPtr += __pyx_v_radiusStride;
 
-    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":131 */
+    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":130 */
     __pyx_v_dataPtr += __pyx_v_dataStride;
 
-    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":132 */
+    /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":131 */
     __pyx_v_n += 1;
   }
 
@@ -288,7 +293,7 @@
   if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; goto __pyx_L1;};
   if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; goto __pyx_L1;};
 
-  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":91 */
+  /* "/Users/baas/src/cgkit/pyrex/pyx/_pointcloud.pyx":90 */
   return;
   __pyx_L1:;
   __Pyx_AddTraceback("_pointcloud");

Modified: cgkit/trunk/pyrex/pyx/_pointcloud.pyx
===================================================================
--- cgkit/trunk/pyrex/pyx/_pointcloud.pyx	2009-02-09 22:04:25 UTC (rev 284)
+++ cgkit/trunk/pyrex/pyx/_pointcloud.pyx	2009-02-10 07:49:42 UTC (rev 285)
@@ -54,7 +54,9 @@
     to. *Stride is the number of floats to advance the pointers to get to the
     next data location. The buffers must be large enough to hold numPoints
     items.
-    The return value is the number of points that were actually read.
+    numPoints must at least be the number of points that are still left
+    in the file (otherwise the function may generate an exception or return
+    bogus values, whatever the underlying RenderMan implementation does).
     """
     cdef PtcReadDataPointPtr PtcReadDataPoint
     cdef PtcPointCloud pointCloud
@@ -78,15 +80,12 @@
     while n<numPoints:
         res = PtcReadDataPoint(pointCloud, pntPtr, normalPtr, radiusPtr, dataPtr)
         if res==0:
-            break
+            raise IOError("Failed to read data point from point cloud file")
         pntPtr += pointStride
         normalPtr += normalStride
         radiusPtr += radiusStride
         dataPtr += dataStride
         n += 1
-        
-    # Return the number of points read
-    return n
 
 def writeDataPoints(long writeFuncLoc, long ptcHandle, long numPoints,
                     long pointBuf, int pointStride,

Modified: cgkit/trunk/unittests/test_pointcloud.py
===================================================================
--- cgkit/trunk/unittests/test_pointcloud.py	2009-02-09 22:04:25 UTC (rev 284)
+++ cgkit/trunk/unittests/test_pointcloud.py	2009-02-10 07:49:42 UTC (rev 285)
@@ -95,8 +95,7 @@
         self.assertAlmostEqual(1.5, rad, 5)
         self.assertEqual({}, data)
 
-        v = ptc.readDataPoint()
-        self.assertEqual(None, v)
+        self.assertRaises(EOFError, lambda: ptc.readDataPoint())
         
         ptc.close()
     
@@ -185,11 +184,14 @@
         ptc.writeDataPoints(2, buffer)
         ptc.close()
 
-        buf = numpy.zeros(shape=(2,8), dtype=numpy.float32)
+        buf = numpy.zeros(shape=(3,8), dtype=numpy.float32)
         ptc = pointcloud.open("tmp/pointcloud3.ptc", "r", self.libName)
-        ptc.readDataPoints(2, buf)
+        n = ptc.readDataPoints(3, buf)
+        self.assertEqual(2, n)
         self.assertEqual([1,2,3,1,0,0,7,8], list(list(buf)[0]))
         self.assertEqual([-1,-2,-3,0,0,1,-7,-8], list(list(buf)[1]))
+        n = ptc.readDataPoints(3, buf)
+        self.assertEqual(0, n)
         ptc.close()
 
 ######################################################################


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 289
          http://cgkit.svn.sourceforge.net/cgkit/?rev=289&view=rev
Author:   mbaas
Date:     2009-02-10 22:44:22 +0000 (Tue, 10 Feb 2009)

Log Message:
-----------
Update

Modified Paths:
--------------
    cgkit/trunk/changelog.txt

Modified: cgkit/trunk/changelog.txt
===================================================================
--- cgkit/trunk/changelog.txt	2009-02-10 22:43:44 UTC (rev 288)
+++ cgkit/trunk/changelog.txt	2009-02-10 22:44:22 UTC (rev 289)
@@ -10,6 +10,7 @@
 
 Bug fixes/enhancements:
 
+- cri: numpy integer arrays were not properly supported on 64-bit systems
 - mayaascii: Bugfix #2119263: The setAttr command wasn't recognizing the 
   channelBox option (+ some other bugfixes). 
 - slparams: The module can now also retrieve information from compiled shaders


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 287
          http://cgkit.svn.sourceforge.net/cgkit/?rev=287&view=rev
Author:   mbaas
Date:     2009-02-10 09:33:25 +0000 (Tue, 10 Feb 2009)

Log Message:
-----------
Added prman to the list of renderers (this is not enabled by default though).

Modified Paths:
--------------
    cgkit/trunk/unittests/test_ri.py

Modified: cgkit/trunk/unittests/test_ri.py
===================================================================
--- cgkit/trunk/unittests/test_ri.py	2009-02-10 09:26:28 UTC (rev 286)
+++ cgkit/trunk/unittests/test_ri.py	2009-02-10 09:33:25 UTC (rev 287)
@@ -52,6 +52,8 @@
 #        ri = cgkit.cri.loadRI("ri")
 #        ri = cgkit.cri.loadRI("aqsislib")
 #        ri = cgkit.cri.loadRI("ri2rib")
+#        ri = cgkit.cri.loadRI("prman")
+#        ri.RiProcFree = None
 
         ritest.main(ri, "tmp/criout.rib", archiveName="tmp/cinclude.rib")
         


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 286
          http://cgkit.svn.sourceforge.net/cgkit/?rev=286&view=rev
Author:   mbaas
Date:     2009-02-10 09:26:28 +0000 (Tue, 10 Feb 2009)

Log Message:
-----------
Update

Modified Paths:
--------------
    cgkit/trunk/unittests/test_pointcloud.py

Modified: cgkit/trunk/unittests/test_pointcloud.py
===================================================================
--- cgkit/trunk/unittests/test_pointcloud.py	2009-02-10 07:49:42 UTC (rev 285)
+++ cgkit/trunk/unittests/test_pointcloud.py	2009-02-10 09:26:28 UTC (rev 286)
@@ -8,10 +8,14 @@
 import numpy
 
 class TestPointCloud(unittest.TestCase):
+    """Test the pointcloud module.
+    """
     
     def __init__(self, *args, **kwargs):
         unittest.TestCase.__init__(self, *args, **kwargs)
         self.libName = "3delight"
+#        self.libName = "prman"
+        self.accuracy = 3
     
     def testSinglePoints(self):
         """Test writing/reading individual points.
@@ -28,71 +32,77 @@
         self.assertEqual(3, ptc.npoints)
         self.assertEqual([], ptc.variables)
         self.assertEqual(0, ptc.datasize)
-        print ptc.bbox
+#        print ptc.bbox
+        self.assertAlmostEqual(-1.0, ptc.bbox[0], 1)
+        self.assertAlmostEqual(0.17, ptc.bbox[1], 1)
+        self.assertAlmostEqual( 0.3, ptc.bbox[2], 1)
+        self.assertAlmostEqual( 1.0, ptc.bbox[3], 1)
+        self.assertAlmostEqual( 2.0, ptc.bbox[4], 1)
+        self.assertAlmostEqual(42.0, ptc.bbox[5], 1)
 #        self.assertEqual(16, len(ptc.world2eye))
-#        self.assertAlmostEqual(1, ptc.world2eye[0], 5)
-#        self.assertAlmostEqual(2, ptc.world2eye[1], 5)
-#        self.assertAlmostEqual(3, ptc.world2eye[2], 5)
-#        self.assertAlmostEqual(4, ptc.world2eye[3], 5)
-#        self.assertAlmostEqual(5, ptc.world2eye[4], 5)
-#        self.assertAlmostEqual(6, ptc.world2eye[5], 5)
-#        self.assertAlmostEqual(7, ptc.world2eye[6], 5)
-#        self.assertAlmostEqual(8, ptc.world2eye[7], 5)
-#        self.assertAlmostEqual(9, ptc.world2eye[8], 5)
-#        self.assertAlmostEqual(10, ptc.world2eye[9], 5)
-#        self.assertAlmostEqual(11, ptc.world2eye[10], 5)
-#        self.assertAlmostEqual(12, ptc.world2eye[11], 5)
-#        self.assertAlmostEqual(13, ptc.world2eye[12], 5)
-#        self.assertAlmostEqual(14, ptc.world2eye[13], 5)
-#        self.assertAlmostEqual(15, ptc.world2eye[14], 5)
-#        self.assertAlmostEqual(16, ptc.world2eye[15], 5)
+#        self.assertAlmostEqual(1, ptc.world2eye[0], self.accuracy)
+#        self.assertAlmostEqual(2, ptc.world2eye[1], self.accuracy)
+#        self.assertAlmostEqual(3, ptc.world2eye[2], self.accuracy)
+#        self.assertAlmostEqual(4, ptc.world2eye[3], self.accuracy)
+#        self.assertAlmostEqual(5, ptc.world2eye[4], self.accuracy)
+#        self.assertAlmostEqual(6, ptc.world2eye[5], self.accuracy)
+#        self.assertAlmostEqual(7, ptc.world2eye[6], self.accuracy)
+#        self.assertAlmostEqual(8, ptc.world2eye[7], self.accuracy)
+#        self.assertAlmostEqual(9, ptc.world2eye[8], self.accuracy)
+#        self.assertAlmostEqual(10, ptc.world2eye[9], self.accuracy)
+#        self.assertAlmostEqual(11, ptc.world2eye[10], self.accuracy)
+#        self.assertAlmostEqual(12, ptc.world2eye[11], self.accuracy)
+#        self.assertAlmostEqual(13, ptc.world2eye[12], self.accuracy)
+#        self.assertAlmostEqual(14, ptc.world2eye[13], self.accuracy)
+#        self.assertAlmostEqual(15, ptc.world2eye[14], self.accuracy)
+#        self.assertAlmostEqual(16, ptc.world2eye[15], self.accuracy)
 #        self.assertEqual(16, len(ptc.world2ndc))
-#        self.assertAlmostEqual(0.1, ptc.world2ndc[0], 5)
-#        self.assertAlmostEqual(0.2, ptc.world2ndc[1], 5)
-#        self.assertAlmostEqual(0.3, ptc.world2ndc[2], 5)
-#        self.assertAlmostEqual(0.4, ptc.world2ndc[3], 5)
-#        self.assertAlmostEqual(0.5, ptc.world2ndc[4], 5)
-#        self.assertAlmostEqual(0.6, ptc.world2ndc[5], 5)
-#        self.assertAlmostEqual(0.7, ptc.world2ndc[6], 5)
-#        self.assertAlmostEqual(0.8, ptc.world2ndc[7], 5)
-#        self.assertAlmostEqual(0.9, ptc.world2ndc[8], 5)
-#        self.assertAlmostEqual(0.10, ptc.world2ndc[9], 5)
-#        self.assertAlmostEqual(0.11, ptc.world2ndc[10], 5)
-#        self.assertAlmostEqual(0.12, ptc.world2ndc[11], 5)
-#        self.assertAlmostEqual(0.13, ptc.world2ndc[12], 5)
-#        self.assertAlmostEqual(0.14, ptc.world2ndc[13], 5)
-#        self.assertAlmostEqual(0.15, ptc.world2ndc[14], 5)
-#        self.assertAlmostEqual(0.16, ptc.world2ndc[15], 5)
+#        self.assertAlmostEqual(0.1, ptc.world2ndc[0], self.accuracy)
+#        self.assertAlmostEqual(0.2, ptc.world2ndc[1], self.accuracy)
+#        self.assertAlmostEqual(0.3, ptc.world2ndc[2], self.accuracy)
+#        self.assertAlmostEqual(0.4, ptc.world2ndc[3], self.accuracy)
+#        self.assertAlmostEqual(0.5, ptc.world2ndc[4], self.accuracy)
+#        self.assertAlmostEqual(0.6, ptc.world2ndc[5], self.accuracy)
+#        self.assertAlmostEqual(0.7, ptc.world2ndc[6], self.accuracy)
+#        self.assertAlmostEqual(0.8, ptc.world2ndc[7], self.accuracy)
+#        self.assertAlmostEqual(0.9, ptc.world2ndc[8], self.accuracy)
+#        self.assertAlmostEqual(0.10, ptc.world2ndc[9], self.accuracy)
+#        self.assertAlmostEqual(0.11, ptc.world2ndc[10], self.accuracy)
+#        self.assertAlmostEqual(0.12, ptc.world2ndc[11], self.accuracy)
+#        self.assertAlmostEqual(0.13, ptc.world2ndc[12], self.accuracy)
+#        self.assertAlmostEqual(0.14, ptc.world2ndc[13], self.accuracy)
+#        self.assertAlmostEqual(0.15, ptc.world2ndc[14], self.accuracy)
+#        self.assertAlmostEqual(0.16, ptc.world2ndc[15], self.accuracy)
         self.assertEqual((640.0, 480.0, 1.0), ptc.format)
 
         pos,norm,rad,data = ptc.readDataPoint()
-        self.assertAlmostEqual(0.1, pos[0], 5)
-        self.assertAlmostEqual(0.2, pos[1], 5)
-        self.assertAlmostEqual(0.3, pos[2], 5)
-        self.assertAlmostEqual(0, norm[0], 5)
-        self.assertAlmostEqual(1, norm[1], 5)
-        self.assertAlmostEqual(0, norm[2], 5)
-        self.assertAlmostEqual(0.5, rad, 5)
+        self.assertAlmostEqual(0.1, pos[0], self.accuracy)
+        self.assertAlmostEqual(0.2, pos[1], self.accuracy)
+        self.assertAlmostEqual(0.3, pos[2], self.accuracy)
+        self.assertAlmostEqual(0, norm[0], self.accuracy)
+        self.assertAlmostEqual(1, norm[1], self.accuracy)
+        self.assertAlmostEqual(0, norm[2], self.accuracy)
+        self.assertAlmostEqual(0.5, rad, self.accuracy)
         self.assertEqual({}, data)
 
         pos,norm,rad,data = ptc.readDataPoint()
-        self.assertAlmostEqual(1.0, pos[0], 5)
-        self.assertAlmostEqual(2.0, pos[1], 5)
-        self.assertAlmostEqual(3.0, pos[2], 5)
-        self.assertAlmostEqual(1, norm[0], 5)
-        self.assertAlmostEqual(0, norm[1], 5)
-        self.assertAlmostEqual(0, norm[2], 5)
-        self.assertAlmostEqual(1.0, rad, 5)
+        self.assertAlmostEqual(1.0, pos[0], self.accuracy)
+        self.assertAlmostEqual(2.0, pos[1], self.accuracy)
+        self.assertAlmostEqual(3.0, pos[2], self.accuracy)
+        self.assertAlmostEqual(1, norm[0], self.accuracy)
+        self.assertAlmostEqual(0, norm[1], self.accuracy)
+        self.assertAlmostEqual(0, norm[2], self.accuracy)
+        self.assertAlmostEqual(1.0, rad, self.accuracy)
         self.assertEqual({}, data)
 
         pos,norm,rad,data = ptc.readDataPoint()
-        self.assertAlmostEqual(-1.0, pos[0], 5)
-        self.assertAlmostEqual(0.17, pos[1], 5)
-        self.assertAlmostEqual(42.0, pos[2], 5)
-        self.assertAlmostEqual(0, norm[0], 5)
-        self.assertAlmostEqual(0, norm[1], 5)
-        self.assertAlmostEqual(1, norm[2], 5)
-        self.assertAlmostEqual(1.5, rad, 5)
+        self.assertAlmostEqual(-1.0, pos[0], self.accuracy)
+        self.assertAlmostEqual(0.17, pos[1], self.accuracy)
+        self.assertAlmostEqual(42.0, pos[2], self.accuracy)
+        self.assertAlmostEqual(0, norm[0], self.accuracy)
+        self.assertAlmostEqual(0, norm[1], self.accuracy)
+        self.assertAlmostEqual(1, norm[2], self.accuracy)
+        self.assertAlmostEqual(1.5, rad, self.accuracy)
         self.assertEqual({}, data)
 
         self.assertRaises(EOFError, lambda: ptc.readDataPoint())
@@ -119,59 +129,59 @@
         rs = (2*ctypes.c_float)()
         ds = (8*ctypes.c_float)()
         ptc.readDataPoints(2, (ps,ns,rs,ds))
-        self.assertAlmostEqual(0.4, ps[0], 5)
-        self.assertAlmostEqual(0.8, ps[1], 5)
-        self.assertAlmostEqual(1.0, ps[2], 5)
-        self.assertAlmostEqual(0.9, ps[3], 5)
-        self.assertAlmostEqual(0.7, ps[4], 5)
-        self.assertAlmostEqual(0.6, ps[5], 5)
-        self.assertAlmostEqual(1, ns[0], 5)
-        self.assertAlmostEqual(0, ns[1], 5)
-        self.assertAlmostEqual(0, ns[2], 5)
-        self.assertAlmostEqual(0, ns[3], 5)
-        self.assertAlmostEqual(0, ns[4], 5)
-        self.assertAlmostEqual(1, ns[5], 5)
-        self.assertAlmostEqual(0.4, rs[0], 5)
-        self.assertAlmostEqual(0.5, rs[1], 5)
-        self.assertAlmostEqual(12.0, ds[0], 5)
-        self.assertAlmostEqual(1, ds[1], 5)
-        self.assertAlmostEqual(2, ds[2], 5)
-        self.assertAlmostEqual(3, ds[3], 5)
-        self.assertAlmostEqual(42.0, ds[4], 5)
-        self.assertAlmostEqual(-1, ds[5], 5)
-        self.assertAlmostEqual(-2, ds[6], 5)
-        self.assertAlmostEqual(-3, ds[7], 5)
+        self.assertAlmostEqual(0.4, ps[0], self.accuracy)
+        self.assertAlmostEqual(0.8, ps[1], self.accuracy)
+        self.assertAlmostEqual(1.0, ps[2], self.accuracy)
+        self.assertAlmostEqual(0.9, ps[3], self.accuracy)
+        self.assertAlmostEqual(0.7, ps[4], self.accuracy)
+        self.assertAlmostEqual(0.6, ps[5], self.accuracy)
+        self.assertAlmostEqual(1, ns[0], self.accuracy)
+        self.assertAlmostEqual(0, ns[1], self.accuracy)
+        self.assertAlmostEqual(0, ns[2], self.accuracy)
+        self.assertAlmostEqual(0, ns[3], self.accuracy)
+        self.assertAlmostEqual(0, ns[4], self.accuracy)
+        self.assertAlmostEqual(1, ns[5], self.accuracy)
+        self.assertAlmostEqual(0.4, rs[0], self.accuracy)
+        self.assertAlmostEqual(0.5, rs[1], self.accuracy)
+        self.assertAlmostEqual(12.0, ds[0], self.accuracy)
+        self.assertAlmostEqual(1, ds[1], self.accuracy)
+        self.assertAlmostEqual(2, ds[2], self.accuracy)
+        self.assertAlmostEqual(3, ds[3], self.accuracy)
+        self.assertAlmostEqual(42.0, ds[4], self.accuracy)
+        self.assertAlmostEqual(-1, ds[5], self.accuracy)
+        self.assertAlmostEqual(-2, ds[6], self.accuracy)
+        self.assertAlmostEqual(-3, ds[7], self.accuracy)
         ptc.close()
 
         ptc = pointcloud.open("tmp/pointcloud2.ptc", "r", self.libName)
         pos,norm,rad,data = ptc.readDataPoint()
-        self.assertAlmostEqual(0.4, pos[0], 5)
-        self.assertAlmostEqual(0.8, pos[1], 5)
-        self.assertAlmostEqual(1.0, pos[2], 5)
-        self.assertAlmostEqual(1, norm[0], 5)
-        self.assertAlmostEqual(0, norm[1], 5)
-        self.assertAlmostEqual(0, norm[2], 5)
-        self.assertAlmostEqual(0.4, rad, 5)
-        self.assertAlmostEqual(12, data["fspam"], 5)
-        self.assertAlmostEqual(1, data["vspam"][0], 5)
-        self.assertAlmostEqual(2, data["vspam"][1], 5)
-        self.assertAlmostEqual(3, data["vspam"][2], 5)
+        self.assertAlmostEqual(0.4, pos[0], self.accuracy)
+        self.assertAlmostEqual(0.8, pos[1], self.accuracy)
+        self.assertAlmostEqual(1.0, pos[2], self.accuracy)
+        self.assertAlmostEqual(1, norm[0], self.accuracy)
+        self.assertAlmostEqual(0, norm[1], self.accuracy)
+        self.assertAlmostEqual(0, norm[2], self.accuracy)
+        self.assertAlmostEqual(0.4, rad, self.accuracy)
+        self.assertAlmostEqual(12, data["fspam"], self.accuracy)
+        self.assertAlmostEqual(1, data["vspam"][0], self.accuracy)
+        self.assertAlmostEqual(2, data["vspam"][1], self.accuracy)
+        self.assertAlmostEqual(3, data["vspam"][2], self.accuracy)
         ptc.close()
         
         ptc = pointcloud.open("tmp/pointcloud2.ptc", "r", self.libName)
         for buf in ptc.iterBatches(10, numpyArray=False, combinedBuffer=True):
             self.assertEqual(22, len(buf))
-            self.assertAlmostEqual(0.4, buf[0], 5)
-            self.assertAlmostEqual(0.8, buf[1], 5)
-            self.assertAlmostEqual(1.0, buf[2], 5)
-            self.assertAlmostEqual(1, buf[3], 5)
-            self.assertAlmostEqual(0, buf[4], 5)
-            self.assertAlmostEqual(0, buf[5], 5)
-            self.assertAlmostEqual(0.4, buf[6], 5)
-            self.assertAlmostEqual(12, buf[7], 5)
-            self.assertAlmostEqual(1, buf[8], 5)
-            self.assertAlmostEqual(2, buf[9], 5)
-            self.assertAlmostEqual(3, buf[10], 5)
+            self.assertAlmostEqual(0.4, buf[0], self.accuracy)
+            self.assertAlmostEqual(0.8, buf[1], self.accuracy)
+            self.assertAlmostEqual(1.0, buf[2], self.accuracy)
+            self.assertAlmostEqual(1, buf[3], self.accuracy)
+            self.assertAlmostEqual(0, buf[4], self.accuracy)
+            self.assertAlmostEqual(0, buf[5], self.accuracy)
+            self.assertAlmostEqual(0.4, buf[6], self.accuracy)
+            self.assertAlmostEqual(12, buf[7], self.accuracy)
+            self.assertAlmostEqual(1, buf[8], self.accuracy)
+            self.assertAlmostEqual(2, buf[9], self.accuracy)
+            self.assertAlmostEqual(3, buf[10], self.accuracy)
         ptc.close()
 
     def testMultiPointsOneBuffer(self):
@@ -179,7 +189,7 @@
         """
         buffer = numpy.zeros(shape=(2,8), dtype=numpy.float32)
         buffer[0] = (1,2,3,1,0,0,7,8)
-        buffer[1] = (-1,-2,-3,0,0,1,-7,-8)
+        buffer[1] = (-1,-2,-3,0,0,1,2,-8)
         ptc = pointcloud.open("tmp/pointcloud3.ptc", "w", self.libName, vars=[("float", "spam")], world2eye=mat4(1), world2ndc=mat4(1), format=(640,480,1))
         ptc.writeDataPoints(2, buffer)
         ptc.close()
@@ -188,8 +198,15 @@
         ptc = pointcloud.open("tmp/pointcloud3.ptc", "r", self.libName)
         n = ptc.readDataPoints(3, buf)
         self.assertEqual(2, n)
+        # Round the normals
+        buf[0][3] = round(buf[0][3],self.accuracy)
+        buf[0][4] = round(buf[0][4],self.accuracy)
+        buf[0][5] = round(buf[0][5],self.accuracy)
+        buf[1][3] = round(buf[1][3],self.accuracy)
+        buf[1][4] = round(buf[1][4],self.accuracy)
+        buf[1][5] = round(buf[1][5],self.accuracy)
         self.assertEqual([1,2,3,1,0,0,7,8], list(list(buf)[0]))
-        self.assertEqual([-1,-2,-3,0,0,1,-7,-8], list(list(buf)[1]))
+        self.assertEqual([-1,-2,-3,0,0,1,2,-8], list(list(buf)[1]))
         n = ptc.readDataPoints(3, buf)
         self.assertEqual(0, n)
         ptc.close()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.