removed lingering cm detritus

jdh2358 · jdh2358 · commit 34daf132dba2 · 2005-08-30T15:51:37.000Z
svn path=/trunk/matplotlib/; revision=1684
diff --git a/examples/two_scales.py b/examples/two_scales.py
@@ -34,5 +34,5 @@
 s2 = sin(2*pi*t)
 plot(t, s2, 'r.')
 ylabel('sin')
-
+ax2.yaxis.tick_right()
 show()
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -369,66 +369,7 @@
     'summer': _summer_data,
     'winter': _winter_data
     }
-atad['Blues']=_Blues_data
-datad['BrBG']=_BrBG_data
-datad['BrBu']=_BrBu_data
-datad['Bu']=_Bu_data
-datad['BuDOr']=_BuDOr_data
-datad['BuDRd']=_BuDRd_data
-datad['BuGn']=_BuGn_data
-datad['BuGr']=_BuGr_data
-datad['BuGy']=_BuGy_data
-datad['BuOr']=_BuOr_data
-datad['BuOrR']=_BuOrR_data
-datad['BuPu']=_BuPu_data
-datad['Cat']=_Cat_data
-datad['Dark2']=_Dark2_data
-datad['GMT_gebco']=_GMT_gebco_data
-datad['GMT_globe']=_GMT_globe_data
-datad['GMT_haxby']=_GMT_haxby_data
-datad['GMT_no_green']=_GMT_no_green_data
-datad['GMT_ocean']=_GMT_ocean_data
-datad['GMT_polar']=_GMT_polar_data
-datad['GMT_red2green']=_GMT_red2green_data
-datad['GMT_relief']=_GMT_relief_data
-datad['GMT_seis']=_GMT_seis_data
-datad['GMT_wysiwyg']=_GMT_wysiwyg_data
-datad['GnBu']=_GnBu_data
-datad['Greens']=_Greens_data
-datad['Greys']=_Greys_data
-datad['GrMg']=_GrMg_data
-datad['Oranges']=_Oranges_data
-datad['OrRd']=_OrRd_data
-datad['Paired']=_Paired_data
-datad['Pastel1']=_Pastel1_data
-datad['Pastel2']=_Pastel2_data
-datad['PiYG']=_PiYG_data
-datad['PRGn']=_PRGn_data
-datad['PuBu']=_PuBu_data
-datad['PuBuGn']=_PuBuGn_data
-datad['PuOr']=_PuOr_data
-datad['PuRd']=_PuRd_data
-datad['Purples']=_Purples_data
-datad['RdBu']=_RdBu_data
-datad['RdGy']=_RdGy_data
-datad['RdPu']=_RdPu_data
-datad['RdYlBu']=_RdYlBu_data
-datad['RdYlGn']=_RdYlGn_data
-datad['Reds']=_Reds_data
-datad['Set1']=_Set1_data
-datad['Set2']=_Set2_data
-datad['Set3']=_Set3_data
-datad['Spectral']=_Spectral_data
-datad['StepSeq']=_StepSeq_data
-datad['StepSeqRev']=_StepSeqRev_data
-datad['YlGn']=_YlGn_data
-datad['YlGnBu']=_YlGnBu_data
-datad['YlOrBr']=_YlOrBr_data
-datad['YlOrRd']=_YlOrRd_data
-datad['GMT_rainbow']=_GMT_rainbow_data
-datad['GMT_sealand']=_GMT_sealand_data
-datad['GMT_topo']=_GMT_topo_data
-h
+
 def get_cmap(name=None, lut=None):
     """
     Get a colormap instance, defaulting to rc values if name is None
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -169,21 +169,26 @@ def __init__(self, parent, handles, labels, loc,
 
         # make a trial box in the middle of the axes.  relocate it
         # based on it's bbox
-        left, upper = 0.5, 0.5
+        left, top = 0.5, 0.5
         if self.numpoints == 1:
             self._xdata = array([left + self.handlelen*0.5])
         else:
             self._xdata = linspace(left, left + self.handlelen, self.numpoints)
         textleft = left+ self.handlelen+self.handletextsep
-        self.texts = self._get_texts(labels, textleft, upper)
+        self.texts = self._get_texts(labels, textleft, top)
         self.legendHandles = self._get_handles(handles, self.texts)
 
-        left, top = self.texts[-1].get_position()
-        HEIGHT = self._approx_text_height()
+
+        if len(self.texts):
+            left, top = self.texts[-1].get_position()
+            HEIGHT = self._approx_text_height()*len(self.texts)
+        else:
+            HEIGHT = 0.2
+
         bottom = top-HEIGHT
         left -= self.handlelen + self.handletextsep + self.pad
         self.legendPatch = Rectangle(
-            xy=(left, bottom), width=0.5, height=HEIGHT*len(self.texts),
+            xy=(left, bottom), width=0.5, height=HEIGHT,
             facecolor='w', edgecolor='k',
             )
         self._set_artist_props(self.legendPatch)
@@ -208,6 +213,7 @@ def draw(self, renderer):
             self.legendPatch.draw(renderer)
 
 
+        if not len(self.legendHandles) and not len(self.texts): return
         for h in self.legendHandles:
             if h is not None:
 		h.draw(renderer)
@@ -497,6 +503,7 @@ def _update_positions(self, renderer):
         # called from renderer to allow more precise estimates of
         # widths and heights with get_window_extent
 
+        if not len(self.legendHandles) and not len(self.texts): return
         def get_tbounds(text):  #get text bounds in axes coords
             bbox = text.get_window_extent(renderer)
             bboxa = inverse_transform_bbox(self._transform, bbox)
