Update Gtk and Qt4 backends to be aware of the new location of the marker definitions.

mdboom · mdboom · commit 85b5e284b210 · 2011-07-14T15:46:31.000-04:00
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -32,6 +32,7 @@ def fn_name(): return sys._getframe(1).f_code.co_name
 from matplotlib.widgets import SubplotTool
 
 from matplotlib import lines
+from matplotlib import markers
 from matplotlib import cbook
 from matplotlib import verbose
 
@@ -1076,7 +1077,7 @@ class DialogLineprops:
     linestyled = dict([ (s,i) for i,s in enumerate(linestyles)])
 
 
-    markers =  [m for m in lines.Line2D.markers if cbook.is_string_like(m)]
+    markers =  [m for m in markers.MarkerStyle.markers if cbook.is_string_like(m)]
 
     markerd = dict([(s,i) for i,s in enumerate(markers)])
 
diff --git a/lib/matplotlib/backends/qt4_editor/figureoptions.py b/lib/matplotlib/backends/qt4_editor/figureoptions.py
@@ -10,6 +10,7 @@
 
 import matplotlib.backends.qt4_editor.formlayout as formlayout
 from matplotlib.backends.qt4_compat import QtGui
+from matplotlib import markers
 
 def get_icon(name):
     import matplotlib
@@ -25,30 +26,7 @@ def get_icon(name):
               'none': 'None',
               }
 
-MARKERS = {
-           'none': 'None',
-           'o': 'circles',
-           '^': 'triangle_up',
-           'v': 'triangle_down',
-           '<': 'triangle_left',
-           '>': 'triangle_right',
-           's': 'square',
-           '+': 'plus',
-           'x': 'cross',
-           '*': 'star',
-           'D': 'diamond',
-           'd': 'thin_diamond',
-           '1': 'tripod_down',
-           '2': 'tripod_up',
-           '3': 'tripod_left',
-           '4': 'tripod_right',
-           'h': 'hexagon',
-           'H': 'rotated_hexagon',
-           'p': 'pentagon',
-           '|': 'vertical_line',
-           '_': 'horizontal_line',
-           '.': 'dots',
-           }
+MARKERS = markers.MarkerStyle.markers
 
 COLORS = {'b': '#0000ff', 'g': '#00ff00', 'r': '#ff0000', 'c': '#ff00ff',
           'm': '#ff00ff', 'y': '#ffff00', 'k': '#000000', 'w': '#ffffff'}
