Changeset 8fad50b in sasview

Timestamp:

Oct 26, 2018 5:37:59 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

33812c3

Parents:

8748751

Message:

Replaced pylab.cm with mpl.cm (PK's code review)

Location:

src/sas/qtgui/Plotting

Files:

• ColorMap.py (modified) (2 diffs)
• Plotter2D.py (modified) (3 diffs)
• PlotterBase.py (modified) (2 diffs)

src/sas/qtgui/Plotting/ColorMap.py

@@ -8 +8 @@
 
 import matplotlib as mpl
-from matplotlib import pylab
 import numpy
 
@@ -32 +31 @@
         self.data = data
         self._cmap_orig = self._cmap = cmap if cmap is not None else DEFAULT_MAP
-        self.all_maps = [m for m in pylab.cm.datad]
+        self.all_maps = [m for m in mpl.cm.datad]
         self.maps = sorted(m for m in self.all_maps if not m.endswith("_r"))
         self.rmaps = sorted(set(self.all_maps) - set(self.maps))

src/sas/qtgui/Plotting/Plotter2D.py

@@ -1 +1 @@
 import copy
 import numpy
-import pylab
 import functools
 import logging
@@ -9 +8 @@
 from PyQt5 import QtWidgets
 
-DEFAULT_CMAP = pylab.cm.jet
 
 #import sys
@@ -15 +13 @@
 import matplotlib as mpl
 mpl.use("Qt5Agg")
+DEFAULT_CMAP = mpl.cm.jet
 
 from mpl_toolkits.mplot3d import Axes3D

src/sas/qtgui/Plotting/PlotterBase.py

@@ -1 @@
-import pylab
 import numpy
 
@@ -10 +9 @@
 
 import matplotlib.pyplot as plt
+import matplotlib as mpl
 from matplotlib import rcParams
 
-DEFAULT_CMAP = pylab.cm.jet
+DEFAULT_CMAP = mpl.cm.jet
 from sas.qtgui.Plotting.Binder import BindArtist
 from sas.qtgui.Plotting.PlotterData import Data1D