Skip to content

Commit 17592b4

Browse files
sergey-yaroslavtsevsergey-yaroslavtsev
authored
Merge pull request #1214 from silx-kit/matplotlib_cm
Fix deprecated use of `cm` from matplotlib
2 parents 4f10ac4 + d71ddda commit 17592b4

5 files changed

Lines changed: 52 additions & 52 deletions

File tree

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ numpy >= 1.8
1010
fisx >= 1.1.6
1111
PyOpenGL # For PyMca5.Object3D module
1212
h5py # For HDF5 file format support
13-
matplotlib > 1.0 # For visualization
13+
matplotlib >= 3.5 # For visualization
1414
qtconsole # For interactive console plugin
1515

1616
# PyQt5 or PySide2 or PySide6 # For PyMca5.PyMcaGui

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ def run(self):
909909

910910
# install requires for non-GUI usage
911911
install_requires = ["numpy",
912-
"matplotlib>1.0",
912+
"matplotlib>=3.5",
913913
"fisx>=1.1.6",
914914
"h5py"]
915915
if use_gui():

‎src/PyMca5/PyMcaCore/PyMcaMatplotlibSave.py‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import os
3535
import numpy
3636
import logging
37-
from matplotlib import cm
37+
from matplotlib import colormaps as mpl_colormaps
3838
from matplotlib import __version__ as matplotlib_version
3939
from matplotlib.font_manager import FontProperties
4040
from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
@@ -420,27 +420,27 @@ def saveImage(self, filename):
420420
origin = self.config['origin']
421421

422422
cmap = self.__temperatureCmap
423-
ccmap = cm.gray
423+
ccmap = mpl_colormaps['gray']
424424
if self.config['colormap'] in ['grey','gray']:
425-
cmap = cm.gray
425+
cmap = mpl_colormaps['gray']
426426
ccmap = self.__temperatureCmap
427427
elif self.config['colormap'] in ['yarg','yerg']:
428428
cmap = self.__reversedGrayCmap
429429
ccmap = self.__temperatureCmap
430430
elif self.config['colormap']=='jet':
431-
cmap = cm.jet
431+
cmap = mpl_colormaps['jet']
432432
elif self.config['colormap']=='hot':
433-
cmap = cm.hot
433+
cmap = mpl_colormaps['hot']
434434
elif self.config['colormap']=='cool':
435-
cmap = cm.cool
435+
cmap = mpl_colormaps['cool']
436436
elif self.config['colormap']=='copper':
437-
cmap = cm.copper
437+
cmap = mpl_colormaps['copper']
438438
elif self.config['colormap']=='spectral':
439-
cmap = cm.spectral
439+
cmap = mpl_colormaps['Spectral']
440440
elif self.config['colormap']=='hsv':
441-
cmap = cm.hsv
441+
cmap = mpl_colormaps['hsv']
442442
elif self.config['colormap']=='rainbow':
443-
cmap = cm.gist_rainbow
443+
cmap = mpl_colormaps['gist_rainbow']
444444
elif self.config['colormap']=='red':
445445
cmap = self.__redCmap
446446
elif self.config['colormap']=='green':
@@ -450,29 +450,29 @@ def saveImage(self, filename):
450450
elif self.config['colormap']=='temperature':
451451
cmap = self.__temperatureCmap
452452
elif self.config['colormap'] == 'paired':
453-
cmap = cm.Paired
453+
cmap = mpl_colormaps['Paired']
454454
elif self.config['colormap'] == 'paired_r':
455-
cmap = cm.Paired_r
455+
cmap = mpl_colormaps['Paired_r']
456456
elif self.config['colormap'] == 'pubu':
457-
cmap = cm.PuBu
457+
cmap = mpl_colormaps['PuBu']
458458
elif self.config['colormap'] == 'pubu_r':
459-
cmap = cm.PuBu_r
459+
cmap = mpl_colormaps['PuBu_r']
460460
elif self.config['colormap'] == 'rdbu':
461-
cmap = cm.RdBu
461+
cmap = mpl_colormaps['RdBu']
462462
elif self.config['colormap'] == 'rdbu_r':
463-
cmap = cm.RdBu_r
463+
cmap = mpl_colormaps['RdBu_r']
464464
elif self.config['colormap'] == 'gist_earth':
465-
cmap = cm.gist_earth
465+
cmap = mpl_colormaps['gist_earth']
466466
elif self.config['colormap'] == 'gist_earth_r':
467-
cmap = cm.gist_earth_r
467+
cmap = mpl_colormaps['gist_earth_r']
468468
elif self.config['colormap'] == 'blues':
469-
cmap = cm.Blues
469+
cmap = mpl_colormaps['Blues']
470470
elif self.config['colormap'] == 'blues_r':
471-
cmap = cm.Blues_r
471+
cmap = mpl_colormaps['Blues_r']
472472
elif self.config['colormap'] == 'ylgnbu':
473-
cmap = cm.YlGnBu
473+
cmap = mpl_colormaps['YlGnBu']
474474
elif self.config['colormap'] == 'ylgnbu_r':
475-
cmap = cm.YlGnBu_r
475+
cmap = mpl_colormaps['YlGnBu_r']
476476
else:
477477
_logger.warning("Unsupported colormap %s", self.config['colormap'])
478478
_logger.warning("Defaulting to grayscale.")

‎src/PyMca5/PyMcaGraph/backends/MatplotlibBackend.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def nanmin(x):
118118
from .. import PlotBackend
119119
except ImportError:
120120
from PyMca5.PyMca import PlotBackend
121-
from matplotlib import cm
121+
from matplotlib import colormaps as mpl_colormaps
122122
from matplotlib.font_manager import FontProperties
123123
try:
124124
from matplotlib.widgets import Cursor
@@ -2694,7 +2694,7 @@ def getDefaultColormap(self):
26942694

26952695
def getSupportedColormaps(self):
26962696
default = ['gray', 'reversed gray', 'temperature', 'red', 'green', 'blue']
2697-
maps = [m for m in cm.datad]
2697+
maps = [m for m in mpl_colormaps]
26982698
maps.sort()
26992699
return default + maps
27002700

@@ -2764,7 +2764,7 @@ def __getColormap(self, name):
27642764
return self.__blueCmap
27652765
else:
27662766
# built in
2767-
return cm.get_cmap(name)
2767+
return mpl_colormaps[name]
27682768

27692769
def dataToPixel(self, x=None, y=None, axis="left"):
27702770
"""

‎src/PyMca5/PyMcaGui/pymca/QPyMcaMatplotlibSave.py‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
from PyMca5.PyMcaGui.plotting import PyMcaPrintPreview
4343
from PyMca5 import PyMcaDirs
4444

45-
from matplotlib import cm
45+
from matplotlib import colormaps as mpl_colormaps
4646
from matplotlib.font_manager import FontProperties
4747
from PyMca5.PyMcaGraph.backends.MatplotlibBackend import FigureCanvas
4848
from matplotlib.figure import Figure
@@ -278,7 +278,7 @@ def __init__(self, parent=None, options=['1', '2', '3']):
278278
def setOptions(self,options=['1','2','3']):
279279
self.clear()
280280
for item in options:
281-
self.addItem(item)
281+
self.addItem(item)
282282

283283
def setCurrentText(self, text):
284284
for i in range(self.count()):
@@ -335,12 +335,12 @@ def __init__(self, parent = None):
335335
options = ['Temperature','Grey', 'Yerg',\
336336
'Red', 'Green', 'Blue',\
337337
'Rainbow', 'Jet','Hot', 'Cool', 'Copper']
338-
for candidate in ['spectral', 'Paired', 'Paired_r',
338+
for candidate in ['Spectral', 'Paired', 'Paired_r',
339339
'PuBu', 'PuBu_r', 'RdBu', 'RdBu_r',
340340
'gist_earth', 'gist_earth_r',
341341
'Blues', 'Blues_r',
342342
'YlGnBu', 'YlGnBu_r']:
343-
if hasattr(cm, candidate):
343+
if candidate in mpl_colormaps:
344344
options.append(candidate)
345345
elif self.labelList[i] in ['Lin/Log Colormap']:
346346
options = ['Linear','Logarithmic']
@@ -653,27 +653,27 @@ def updateFigure(self):
653653
origin = self.config['origin']
654654

655655
cmap = self.__temperatureCmap
656-
ccmap = cm.gray
656+
ccmap = mpl_colormaps['gray']
657657
if self.config['colormap'] in ['grey','gray']:
658-
cmap = cm.gray
658+
cmap = mpl_colormaps['gray']
659659
ccmap = self.__temperatureCmap
660660
elif self.config['colormap'] in ['yarg','yerg']:
661661
cmap = self.__reversedGrayCmap
662662
ccmap = self.__temperatureCmap
663663
elif self.config['colormap']=='jet':
664-
cmap = cm.jet
664+
cmap = mpl_colormaps['jet']
665665
elif self.config['colormap']=='hot':
666-
cmap = cm.hot
666+
cmap = mpl_colormaps['hot']
667667
elif self.config['colormap']=='cool':
668-
cmap = cm.cool
668+
cmap = mpl_colormaps['cool']
669669
elif self.config['colormap']=='copper':
670-
cmap = cm.copper
670+
cmap = mpl_colormaps['copper']
671671
elif self.config['colormap']=='spectral':
672-
cmap = cm.spectral
672+
cmap = mpl_colormaps['Spectral']
673673
elif self.config['colormap']=='hsv':
674-
cmap = cm.hsv
674+
cmap = mpl_colormaps['hsv']
675675
elif self.config['colormap']=='rainbow':
676-
cmap = cm.gist_rainbow
676+
cmap = mpl_colormaps['gist_rainbow']
677677
elif self.config['colormap']=='red':
678678
cmap = self.__redCmap
679679
elif self.config['colormap']=='green':
@@ -683,29 +683,29 @@ def updateFigure(self):
683683
elif self.config['colormap']=='temperature':
684684
cmap = self.__temperatureCmap
685685
elif self.config['colormap'] == 'paired':
686-
cmap = cm.Paired
686+
cmap = mpl_colormaps['Paired']
687687
elif self.config['colormap'] == 'paired_r':
688-
cmap = cm.Paired_r
688+
cmap = mpl_colormaps['Paired_r']
689689
elif self.config['colormap'] == 'pubu':
690-
cmap = cm.PuBu
690+
cmap = mpl_colormaps['PuBu']
691691
elif self.config['colormap'] == 'pubu_r':
692-
cmap = cm.PuBu_r
692+
cmap = mpl_colormaps['PuBu_r']
693693
elif self.config['colormap'] == 'rdbu':
694-
cmap = cm.RdBu
694+
cmap = mpl_colormaps['RdBu']
695695
elif self.config['colormap'] == 'rdbu_r':
696-
cmap = cm.RdBu_r
696+
cmap = mpl_colormaps['RdBu_r']
697697
elif self.config['colormap'] == 'gist_earth':
698-
cmap = cm.gist_earth
698+
cmap = mpl_colormaps['gist_earth']
699699
elif self.config['colormap'] == 'gist_earth_r':
700-
cmap = cm.gist_earth_r
700+
cmap = mpl_colormaps['gist_earth_r']
701701
elif self.config['colormap'] == 'blues':
702-
cmap = cm.Blues
702+
cmap = mpl_colormaps['Blues']
703703
elif self.config['colormap'] == 'blues_r':
704-
cmap = cm.Blues_r
704+
cmap = mpl_colormaps['Blues_r']
705705
elif self.config['colormap'] == 'ylgnbu':
706-
cmap = cm.YlGnBu
706+
cmap = mpl_colormaps['YlGnBu']
707707
elif self.config['colormap'] == 'ylgnbu_r':
708-
cmap = cm.YlGnBu_r
708+
cmap = mpl_colormaps['YlGnBu_r']
709709
else:
710710
_logger.warning("Unsupported colormap %s", self.config['colormap'])
711711

0 commit comments

Comments
 (0)