Return minpos from _path.get_path_collection_extents.

QuLogic · QuLogic · commit b5836cb2628b · 2020-10-06T19:26:30.000-04:00
This is already calculated by the internal C++ code, but discarded at
the end of the Python function.
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -1039,6 +1039,7 @@ def get_path_collection_extents(
     from .transforms import Bbox
     if len(paths) == 0:
         raise ValueError("No paths provided")
-    return Bbox.from_extents(*_path.get_path_collection_extents(
+    extents, minpos = _path.get_path_collection_extents(
         master_transform, paths, np.atleast_3d(transforms),
-        offsets, offset_transform))
+        offsets, offset_transform)
+    return Bbox.from_extents(*extents)
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -250,7 +250,8 @@ static PyObject *Py_update_path_extents(PyObject *self, PyObject *args, PyObject
         "NNi", outextents.pyobj(), outminpos.pyobj(), changed);
 }
 
-const char *Py_get_path_collection_extents__doc__ = "get_path_collection_extents(";
+const char *Py_get_path_collection_extents__doc__ = "get_path_collection_extents("
+    "master_transform, paths, transforms, offsets, offset_transform)";
 
 static PyObject *Py_get_path_collection_extents(PyObject *self, PyObject *args, PyObject *kwds)
 {
@@ -295,7 +296,12 @@ static PyObject *Py_get_path_collection_extents(PyObject *self, PyObject *args,
     extents(1, 0) = e.x1;
     extents(1, 1) = e.y1;
 
-    return extents.pyobj();
+    npy_intp minposdims[] = { 2 };
+    numpy::array_view<double, 1> minpos(minposdims);
+    minpos(0) = e.xm;
+    minpos(1) = e.ym;
+
+    return Py_BuildValue("NN", extents.pyobj(), minpos.pyobj());
 }
 
 const char *Py_point_in_path_collection__doc__ =

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,8 @@ static PyObject Py_update_path_extents(PyObject self, PyObject *args, PyObject`
`250`	`250`	`"NNi", outextents.pyobj(), outminpos.pyobj(), changed);`
`251`	`251`	`}`
`252`	`252`
`253`		`-const char *Py_get_path_collection_extents__doc__ = "get_path_collection_extents(";`
	`253`	`+const char *Py_get_path_collection_extents__doc__ = "get_path_collection_extents("`
	`254`	`+ "master_transform, paths, transforms, offsets, offset_transform)";`
`254`	`255`
`255`	`256`	`static PyObject Py_get_path_collection_extents(PyObject self, PyObject args, PyObject kwds)`
`256`	`257`	`{`
`@@ -295,7 +296,12 @@ static PyObject Py_get_path_collection_extents(PyObject self, PyObject *args,`
`295`	`296`	`extents(1, 0) = e.x1;`
`296`	`297`	`extents(1, 1) = e.y1;`
`297`	`298`
`298`		`- return extents.pyobj();`
	`299`	`+ npy_intp minposdims[] = { 2 };`
	`300`	`+ numpy::array_view<double, 1> minpos(minposdims);`
	`301`	`+ minpos(0) = e.xm;`
	`302`	`+ minpos(1) = e.ym;`
	`303`	`+`
	`304`	`+ return Py_BuildValue("NN", extents.pyobj(), minpos.pyobj());`
`299`	`305`	`}`
`300`	`306`
`301`	`307`	`const char *Py_point_in_path_collection__doc__ =`