Replace Mesh class with meshToNumpyArray function

Author: gsakkis

pdal/PyArray.cpp

@@ -89,35 +89,6 @@ std::string toString(PyObject *pname)
 
 } // unnamed namespace
 
-Array::Array(PointViewPtr view)
-{
-    if (_import_array() < 0)
-        throw pdal_error("Could not import numpy.core.multiarray.");
-
-    PyObject *dtype_dict = (PyObject*)buildNumpyDescription(view);
-    if (!dtype_dict)
-        throw pdal_error("Unable to build numpy dtype "
-                "description dictionary");
-
-    PyArray_Descr *dtype = nullptr;
-    if (PyArray_DescrConverter(dtype_dict, &dtype) == NPY_FAIL)
-        throw pdal_error("Unable to build numpy dtype");
-    Py_XDECREF(dtype_dict);
-
-    // This is a 1 x size array.
-    npy_intp size = view->size();
-    m_array = (PyArrayObject *)PyArray_NewFromDescr(&PyArray_Type, dtype,
-            1, &size, 0, nullptr, NPY_ARRAY_CARRAY, nullptr);
-
-    // copy the data
-    DimTypeList types = view->dimTypes();
-    for (PointId idx = 0; idx < view->size(); idx++)
-    {
-        char *p = (char *)PyArray_GETPTR1(m_array, idx);
-        view->getPackedPoint(types, idx, p);
-    }
-}
-
 
 Array::Array(PyArrayObject* array) : m_array(array), m_rowMajor(true)
 {
@@ -190,63 +161,6 @@ Array::~Array()
 }
 
 
-PyObject* Array::buildNumpyDescription(PointViewPtr view) const
-{
-    // Build up a numpy dtype dictionary
-    //
-    // {'formats': ['f8', 'f8', 'f8', 'u2', 'u1', 'u1', 'u1', 'u1', 'u1',
-    //              'f4', 'u1', 'u2', 'f8', 'u2', 'u2', 'u2'],
-    // 'names': ['X', 'Y', 'Z', 'Intensity', 'ReturnNumber',
-    //           'NumberOfReturns', 'ScanDirectionFlag', 'EdgeOfFlightLine',
-    //           'Classification', 'ScanAngleRank', 'UserData',
-    //           'PointSourceId', 'GpsTime', 'Red', 'Green', 'Blue']}
-    //
-
-    Dimension::IdList dims = view->dims();
-
-    PyObject* dict = PyDict_New();
-    PyObject* sizes = PyList_New(dims.size());
-    PyObject* formats = PyList_New(dims.size());
-    PyObject* titles = PyList_New(dims.size());
-
-    for (size_t i = 0; i < dims.size(); ++i)
-    {
-        Dimension::Id id = dims[i];
-        Dimension::Type t = view->dimType(id);
-        npy_intp stride = view->dimSize(id);
-
-        std::string name = view->dimName(id);
-
-        std::string kind("i");
-        Dimension::BaseType b = Dimension::base(t);
-        if (b == Dimension::BaseType::Unsigned)
-            kind = "u";
-        else if (b == Dimension::BaseType::Signed)
-            kind = "i";
-        else if (b == Dimension::BaseType::Floating)
-            kind = "f";
-        else
-            throw pdal_error("Unable to map kind '" + kind  +
-                "' to PDAL dimension type");
-
-        std::stringstream oss;
-        oss << kind << stride;
-        PyObject* pySize = PyLong_FromLong(stride);
-        PyObject* pyTitle = PyUnicode_FromString(name.c_str());
-        PyObject* pyFormat = PyUnicode_FromString(oss.str().c_str());
-
-        PyList_SetItem(sizes, i, pySize);
-        PyList_SetItem(titles, i, pyTitle);
-        PyList_SetItem(formats, i, pyFormat);
-    }
-
-    PyDict_SetItemString(dict, "names", titles);
-    PyDict_SetItemString(dict, "formats", formats);
-
-    return dict;
-}
-
-
 ArrayIter& Array::iterator()
 {
     ArrayIter *it = new ArrayIter(m_array);
@@ -255,88 +169,6 @@ ArrayIter& Array::iterator()
 }
 
 
-Mesh::Mesh(PointViewPtr view)
-{
-    if (_import_array() < 0)
-        throw pdal_error("Could not import numpy.core.multiarray.");
-
-    PyObject *dtype_dict = (PyObject*)buildNumpyDescription(view);
-    if (!dtype_dict)
-        throw pdal_error("Unable to build numpy dtype "
-                "description dictionary");
-
-    PyArray_Descr *dtype = nullptr;
-    if (PyArray_DescrConverter(dtype_dict, &dtype) == NPY_FAIL)
-        throw pdal_error("Unable to build numpy dtype");
-    Py_XDECREF(dtype_dict);
-
-    // This is a 1 x size array.
-    TriangularMesh* mesh = view->mesh();
-    npy_intp size = mesh ? mesh->size() : 0;
-    m_mesh = (PyArrayObject *)PyArray_NewFromDescr(&PyArray_Type, dtype,
-            1, &size, 0, nullptr, NPY_ARRAY_CARRAY, nullptr);
-
-    for (PointId idx = 0; idx < size; idx++)
-    {
-        char* p = (char *)PyArray_GETPTR1(m_mesh, idx);
-        const Triangle& t = (*mesh)[idx];
-        uint32_t a = (uint32_t)t.m_a;
-        std::memcpy(p, &a, 4);
-        uint32_t b = (uint32_t)t.m_b;
-        std::memcpy(p + 4, &b, 4);
-        uint32_t c = (uint32_t)t.m_c;
-        std::memcpy(p + 8, &c,  4);
-    }
-}
-
-
-Mesh::~Mesh()
-{
-    if (m_mesh)
-        Py_XDECREF((PyObject *)m_mesh);
-}
-
-
-PyObject* Mesh::buildNumpyDescription(PointViewPtr view) const
-{
-    // Build up a numpy dtype dictionary
-    //
-    // {'formats': ['f8', 'f8', 'f8', 'u2', 'u1', 'u1', 'u1', 'u1', 'u1',
-    //              'f4', 'u1', 'u2', 'f8', 'u2', 'u2', 'u2'],
-    // 'names': ['X', 'Y', 'Z', 'Intensity', 'ReturnNumber',
-    //           'NumberOfReturns', 'ScanDirectionFlag', 'EdgeOfFlightLine',
-    //           'Classification', 'ScanAngleRank', 'UserData',
-    //           'PointSourceId', 'GpsTime', 'Red', 'Green', 'Blue']}
-    //
-
-    Dimension::IdList dims = view->dims();
-
-    PyObject* dict = PyDict_New();
-    PyObject* formats = PyList_New(3);
-    PyObject* titles = PyList_New(3);
-
-    PyList_SetItem(titles, 0, PyUnicode_FromString("A"));
-    PyList_SetItem(formats, 0, PyUnicode_FromString("u4"));
-    PyList_SetItem(titles, 1, PyUnicode_FromString("B"));
-    PyList_SetItem(formats, 1, PyUnicode_FromString("u4"));
-    PyList_SetItem(titles, 2, PyUnicode_FromString("C"));
-    PyList_SetItem(formats, 2, PyUnicode_FromString("u4"));
-
-
-    PyDict_SetItemString(dict, "names", titles);
-    PyDict_SetItemString(dict, "formats", formats);
-
-    return dict;
-}
-
-ArrayIter& Mesh::iterator()
-{
-    ArrayIter *it = new ArrayIter(m_mesh);
-    m_iterators.push_back(std::unique_ptr<ArrayIter>(it));
-    return *it;
-}
-
-
 ArrayIter::ArrayIter(PyArrayObject* np_array)
 {
     m_iter = NpyIter_New(np_array,

pdal/PyArray.hpp

@@ -46,50 +46,21 @@ namespace python
 class ArrayIter;
 
 
-class PDAL_DLL Mesh
-{
-public:
-    using Shape = std::array<size_t, 3>;
-
-    Mesh(PointViewPtr view);
-    ~Mesh();
-
-    PyArrayObject *getPythonArray() const { return m_mesh; }
-    bool rowMajor() const { return m_rowMajor; }
-    Shape shape() const { return m_shape; }
-    ArrayIter& iterator();
-
-private:
-    inline PyObject* buildNumpyDescription(PointViewPtr view) const;
-
-    PyArrayObject* m_mesh;
-    bool m_rowMajor;
-    Shape m_shape {};
-    std::vector<std::unique_ptr<ArrayIter>> m_iterators;
-};
-
-
 class PDAL_DLL Array
 {
 public:
     using Shape = std::array<size_t, 3>;
     using Fields = std::vector<MemoryViewReader::Field>;
 
-    // Create an array for reading data from PDAL.
-    Array(PointViewPtr view);
-    // Create an array for writing data to PDAL.
     Array(PyArrayObject* array);
     ~Array();
 
-    PyArrayObject *getPythonArray() const { return m_array; }
     bool rowMajor() const { return m_rowMajor; };
     Shape shape() const { return m_shape; }
     const Fields& fields() const { return m_fields; };
     ArrayIter& iterator();
 
 private:
-    inline PyObject* buildNumpyDescription(PointViewPtr view) const;
-
     PyArrayObject* m_array;
     Fields m_fields;
     bool m_rowMajor;