Menu
▾
▴
SF.net SVN: matplotlib: [4153] branches/transforms/src
|
From: <md...@us...> - 2007-11-07 20:38:49
|
Revision: 4153
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4153&view=rev
Author: mdboom
Date: 2007-11-07 12:38:46 -0800 (Wed, 07 Nov 2007)
Log Message:
-----------
Update to use modern Numpy C API
Modified Paths:
--------------
branches/transforms/src/_backend_agg.cpp
branches/transforms/src/_path.cpp
Modified: branches/transforms/src/_backend_agg.cpp
===================================================================
--- branches/transforms/src/_backend_agg.cpp 2007-11-07 20:13:35 UTC (rev 4152)
+++ branches/transforms/src/_backend_agg.cpp 2007-11-07 20:38:46 UTC (rev 4153)
@@ -280,7 +280,7 @@
if (bbox_obj.ptr() != Py_None) {
bbox = (PyArrayObject*) PyArray_FromObject(bbox_obj.ptr(), PyArray_DOUBLE, 2, 2);
- if (!bbox || bbox->nd != 2 || bbox->dimensions[0] != 2 || bbox->dimensions[1] != 2) {
+ if (!bbox || PyArray_NDIM(bbox) != 2 || PyArray_DIM(bbox, 0) != 2 || PyArray_DIM(bbox, 1) != 2) {
Py_XDECREF(bbox);
throw Py::TypeError
("Expected a Bbox object.");
@@ -942,23 +942,23 @@
try {
offsets = (PyArrayObject*)PyArray_FromObject(offsets_obj.ptr(), PyArray_DOUBLE, 0, 2);
if (!offsets ||
- (offsets->nd == 2 && offsets->dimensions[1] != 2) ||
- (offsets->nd == 1 && offsets->dimensions[0])) {
+ (PyArray_NDIM(offsets) == 2 && PyArray_DIM(offsets, 1) != 2) ||
+ (PyArray_NDIM(offsets) == 1 && PyArray_DIM(offsets, 0) != 0)) {
throw Py::ValueError("Offsets array must be Nx2");
}
PyArrayObject* facecolors = (PyArrayObject*)PyArray_FromObject
(facecolors_obj.ptr(), PyArray_DOUBLE, 1, 2);
if (!facecolors ||
- (facecolors->nd == 1 && facecolors->dimensions[0] != 0) ||
- (facecolors->nd == 2 && facecolors->dimensions[1] != 4))
+ (PyArray_NDIM(facecolors) == 1 && PyArray_DIM(facecolors, 0) != 0) ||
+ (PyArray_NDIM(facecolors) == 2 && PyArray_DIM(facecolors, 1) != 4))
throw Py::ValueError("Facecolors must be a Nx4 numpy array or empty");
PyArrayObject* edgecolors = (PyArrayObject*)PyArray_FromObject
(edgecolors_obj.ptr(), PyArray_DOUBLE, 1, 2);
if (!edgecolors ||
- (edgecolors->nd == 1 && edgecolors->dimensions[0] != 0) ||
- (edgecolors->nd == 2 && edgecolors->dimensions[1] != 4))
+ (PyArray_NDIM(edgecolors) == 1 && PyArray_DIM(edgecolors, 0) != 0) ||
+ (PyArray_NDIM(edgecolors) == 2 && PyArray_DIM(edgecolors, 1) != 4))
throw Py::ValueError("Edgecolors must be a Nx4 numpy array");
size_t Npaths = path_generator.num_paths();
@@ -1178,11 +1178,11 @@
throw Py::ValueError("Invalid coordinates array.");
}
- Py::Tuple shape(3);
- shape[0] = Py::Int((int)meshHeight + 1);
- shape[1] = Py::Int((int)meshWidth + 1);
- shape[2] = Py::Int(2);
- m_coordinates = (PyArrayObject*)PyArray_Reshape(coordinates_array, shape.ptr());
+ PyArray_Dims shape;
+ npy_intp dims[] = { meshHeight + 1, meshWidth + 1, 2 };
+ shape.ptr = dims;
+ shape.len = 3;
+ m_coordinates = (PyArrayObject*)PyArray_Newshape(coordinates_array, &shape, PyArray_CORDER);
}
inline ~QuadMeshGenerator() {
@@ -1237,13 +1237,13 @@
if (showedges) {
int dims[] = { 1, 4, 0 };
double data[] = { 0, 0, 0, 1 };
- edgecolors_obj = PyArray_FromDimsAndData(2, dims, PyArray_DOUBLE, (char*)data);
+ edgecolors_obj = PyArray_SimpleNewFromData(2, dims, PyArray_DOUBLE, (char*)data);
} else {
if (antialiased) {
edgecolors_obj = facecolors_obj;
} else {
int dims[] = { 0, 0 };
- edgecolors_obj = PyArray_FromDims(1, dims, PyArray_DOUBLE);
+ edgecolors_obj = PyArray_SimpleNew(1, dims, PyArray_DOUBLE);
}
}
Modified: branches/transforms/src/_path.cpp
===================================================================
--- branches/transforms/src/_path.cpp 2007-11-07 20:13:35 UTC (rev 4152)
+++ branches/transforms/src/_path.cpp 2007-11-07 20:38:46 UTC (rev 4153)
@@ -263,8 +263,8 @@
try {
offsets = (PyArrayObject*)PyArray_FromObject(offsets_obj.ptr(), PyArray_DOUBLE, 0, 2);
if (!offsets ||
- (offsets->nd == 2 && offsets->dimensions[1] != 2) ||
- (offsets->nd == 1 && offsets->dimensions[0])) {
+ (PyArray_NDIM(offsets) == 2 && PyArray_DIM(offsets, 1) != 2) ||
+ (PyArray_NDIM(offsets) == 1 && PyArray_DIM(offsets, 0) != 0)) {
throw Py::ValueError("Offsets array must be Nx2");
}
@@ -338,9 +338,12 @@
agg::trans_affine offset_trans = py_to_agg_transformation_matrix(args[7]);
bool filled = Py::Int(args[8]);
- PyArrayObject* offsets = (PyArrayObject*)PyArray_FromObject(offsets_obj.ptr(), PyArray_DOUBLE, 2, 2);
- if (!offsets || offsets->dimensions[1] != 2)
+ PyArrayObject* offsets = (PyArrayObject*)PyArray_FromObject(offsets_obj.ptr(), PyArray_DOUBLE, 0, 2);
+ if (!offsets ||
+ (PyArray_NDIM(offsets) == 2 && PyArray_DIM(offsets, 1) != 2) ||
+ (PyArray_NDIM(offsets) == 1 && PyArray_DIM(offsets, 0) != 0)) {
throw Py::ValueError("Offsets array must be Nx2");
+ }
size_t Npaths = paths.length();
size_t Noffsets = offsets->dimensions[0];
@@ -360,17 +363,24 @@
}
Py::List result;
+ agg::trans_affine trans;
for (i = 0; i < N; ++i) {
PathIterator path(paths[i % Npaths]);
-
- double xo = *(double*)PyArray_GETPTR2(offsets, i % Noffsets, 0);
- double yo = *(double*)PyArray_GETPTR2(offsets, i % Noffsets, 1);
- offset_trans.transform(&xo, &yo);
- agg::trans_affine_translation transOffset(xo, yo);
- agg::trans_affine trans = transforms[i % Ntransforms];
- trans *= transOffset;
+ if (Ntransforms) {
+ trans = transforms[i % Ntransforms];
+ } else {
+ trans = master_transform;
+ }
+
+ if (Noffsets) {
+ double xo = *(double*)PyArray_GETPTR2(offsets, i % Noffsets, 0);
+ double yo = *(double*)PyArray_GETPTR2(offsets, i % Noffsets, 1);
+ offset_trans.transform(&xo, &yo);
+ trans *= agg::trans_affine_translation(xo, yo);
+ }
+
if (filled) {
if (::point_in_path(x, y, path, trans))
result.append(Py::Int((int)i));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
