Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit b177aaf

Browse filesBrowse files
committed
Merge remote-tracking branch 'upstream/v1.3.x'
Conflicts: lib/matplotlib/axis.py lib/matplotlib/tests/test_axes.py
2 parents e01f39c + bf5d3e7 commit b177aaf
Copy full SHA for b177aaf

File tree

Expand file treeCollapse file tree

3 files changed

+15
-1
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+15
-1
lines changed

‎examples/mplot3d/wire3d_animation_demo.py

Copy file name to clipboardExpand all lines: examples/mplot3d/wire3d_animation_demo.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ def generate(X, Y, phi):
3333
if oldcol is not None:
3434
ax.collections.remove(oldcol)
3535

36-
plt.draw()
36+
plt.pause(.001)
3737

3838
print ('FPS: %f' % (100 / (time.time() - tstart)))

‎lib/matplotlib/axis.py

Copy file name to clipboardExpand all lines: lib/matplotlib/axis.py
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,10 @@ def _apply_params(self, **kw):
316316
self.label1.set(**label_kw)
317317
self.label2.set(**label_kw)
318318
for k, v in six.iteritems(label_kw):
319+
# for labelsize the text objects covert str ('small')
320+
# -> points. grab the integer from the `Text` object
321+
# instead of saving the string representation
322+
v = getattr(self.label1, 'get_' + k)()
319323
setattr(self, '_' + k, v)
320324

321325

‎lib/matplotlib/tests/test_axes.py

Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_axes.py
+10Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2450,6 +2450,16 @@ def test_relim_visible_only():
24502450
assert ax.get_ylim() == y1
24512451

24522452

2453+
def test_text_labelsize():
2454+
"""
2455+
tests for issue #1172
2456+
"""
2457+
fig = plt.figure()
2458+
ax = fig.gca()
2459+
ax.tick_params(labelsize='large')
2460+
ax.tick_params(direction='out')
2461+
2462+
24532463
if __name__ == '__main__':
24542464
import nose
24552465
import sys

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.