Feb 11, 2020 · Mar 28, 2019 · Mar 28, 2019 · Jun 24, 2019 · Feb 11, 2020 · Dec 14, 2019
diff --git a/doc/users/next_whats_new/2019-03-25-mplot3d-projection.rst b/doc/users/next_whats_new/2019-03-25-mplot3d-projection.rst
 ``Axes3D`` no longer distorts the 3d plot to match the 2d aspect ratio
 ----------------------------------------------------------------------

 Plots made with :class:`~mpl_toolkits.mplot3d.axes3d.Axes3D` were previously
 stretched to fit a square bounding box. As this stretching was done after
 the projection from 3D to 2D, it resulted in distorted images if non-square
 bounding boxes were used.

 As of this release, this no longer occurs.
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
        """
        Adjust the Axes for a specified data aspect ratio.

        Depending on `.get_adjustable` this will modify either the Axes box
        (position) or the view limits. In the former case, `.get_anchor`
        will affect the position.
        Depending on `.get_adjustable` this will modify either the
 Axes box(position) or the view limits. In the former case,
 `~matplotlib.axes.Axes.get_anchor`will affect the position.

        Notes
        -----
diff --git a/lib/matplotlib/tests/baseline_images/test_collections/polycollection_close.png b/lib/matplotlib/tests/baseline_images/test_collections/polycollection_close.png
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
                 (tc[7], tc[4])]
        return edges

    def apply_aspect(self, position=None):
        if position is None:
            position = self.get_position(original=True)

        # in the superclass, we would go through and actually deal with axis
        # scales and box/datalim. Those are all irrelevant - all we need to do
        # is make sure our coordinate system is square.
        figW, figH = self.get_figure().get_size_inches()
        fig_aspect = figH / figW
        box_aspect = 1
        pb = position.frozen()
        pb1 = pb.shrunk_to_aspect(box_aspect, pb, fig_aspect)
        self.set_position(pb1.anchored(self.get_anchor(), pb), 'active')

    @artist.allow_rasterization
    def draw(self, renderer):
        # draw the background patch

        dist is the distance of the eye viewing point from the object point.
        """
        # chosen for similarity with the initial view before gh-8896
        pb_aspect = np.array([4, 4, 3]) / 3.5

        relev, razim = np.pi * self.elev/180, np.pi * self.azim/180

        xmin, xmax = self.get_xlim3d()
        # transform to uniform world coordinates 0-1, 0-1, 0-1
        worldM = proj3d.world_transformation(xmin, xmax,
                                             ymin, ymax,
                                             zmin, zmax)
                                             zmin, zmax, pb_aspect=pb_aspect)

        # look into the middle of the new coordinates
        R =np.array([0.5, 0.5, 0.5])
        R =pb_aspect / 2

        xp = R[0] + np.cos(razim) * np.cos(relev) * self.dist
        yp = R[1] + np.sin(razim) * np.cos(relev) * self.dist
diff --git a/lib/mpl_toolkits/mplot3d/proj3d.py b/lib/mpl_toolkits/mplot3d/proj3d.py

 def world_transformation(xmin, xmax,
                         ymin, ymax,
                         zmin, zmax):
    dx, dy, dz = (xmax-xmin), (ymax-ymin), (zmax-zmin)
                         zmin, zmax, pb_aspect=None):
    """
    produce a matrix that scales homogenous coords in the specified ranges
    to [0, 1], or [0, pb_aspect[i]] if the plotbox aspect ratio is specified
    """
    dx = xmax - xmin
    dy = ymax - ymin
    dz = zmax - zmin
    if pb_aspect is not None:
        ax, ay, az = pb_aspect
        dx /= ax
        dy /= ay
        dz /= az

    return np.array([[1/dx, 0,    0,    -xmin/dx],
                     [0,    1/dy, 0,    -ymin/dy],
                     [0,    0,    1/dz, -zmin/dz],
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_cla.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_cla.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_labelpad.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_labelpad.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_ortho.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_ortho.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_rotated.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_rotated.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/bar3d.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/bar3d.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/bar3d_notshaded.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/bar3d_notshaded.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/bar3d_shaded.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/bar3d_shaded.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/contour3d.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/contour3d.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/contourf3d.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/contourf3d.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/contourf3d_fill.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/contourf3d_fill.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/lines3d.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/lines3d.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/mixedsubplot.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/mixedsubplot.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/plot_3d_from_2d.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/plot_3d_from_2d.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/poly3dcollection_alpha.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/poly3dcollection_alpha.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/poly3dcollection_closed.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/poly3dcollection_closed.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/quiver3d.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/quiver3d.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/quiver3d_empty.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/quiver3d_empty.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/quiver3d_masked.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/quiver3d_masked.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/quiver3d_pivot_middle.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/quiver3d_pivot_middle.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/quiver3d_pivot_tail.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/quiver3d_pivot_tail.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/scatter3d.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/scatter3d.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/scatter3d_color.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/scatter3d_color.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/surface3d.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/surface3d.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/surface3d_shaded.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/surface3d_shaded.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/text3d.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/text3d.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/tricontour.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/tricontour.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/trisurf3d.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/trisurf3d.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/trisurf3d_shaded.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/trisurf3d_shaded.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-alpha.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-alpha.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-edge-style.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-edge-style.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-named-colors.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-named-colors.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-rgb-data.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-rgb-data.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-simple.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-simple.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-xyz.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-xyz.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/wireframe3d.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/wireframe3d.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/wireframe3dzerocstride.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/wireframe3dzerocstride.png
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/wireframe3dzerorstride.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/wireframe3dzerorstride.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,9 @@
		``Axes3D`` no longer distorts the 3d plot to match the 2d aspect ratio
		----------------------------------------------------------------------

		Plots made with :class:`~mpl_toolkits.mplot3d.axes3d.Axes3D` were previously
		stretched to fit a square bounding box. As this stretching was done after
		the projection from 3D to 2D, it resulted in distorted images if non-square
		bounding boxes were used.

		As of this release, this no longer occurs.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1499,9 +1499,9 @@ def apply_aspect(self, position=None):
		"""
		Adjust the Axes for a specified data aspect ratio.

		Depending on `.get_adjustable` this will modify either the Axes box
		(position) or the view limits. In the former case, `.get_anchor`
		will affect the position.
		Depending on `.get_adjustable` this will modify either the
		Axes box(position) or the view limits. In the former case,
		`~matplotlib.axes.Axes.get_anchor`will affect the position.

		Notes
		-----
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -255,6 +255,20 @@ def tunit_edges(self, vals=None, M=None):
		(tc[7], tc[4])]
		return edges

		def apply_aspect(self, position=None):
		if position is None:
		position = self.get_position(original=True)

		# in the superclass, we would go through and actually deal with axis
		# scales and box/datalim. Those are all irrelevant - all we need to do
		# is make sure our coordinate system is square.
		figW, figH = self.get_figure().get_size_inches()
		fig_aspect = figH / figW
		box_aspect = 1
		pb = position.frozen()
		pb1 = pb.shrunk_to_aspect(box_aspect, pb, fig_aspect)
		self.set_position(pb1.anchored(self.get_anchor(), pb), 'active')

		@artist.allow_rasterization
		def draw(self, renderer):
		# draw the background patch
Expand DownExpand Up		@@ -950,6 +964,9 @@ def get_proj(self):

		dist is the distance of the eye viewing point from the object point.
		"""
		# chosen for similarity with the initial view before gh-8896
		pb_aspect = np.array([4, 4, 3]) / 3.5

		relev, razim = np.pi * self.elev/180, np.pi * self.azim/180

		xmin, xmax = self.get_xlim3d()
Expand All		@@ -959,10 +976,10 @@ def get_proj(self):
		# transform to uniform world coordinates 0-1, 0-1, 0-1
		worldM = proj3d.world_transformation(xmin, xmax,
		ymin, ymax,
		zmin, zmax)
		zmin, zmax, pb_aspect=pb_aspect)

		# look into the middle of the new coordinates
		R =np.array([0.5, 0.5, 0.5])
		R =pb_aspect / 2

		xp = R[0] + np.cos(razim) * np.cos(relev) * self.dist
		yp = R[1] + np.sin(razim) * np.cos(relev) * self.dist
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,8 +30,20 @@ def _line2d_seg_dist(p1, p2, p0):

		def world_transformation(xmin, xmax,
		ymin, ymax,
		zmin, zmax):
		dx, dy, dz = (xmax-xmin), (ymax-ymin), (zmax-zmin)
		zmin, zmax, pb_aspect=None):
		"""
		produce a matrix that scales homogenous coords in the specified ranges
		to [0, 1], or [0, pb_aspect[i]] if the plotbox aspect ratio is specified
		"""
		dx = xmax - xmin
		dy = ymax - ymin
		dz = zmax - zmin
		if pb_aspect is not None:
		ax, ay, az = pb_aspect
		dx /= ax
		dy /= ay
		dz /= az

		return np.array([[1/dx, 0, 0, -xmin/dx],
		[0, 1/dy, 0, -ymin/dy],
		[0, 0, 1/dz, -zmin/dz],
Expand Down