Skip to content

Null strides wireframe #4852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 3, 2015
Merged

Null strides wireframe #4852

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
994f167
Wireframe allows for just one dimension of slide now
Sep 22, 2014
ba1e339
Only try to extend rii and cii when not empty
jenshnielsen Aug 1, 2015
2375009
Add example of new zero stride wire3d plots
jenshnielsen Aug 1, 2015
ce3d899
Add wireframe tests with zero r and c stride
jenshnielsen Aug 2, 2015
bf3ccb3
wireframe3d add docstring documenting rstride and cstride
jenshnielsen Aug 2, 2015
c93223d
wireframe3d raise when both cstride and rstride are 0
jenshnielsen Aug 2, 2015
0a252bb
Add what's new for wireframe plot
jenshnielsen Aug 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
wireframe3d raise when both cstride and rstride are 0
  • Loading branch information
@jenshnielsen
jenshnielsen committed Aug 2, 2015
commit c93223da2deea3368182c4f900fe449e678a89b8
3 changes: 3 additions & 0 deletions lib/mpl_toolkits/mplot3d/axes3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1765,6 +1765,9 @@ def plot_wireframe(self, X, Y, Z, *args, **kwargs):
else:
cii = []

if rstride == 0 and cstride == 0:
raise ValueError("Either rstride or cstride must be non zero")

# If the inputs were empty, then just
# reset everything.
if Z.size == 0 :
Expand Down
16 changes: 15 additions & 1 deletion lib/mpl_toolkits/tests/test_mplot3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import sys
import nose
from nose.tools import assert_raises
from mpl_toolkits.mplot3d import Axes3D, axes3d
from matplotlib import cm
from matplotlib.testing.decorators import image_comparison
from matplotlib.testing.decorators import image_comparison, cleanup
import matplotlib.pyplot as plt
import numpy as np

Expand Down Expand Up @@ -189,6 +192,17 @@ def test_wireframe3dzerorstride():
X, Y, Z = axes3d.get_test_data(0.05)
ax.plot_wireframe(X, Y, Z, rstride=0, cstride=10)

@cleanup
def test_wireframe3dzerostrideraises():
if sys.version_info[:2] < (2, 7):
raise nose.SkipTest("assert_raises as context manager "
"not supported with Python < 2.7")
fig = plt.figure()
ax = fig.add_subplot(111, projection='3d')
X, Y, Z = axes3d.get_test_data(0.05)
with assert_raises(ValueError):
ax.plot_wireframe(X, Y, Z, rstride=0, cstride=0)

@image_comparison(baseline_images=['quiver3d'], remove_text=True)
def test_quiver3d():
fig = plt.figure()
Expand Down