matplotlib
diff --git a/‎.travis.yml
Lines changed: 1 addition & 1 deletion b/‎.travis.yml
Lines changed: 1 addition & 1 deletion
diff --git a/‎doc/api/api_changes/2015-05-12_circle_marker_snap.rst
Lines changed: 9 additions & 0 deletions b/‎doc/api/api_changes/2015-05-12_circle_marker_snap.rst
Lines changed: 9 additions & 0 deletions
diff --git a/‎lib/matplotlib/backends/qt_editor/figureoptions.py
Lines changed: 9 additions & 3 deletions b/‎lib/matplotlib/backends/qt_editor/figureoptions.py
Lines changed: 9 additions & 3 deletions
diff --git a/‎lib/matplotlib/markers.py
Lines changed: 1 addition & 1 deletion b/‎lib/matplotlib/markers.py
Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/marker_edges.png
1.01 KB b/‎lib/matplotlib/tests/baseline_images/test_axes/marker_edges.png
1.01 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_axes/o_marker_path_snap.png
12.9 KB b/‎lib/matplotlib/tests/baseline_images/test_axes/o_marker_path_snap.png
12.9 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_text/text_contains.png
757 Bytes b/‎lib/matplotlib/tests/baseline_images/test_text/text_contains.png
757 Bytes
diff --git a/‎lib/matplotlib/tests/test_axes.py
Lines changed: 12 additions & 0 deletions b/‎lib/matplotlib/tests/test_axes.py
Lines changed: 12 additions & 0 deletions
@@ -85,7 +85,7 @@ script:
       export MPL_REPO_DIR=$PWD  # needed for pep8-conformance test of the examples
       mkdir ../tmp_test_dir
       cd ../tmp_test_dir
-      gdb -return-child-result -batch -ex r -ex bt --args python ../matplotlib/tests.py -sv --processes=$NPROC --process-timeout=300 $TEST_ARGS
+      gdb -return-child-result -batch -ex r -ex bt --args python ../matplotlib/tests.py -sv --processes=$NPROC --process-timeout=300 $TEST_ARGS -q
     else
       cd doc
       python make.py html --small --warningsaserrors
 
@@ -0,0 +1,9 @@
+Changed snap threshold for circle markers to inf
+````````````````````````````````````````````````
+
+When drawing circle markers above some marker size (previously 6.0)
+the path used to generate the marker was snapped to pixel centers.  However,
+this ends up distorting the marker away from a circle.  By setting the
+snap threshold to inf snapping is never done on circles.
+
+This change broke several tests, but is an improvement.
@@ -17,6 +17,7 @@
 import matplotlib.backends.qt_editor.formlayout as formlayout
 from matplotlib.backends.qt_compat import QtGui
 from matplotlib import markers
+from matplotlib.colors import colorConverter, rgb2hex
 
 
 def get_icon(name):
@@ -73,20 +74,25 @@ def figure_edit(axes, parent=None):
         curvelabels = sorted(linedict.keys())
         for label in curvelabels:
             line = linedict[label]
+            color = rgb2hex(colorConverter.to_rgb(line.get_color()))
+            ec = rgb2hex(colorConverter.to_rgb(line.get_markeredgecolor()))
+            fc = rgb2hex(colorConverter.to_rgb(line.get_markerfacecolor()))
             curvedata = [('Label', label),
                          sep,
                          (None, '<b>Line</b>'),
                          ('Style', [line.get_linestyle()] + linestyles),
                          ('Width', line.get_linewidth()),
-                         ('Color', line.get_color()),
+                         ('Color', color),
                          sep,
                          (None, '<b>Marker</b>'),
                          ('Style', [line.get_marker()] + markers),
                          ('Size', line.get_markersize()),
-                         ('Facecolor', line.get_markerfacecolor()),
-                         ('Edgecolor', line.get_markeredgecolor()),
+                         ('Facecolor', fc),
+                         ('Edgecolor', ec),
                          ]
             curves.append([curvedata, label, ""])
+    # make sure that there is at least one displayed curve
+    has_curve = bool(curves)
 
     datalist = [(general, "Axes", "")]
     if has_curve:
 
@@ -346,7 +346,7 @@ def _half_fill(self):
 
     def _set_circle(self, reduction=1.0):
         self._transform = Affine2D().scale(0.5 * reduction)
-        self._snap_threshold = 6.0
+        self._snap_threshold = np.inf
         fs = self.get_fillstyle()
         if not self._half_fill():
             self._path = Path.unit_circle()
 
@@ -3586,6 +3586,18 @@ def test_set_get_ticklabels():
     ax[1].set_yticklabels(ax[0].get_yticklabels() )
 
 
+@image_comparison(baseline_images=['o_marker_path_snap'], extensions=['png'],
+                  savefig_kwarg={'dpi': 72})
+def test_o_marker_path_snap():
+    fig, ax = plt.subplots()
+    ax.margins(.1)
+    for ms in range(1, 15):
+        ax.plot([1, 2, ], np.ones(2) + ms, 'o', ms=ms)
+
+    for ms in np.linspace(1, 10, 25):
+        ax.plot([3, 4, ], np.ones(2) + ms, 'o', ms=ms)
+
+
 @cleanup
 def test_margins():
     # test all ways margins can be called