8000 Merge branch 'v1.5.x' into v2.x · matplotlib/matplotlib@d8ebc39 · GitHub
[go: up one dir, main page]
Skip to content

Commit d8ebc39

Browse files
jenshnielsenjenshnielsen
committed
Merge branch 'v1.5.x' into v2.x
2 parents 042ad99 + 250251b commit d8ebc39

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

‎doc/_static/boxplot_explanation.png

35.9 KB
Loading

‎doc/users/image_tutorial.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ the image.
340340

341341
In [16]: from PIL import Image
342342
In [17]: img = Image.open('../_static/stinkbug.png')
343-
In [18]: resized = img.thumbnail((64, 64), Image.ANTIALIAS) # resizes image in-place
343+
In [18]: img.thumbnail((64, 64), Image.ANTIALIAS) # resizes image in-place
344344
In [19]: imgplot = plt.imshow(img)
345345

346346
.. plot::
@@ -358,7 +358,7 @@ Let's try some others:
358358

359359
.. sourcecode:: ipython
360360

361-
In [20]: imgplot = plt.imshow(resized, interpolation="nearest")
361+
In [20]: imgplot = plt.imshow(img, interpolation="nearest")
362362

363363
.. plot::
364364

@@ -370,7 +370,7 @@ Let's try some others:
370370

371371
.. sourcecode:: ipython
372372

373-
In [21]: imgplot = plt.imshow(resized, interpolation="bicubic")
373+
In [21]: imgplot = plt.imshow(img, interpolation="bicubic")
374374

375375
.. plot::
376376

‎examples/axes_grid/parasite_simple2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
ax_kms.axis["bottom"].set_label("Linear velocity at 2.3 kpc [km/s]")
3232
ax_kms.axis["left"].set_label("FWHM [km/s]")
33-
ax_pm.axis["top"].set_label("Proper Motion [$^{''}$/yr]")
33+
ax_pm.axis["top"].set_label(r"Proper Motion [$''$/yr]")
3434
ax_pm.axis["top"].label.set_visible(True)
3535
ax_pm.axis["right"].major_ticklabels.set_visible(False)
3636

‎lib/matplotlib/_cm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1751,7 +1751,7 @@ def gfunc32(x):
17511751

17521752
# This bipolar color map was generated from CoolWarmFloat33.csv of
17531753
# "Diverging Color Maps for Scientific Visualization" by Kenneth Moreland.
1754-
# <http://www.cs.unm.edu/~kmorel/documents/ColorMaps/>
1754+
# <http://www.kennethmoreland.com/color-maps/>
17551755
_coolwarm_data = {
17561756
'red': [
17571757
(0.0, 0.2298057, 0.2298057),

‎lib/matplotlib/backends/qt_editor/formlayout.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ def setup(self):
296296
field.setCheckState(QtCore.Qt.Unchecked)
297297
elif isinstance(value, float):
298298
field = QtWidgets.QLineEdit(repr(value), self)
299+
field.setCursorPosition(0)
299300
field.setValidator(QtGui.QDoubleValidator(field))
300301
dialog = self.get_dialog()
301302
dialog.register_float_field(field)

‎lib/matplotlib/pyplot.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2153,8 +2153,7 @@ def colormaps():
21532153
<http://www.ncl.ucar.edu/Document/Graphics/color_table_gallery.shtml>`_
21542154
21552155
.. [#] See `Diverging Color Maps for Scientific Visualization
2156-
<http://www.cs.unm.edu/~kmorel/documents/ColorMaps/>`_ by Kenneth
2157-
Moreland.
2156+
<http://www.kennethmoreland.com/color-maps/>`_ by Kenneth Moreland.
21582157
21592158
.. [#] See `A Color Map for Effective Black-and-White Rendering of
21602159
Color-Scale Images

0 commit comments

Comments
 (0)
0