SF.net SVN: matplotlib:[6753] trunk/matplotlib/lib/matplotlib/contour.py

[<ef...@us...>]

Revision: 6753
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6753&view=rev
Author:   efiring
Date:     2009-01-06 20:31:33 +0000 (Tue, 06 Jan 2009)

Log Message:
-----------
Minor code cleanup in contour

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/contour.py

Modified: trunk/matplotlib/lib/matplotlib/contour.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/contour.py	2009-01-06 19:56:03 UTC (rev 6752)
+++ trunk/matplotlib/lib/matplotlib/contour.py	2009-01-06 20:31:33 UTC (rev 6753)
@@ -842,10 +842,14 @@
         if linewidths is None:
             tlinewidths = [(mpl.rcParams['lines.linewidth'],)] *Nlev
         else:
-            if cbook.iterable(linewidths) and len(linewidths) < Nlev:
-                linewidths = list(linewidths) * int(np.ceil(Nlev/len(linewidths)))
-            elif not cbook.iterable(linewidths) and type(linewidths) in [int, float]:
+            if not cbook.iterable(linewidths):
                 linewidths = [linewidths] * Nlev
+            else:
+                linewidths = list(linewidths)
+                if len(linewidths) < Nlev:
+                    linewidths = linewidths * int(np.ceil(Nlev/len(linewidths)))
+                if len(linewidths) > Nlev:
+                    linewidths = linewidths[:Nlev]
             tlinewidths = [(w,) for w in linewidths]
         return tlinewidths
 
@@ -862,10 +866,15 @@
         else:
             if cbook.is_string_like(linestyles):
                 tlinestyles = [linestyles] * Nlev
-            elif cbook.iterable(linestyles) and len(linestyles) < Nlev:
-                tlinestyles = list(linestyles) * int(np.ceil(Nlev/len(linestyles)))
-            elif cbook.iterable(linestyles): # len(linestyles) >= Nlev
-                tlinestyles = list(linestyles)[:Nlev]
+            elif cbook.iterable(linestyles):
+                tlinestyles = list(linestyles)
+                if len(tlinestyles) < Nlev:
+                    nreps = int(np.ceil(Nlev/len(linestyles)))
+                    tlinestyles = tlinestyles * nreps
+                if len(tlinestyles) > Nlev:
+                    tlinestyles = tlinestyles[:Nlev]
+            else:
+                raise ValueError("Unrecognized type for linestyles kwarg")
         return tlinestyles
 
     def get_alpha(self):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.