added tims spectral patch

jdh2358 · jdh2358 · commit b64652d335d4 · 2006-12-20T05:39:20.000Z
svn path=/trunk/matplotlib/; revision=2942
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2006-12-19 Added Tim Leslie's spectral patch - JDH
+
 2006-12-17 Added rc param 'axes.formatter.limits' to control
            the default threshold for switching to scientific
            notation. Added convenience method
diff --git a/boilerplate.py b/boilerplate.py
@@ -153,6 +153,7 @@ def %(name)s():
     'spring',
     'summer',
     'winter',
+    'spectral'
 )
 # add all the colormaps (autumn, hsv, ....)
 for name in cmaps:
diff --git a/lib/matplotlib/_cm.py b/lib/matplotlib/_cm.py
@@ -14,6 +14,7 @@
 
 
 
+
 _bone_data = {'red':   ((0., 0., 0.),(1.0, 1.0, 1.0)),
               'green': ((0., 0., 0.),(1.0, 1.0, 1.0)),
               'blue':  ((0., 0., 0.),(1.0, 1.0, 1.0))}
@@ -338,6 +339,41 @@
                 'green': ((0., 0., 0.),(1.0, 1.0, 1.0)),
                 'blue':  ((0., 1., 1.),(1.0, 0.5, 0.5))}
 
+_spectral_data = {'red': [(0.0, 0.0, 0.0), (0.05, 0.4667, 0.4667),
+                          (0.10, 0.5333, 0.5333), (0.15, 0.0, 0.0),
+                          (0.20, 0.0, 0.0), (0.25, 0.0, 0.0),
+                          (0.30, 0.0, 0.0), (0.35, 0.0, 0.0),
+                          (0.40, 0.0, 0.0), (0.45, 0.0, 0.0),
+                          (0.50, 0.0, 0.0), (0.55, 0.0, 0.0),
+                          (0.60, 0.0, 0.0), (0.65, 0.7333, 0.7333),
+                          (0.70, 0.9333, 0.9333), (0.75, 1.0, 1.0),
+                          (0.80, 1.0, 1.0), (0.85, 1.0, 1.0),
+                          (0.90, 0.8667, 0.8667), (0.95, 0.80, 0.80),
+                          (1.0, 0.80, 0.80)],
+                  'green': [(0.0, 0.0, 0.0), (0.05, 0.0, 0.0),
+                            (0.10, 0.0, 0.0), (0.15, 0.0, 0.0),
+                            (0.20, 0.0, 0.0), (0.25, 0.4667, 0.4667),
+                            (0.30, 0.6000, 0.6000), (0.35, 0.6667, 0.6667),
+                            (0.40, 0.6667, 0.6667), (0.45, 0.6000, 0.6000),
+                            (0.50, 0.7333, 0.7333), (0.55, 0.8667, 0.8667),
+                            (0.60, 1.0, 1.0), (0.65, 1.0, 1.0),
+                            (0.70, 0.9333, 0.9333), (0.75, 0.8000, 0.8000),
+                            (0.80, 0.6000, 0.6000), (0.85, 0.0, 0.0),
+                            (0.90, 0.0, 0.0), (0.95, 0.0, 0.0),
+                            (1.0, 0.80, 0.80)],
+                  'blue': [(0.0, 0.0, 0.0), (0.05, 0.5333, 0.5333),
+                           (0.10, 0.6000, 0.6000), (0.15, 0.6667, 0.6667),
+                           (0.20, 0.8667, 0.8667), (0.25, 0.8667, 0.8667),
+                           (0.30, 0.8667, 0.8667), (0.35, 0.6667, 0.6667),
+                           (0.40, 0.5333, 0.5333), (0.45, 0.0, 0.0),
+                           (0.5, 0.0, 0.0), (0.55, 0.0, 0.0),
+                           (0.60, 0.0, 0.0), (0.65, 0.0, 0.0),
+                           (0.70, 0.0, 0.0), (0.75, 0.0, 0.0),
+                           (0.80, 0.0, 0.0), (0.85, 0.0, 0.0),
+                           (0.90, 0.0, 0.0), (0.95, 0.0, 0.0),
+                           (1.0, 0.80, 0.80)]}
+
+
 autumn = colors.LinearSegmentedColormap('autumn', _autumn_data, LUTSIZE)
 bone   = colors.LinearSegmentedColormap('bone  ', _bone_data, LUTSIZE)
 cool   = colors.LinearSegmentedColormap('cool',   _cool_data, LUTSIZE)
@@ -352,7 +388,7 @@
 spring = colors.LinearSegmentedColormap('spring', _spring_data, LUTSIZE)
 summer = colors.LinearSegmentedColormap('summer', _summer_data, LUTSIZE)
 winter = colors.LinearSegmentedColormap('winter', _winter_data, LUTSIZE)
-
+spectral = colors.LinearSegmentedColormap('spectral', _spectral_data, LUTSIZE)
 
 
 
@@ -370,7 +406,8 @@
     'prism':  _prism_data,
     'spring': _spring_data,
     'summer': _summer_data,
-    'winter': _winter_data
+    'winter': _winter_data,
+    'spectral': _spectral_data
     }
 
 # 34 colormaps based on color specifications and designs
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -1,6 +1,5 @@
 """
-A PostScript backend, which can produce both PostScript .ps and
-
+A PostScript backend, which can produce both PostScript .ps and .eps
 """
 
 from __future__ import division
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
@@ -102,6 +102,7 @@
   spring - set the default colormap to spring
   summer - set the default colormap to summer
   winter - set the default colormap to winter
+  spectral - set the default colormap to spectral
 
 _Event handling
 
@@ -513,6 +514,7 @@ def plotting():
     spring - set the default colormap to spring
     summer - set the default colormap to summer
     winter - set the default colormap to winter
+    spectral - set the default colormap to spectral
 
     """
     pass
@@ -522,7 +524,7 @@ def colormaps():
     matplotlib provides the following colormaps.
 
       autumn bone cool copper flag gray hot hsv jet pink prism
-      spring summer winter
+      spring summer winter spectral
 
     You can set the colormap for an image, pcolor, scatter, etc,
     either as a keyword argumentdef con
@@ -1558,7 +1560,7 @@ def arrow(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.arrow.__doc__ is not None:
@@ -1579,7 +1581,7 @@ def axhline(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.axhline.__doc__ is not None:
@@ -1600,7 +1602,7 @@ def axhspan(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.axhspan.__doc__ is not None:
@@ -1621,7 +1623,7 @@ def axvline(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.axvline.__doc__ is not None:
@@ -1642,7 +1644,7 @@ def axvspan(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.axvspan.__doc__ is not None:
@@ -1663,7 +1665,7 @@ def bar(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.bar.__doc__ is not None:
@@ -1684,7 +1686,7 @@ def barh(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.barh.__doc__ is not None:
@@ -1705,7 +1707,7 @@ def broken_barh(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.broken_barh.__doc__ is not None:
@@ -1726,7 +1728,7 @@ def boxplot(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.boxplot.__doc__ is not None:
@@ -1747,7 +1749,7 @@ def cohere(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.cohere.__doc__ is not None:
@@ -1768,7 +1770,7 @@ def clabel(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.clabel.__doc__ is not None:
@@ -1831,7 +1833,7 @@ def csd(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.csd.__doc__ is not None:
@@ -1852,7 +1854,7 @@ def errorbar(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.errorbar.__doc__ is not None:
@@ -1873,7 +1875,7 @@ def fill(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.fill.__doc__ is not None:
@@ -1894,7 +1896,7 @@ def hist(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.hist.__doc__ is not None:
@@ -1915,7 +1917,7 @@ def hlines(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.hlines.__doc__ is not None:
@@ -1957,7 +1959,7 @@ def loglog(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.loglog.__doc__ is not None:
@@ -2020,7 +2022,7 @@ def pie(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.pie.__doc__ is not None:
@@ -2041,7 +2043,7 @@ def plot(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.plot.__doc__ is not None:
@@ -2062,7 +2064,7 @@ def plot_date(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.plot_date.__doc__ is not None:
@@ -2083,7 +2085,7 @@ def psd(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.psd.__doc__ is not None:
@@ -2125,7 +2127,7 @@ def semilogx(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.semilogx.__doc__ is not None:
@@ -2146,7 +2148,7 @@ def semilogy(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.semilogy.__doc__ is not None:
@@ -2209,7 +2211,7 @@ def stem(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.stem.__doc__ is not None:
@@ -2230,7 +2232,7 @@ def vlines(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.vlines.__doc__ is not None:
@@ -2293,7 +2295,7 @@ def quiverkey(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    
     hold(b)
     return ret
 if Axes.quiverkey.__doc__ is not None:
@@ -2542,4 +2544,16 @@ def winter():
     draw_if_interactive()
 
 
+# This function was autogenerated by boilerplate.py.  Do not edit as
+# changes will be lost
+def spectral():
+    'set the default colormap to spectral and apply to current image if any.  See help(colormaps) for more information'
+    rc('image', cmap='spectral')
+    im = gci()
+
+
+    if im is not None:
+        im.set_cmap(cm.spectral)
+    draw_if_interactive()
+
 
diff --git a/src/_image.cpp b/src/_image.cpp
@@ -1,4 +1,3 @@
-
 #include <iostream>
 #include <fstream>
 #include <cmath>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2006-12-19 Added Tim Leslie's spectral patch - JDH`
	`2`	`+`
`1`	`3`	`2006-12-17 Added rc param 'axes.formatter.limits' to control`
`2`	`4`	`the default threshold for switching to scientific`
`3`	`5`	`notation. Added convenience method`
Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ def %(name)s():`
`153`	`153`	`'spring',`
`154`	`154`	`'summer',`
`155`	`155`	`'winter',`
	`156`	`+ 'spectral'`
`156`	`157`	`)`
`157`	`158`	`# add all the colormaps (autumn, hsv, ....)`
`158`	`159`	`for name in cmaps:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`#include <iostream>`
`3`	`2`	`#include <fstream>`
`4`	`3`	`#include <cmath>`