fixed hatchh patch bug

jdh2358 · jdh2358 · commit 61e460f3d107 · 2006-01-08T13:31:34.000Z
svn path=/trunk/matplotlib/; revision=1936
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1279,7 +1279,7 @@ def cohere(self, x, y, NFFT=256, Fs=2, detrend=detrend_none,
                window=window_hanning, noverlap=0, **kwargs):
         """
         COHERE(x, y, NFFT=256, Fs=2, detrend=detrend_none,
-              window=window_hanning, noverlap=0)
+              window=window_hanning, noverlap=0, **kwargs)
 
         cohere the coherence between x and y.  Coherence is the normalized
         cross spectral density
@@ -1310,10 +1310,10 @@ def cohere(self, x, y, NFFT=256, Fs=2, detrend=detrend_none,
 
 
     def csd(self, x, y, NFFT=256, Fs=2, detrend=detrend_none,
-            window=window_hanning, noverlap=0):
+            window=window_hanning, noverlap=0, **kwargs):
         """
         CSD(x, y, NFFT=256, Fs=2, detrend=detrend_none,
-            window=window_hanning, noverlap=0)
+            window=window_hanning, noverlap=0, **kwargs)
 
         The cross spectral density Pxy by Welches average periodogram method.
         The vectors x and y are divided into NFFT length segments.  Each
@@ -1337,7 +1337,7 @@ def csd(self, x, y, NFFT=256, Fs=2, detrend=detrend_none,
         pxy.shape = len(freqs),
         # pxy is complex
 
-        self.plot(freqs, 10*log10(absolute(pxy)))
+        self.plot(freqs, 10*log10(absolute(pxy)), **kwargs)
         self.set_xlabel('Frequency')
         self.set_ylabel('Cross Spectrum Magnitude (dB)')
         self.grid(True)
@@ -2683,10 +2683,10 @@ def plot_date(self, x, y, fmt='bo', tz=None, xdate=True, ydate=False,
         return ret
 
     def psd(self, x, NFFT=256, Fs=2, detrend=detrend_none,
-            window=window_hanning, noverlap=0):
+            window=window_hanning, noverlap=0, **kwargs):
         """
         PSD(x, NFFT=256, Fs=2, detrend=detrend_none,
-            window=window_hanning, noverlap=0)
+            window=window_hanning, noverlap=0, **kwargs)
 
         The power spectral density by Welches average periodogram method.  The
         vector x is divided into NFFT length segments.  Each segment is
@@ -2713,6 +2713,7 @@ def psd(self, x, NFFT=256, Fs=2, detrend=detrend_none,
 
             noverlap gives the length of the overlap between segments.
 
+            kwargs are passed to plot to control line props
         Returns the tuple Pxx, freqs
 
         For plotting, the power is plotted as 10*log10(pxx)) for decibels,
@@ -2728,7 +2729,7 @@ def psd(self, x, NFFT=256, Fs=2, detrend=detrend_none,
         pxx, freqs = matplotlib.mlab.psd(x, NFFT, Fs, detrend, window, noverlap)
         pxx.shape = len(freqs),
 
-        self.plot(freqs, 10*log10(pxx))
+        self.plot(freqs, 10*log10(pxx), **kwargs)
         self.set_xlabel('Frequency')
         self.set_ylabel('Power Spectrum (dB)')
         self.grid(True)
@@ -3011,7 +3012,6 @@ def semilogx(self, *args, **kwargs):
             which depend on the number of decades in the plot
 
         """
-        # hi fernando
         if not self._hold: self.cla()
         d = {'basex': kwargs.get('basex', 10),
              'subsx': kwargs.get('subsx', None),
@@ -3043,7 +3043,6 @@ def semilogy(self, *args, **kwargs):
             which depend on the number of decades in the plot
 
         """
-        # hi fernando
         if not self._hold: self.cla()
 
         d = {'basey': kwargs.get('basey', 10),
@@ -3587,7 +3586,9 @@ def text(self, x, y, s, fontdict=None,
         t.update(kwargs)
         self.texts.append(t)
 
-        if t.get_clip_on():  t.set_clip_box(self.bbox)
+        
+        #if t.get_clip_on():  t.set_clip_box(self.bbox)
+        if kwargs.has_key('clip_on'):  t.set_clip_box(self.bbox)
         return t
 
 
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -159,7 +159,7 @@ def draw(self, renderer):
         else: rgbFace = colorConverter.to_rgb(self._facecolor)
 
         if self._hatch:
-            gc.set_hatch(self._hatchh )
+            gc.set_hatch(self._hatch )
 
         verts = self.get_verts()
         tverts = self._transform.seq_xy_tups(verts)
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -27,7 +27,7 @@
 # the default backend; one of GTK GTKAgg GTKCairo FltkAgg QtAgg TkAgg 
 #     Agg Cairo GD GDK Paint PS SVG Template
 backend      : %(backend)s     
-numerix      : %(numerix)s  # Numeric or numarray
+numerix      : %(numerix)s  # numpy, Numeric or numarray
 interactive  : False      # see http://matplotlib.sourceforge.net/interactive.html
 toolbar      : toolbar2   # None | classic | toolbar2
 timezone     : UTC        # a pytz timezone string, eg US/Central or Europe/Paris
diff --git a/setup.py b/setup.py
@@ -148,9 +148,6 @@
 
 rc['numerix'] = NUMERIX[-1]
 
-# This print interers with --version, which license depends on
-#print "Compiling matplotlib for:", NUMERIX
-
 ext_modules = []
 
 # these are not optional
