cleaned up lineprops gtk

svn path=/trunk/matplotlib/; revision=3402

examples/lineprops_dialog_gtk.py

@@ -0,0 +1,25 @@
+import matplotlib
+matplotlib.use('GTKAgg')
+from matplotlib.backends.backend_gtk import DialogLineprops
+
+import numpy as npy
+from pylab import figure, show
+
+def f(t):
+    s1 = npy.cos(2*npy.pi*t)
+    e1 = npy.exp(-t)
+    return npy.multiply(s1,e1)
+
+t1 = npy.arange(0.0, 5.0, 0.1)
+t2 = npy.arange(0.0, 5.0, 0.02)
+t3 = npy.arange(0.0, 2.0, 0.01)
+
+fig = figure()
+ax = fig.add_subplot(111)
+l1,  = ax.plot(t1, f(t1), 'bo', label='line 1')
+l2,  = ax.plot(t2, f(t2), 'k--', label='line 2')
+
+dlg = DialogLineprops([l1,l2])
+dlg.show()
+show()
+

lib/matplotlib/backends/backend_gtk.py

@@ -27,6 +27,8 @@ def fn_name(): return sys._getframe(1).f_code.co_name
      where, transpose, nonzero, indices, ones, nx
 from matplotlib.widgets import SubplotTool
 
+from matplotlib import lines
+from matplotlib import cbook
 
 backend_version = "%d.%d.%d" % gtk.pygtk_version
 
@@ -1096,47 +1098,17 @@ class DialogLineprops:
         'on_dialog_lineprops_cancelbutton_clicked',
         )
 
-    linestyles = (
-        '-'    ,
-        '--'   ,
-        '-.'   ,
-        ','    ,
-        'steps',
-        'None' ,
-    )
-
+    linestyles = [ls for ls in lines.Line2D.lineStyles if ls.strip()]
     linestyled = dict([ (s,i) for i,s in enumerate(linestyles)])
 
 
-    markers =  (
-        'None',
-        '.'  ,
-        ','  ,
-        'o'  ,
-        'v'  ,
-        '^'  ,
-        '<'  ,
-        '>'  ,
-        '1'  ,
-        '2'  ,
-        '3'  ,
-        '4'  ,
-        's'  ,
-        'p'  ,
-        'h'  ,
-        'H'  ,
-        '+'  ,
-        'x'  ,
-        'D'  ,
-        'd'  ,
-        '|'  ,
-        '_'  ,
-        )
+    markers =  [m for m in lines.Line2D.markers if cbook.is_string_like(m)]
 
     markerd = dict([(s,i) for i,s in enumerate(markers)])
 
     def __init__(self, lines):
-
+        import gtk.glade
+
         datadir = matplotlib.get_data_path()
         gladefile = os.path.join(datadir, 'lineprops.glade')
         if not os.path.exists(gladefile):

lib/matplotlib/lines.py

@@ -73,7 +73,7 @@ def unmasked_index_ranges(mask, compressed = True):
 
 
 class Line2D(Artist):
-    _lineStyles =  {
+    lineStyles = _lineStyles =  { # hidden names deprecated
         '-'    : '_draw_solid',
         '--'   : '_draw_dashed',
         '-.'   : '_draw_dash_dot',
@@ -84,7 +84,7 @@ class Line2D(Artist):
         ''     : '_draw_nothing',
     }
 
-    _markers =  {
+    markers = _markers =  {  # hidden names deprecated
         '.'  : '_draw_point',
         ','  : '_draw_pixel',
         'o'  : '_draw_circle',
@@ -435,14 +435,7 @@ def draw(self, renderer):
 
             gc = renderer.new_gc()
             self._set_gc_clip(gc)
-            if (is_string_like(self._markeredgecolor) and
-                self._markeredgecolor == 'auto'):
-                if self._marker in self.filled_markers:
-                    gc.set_foreground('k')
-                else:
-                    gc.set_foreground(self._color)
-            else:
-                gc.set_foreground(self._markeredgecolor)
+            gc.set_foreground(self.get_markeredgecolor())
             gc.set_linewidth(self._markeredgewidth)
             gc.set_alpha(self._alpha)
             funcname = self._markers.get(self._marker, '_draw_nothing')
@@ -457,9 +450,33 @@ def get_linestyle(self): return self._linestyle
 
     def get_linewidth(self): return self._linewidth
     def get_marker(self): return self._marker
-    def get_markeredgecolor(self): return self._markeredgecolor
+
+    def get_markeredgecolor(self):
+        if (is_string_like(self._markeredgecolor) and
+            self._markeredgecolor == 'auto'):
+            if self._marker in self.filled_markers:
+                return 'k'
+            else:
+                return self._color
+        else:
+            return self._markeredgecolor
+
+
+        return self._markeredgecolor
     def get_markeredgewidth(self): return self._markeredgewidth
-    def get_markerfacecolor(self): return self._markerfacecolor
+
+    def get_markerfacecolor(self):
+        if (self._markerfacecolor is None or
+            (is_string_like(self._markerfacecolor) and
+             self._markerfacecolor.lower()=='none') ):
+            return self._markerfacecolor
+        elif (is_string_like(self._markerfacecolor) and
+              self._markerfacecolor.lower() == 'auto'):
+            return self._color
+        else:
+            return self._markerfacecolor
+
+
     def get_markersize(self): return self._markersize
 
     def get_xdata(self, orig=True):
@@ -1136,15 +1153,11 @@ def update_from(self, other):
 
 
     def _get_rgb_face(self):
-        if (self._markerfacecolor is None or
-            (is_string_like(self._markerfacecolor) and
-             self._markerfacecolor.lower()=='none') ):
+        facecolor = self.get_markerfacecolor()
+        if is_string_like(facecolor) and facecolor.lower()=='none':
             rgbFace = None
-        elif (is_string_like(self._markerfacecolor) and
-              self._markerfacecolor.lower() == 'auto'):
-            rgbFace = colorConverter.to_rgb(self._color)
         else:
-            rgbFace = colorConverter.to_rgb(self._markerfacecolor)
+            rgbFace = colorConverter.to_rgb(facecolor)
         return rgbFace
 
     # some aliases....

lib/matplotlib/mlab.py

@@ -1365,7 +1365,7 @@ def load(fname,comments='#',delimiter=None, converters=None,skiprows=0,
     else:  return X
 
 def csv2rec(fname, comments='#', skiprows=0, checkrows=5, delimiter=',',
-            converterd=None, names=None):
+            converterd=None, names=None, missing=None):
     """
     Load data from comma/space/tab delimited file in fname into a
     numpy record array and return the record array.
@@ -1446,7 +1446,8 @@ def get_converters(reader):
                 if func is None:
                     if not item.strip(): continue
                     func = converters[j]
-                    func = get_func(item, func)
+                    if len(item.strip()):
+                        func = get_func(item, func)
                 converters[j] = func
         return converters