Merge pull request #8340 from delftswa2017/refactor_markers

NelleV · web-flow · commit f9e0b925101e · 2017-03-29T22:12:20.000-07:00
Refactor code duplication in `matplotlib.markers`
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -694,10 +694,8 @@ def _set_vline(self):
         self._path = self._line_marker_path
 
     def _set_hline(self):
-        self._transform = Affine2D().scale(0.5).rotate_deg(90)
-        self._snap_threshold = 1.0
-        self._filled = False
-        self._path = self._line_marker_path
+        self._set_vline()
+        self._transform = self._transform.rotate_deg(90)
 
     _tickhoriz_path = Path([[0.0, 0.0], [1.0, 0.0]])
 
@@ -727,17 +725,6 @@ def _set_tickdown(self):
         self._filled = False
         self._path = self._tickvert_path
 
-    _plus_path = Path([[-1.0, 0.0], [1.0, 0.0],
-                       [0.0, -1.0], [0.0, 1.0]],
-                      [Path.MOVETO, Path.LINETO,
-                       Path.MOVETO, Path.LINETO])
-
-    def _set_plus(self):
-        self._transform = Affine2D().scale(0.5)
-        self._snap_threshold = 1.0
-        self._filled = False
-        self._path = self._plus_path
-
     _tri_path = Path([[0.0, 0.0], [0.0, -1.0],
                       [0.0, 0.0], [0.8, 0.5],
                       [0.0, 0.0], [-0.8, 0.5]],
@@ -752,22 +739,16 @@ def _set_tri_down(self):
         self._path = self._tri_path
 
     def _set_tri_up(self):
-        self._transform = Affine2D().scale(0.5).rotate_deg(180)
-        self._snap_threshold = 5.0
-        self._filled = False
-        self._path = self._tri_path
+        self._set_tri_down()
+        self._transform = self._transform.rotate_deg(180)
 
     def _set_tri_left(self):
-        self._transform = Affine2D().scale(0.5).rotate_deg(270)
-        self._snap_threshold = 5.0
-        self._filled = False
-        self._path = self._tri_path
+        self._set_tri_down()
+        self._transform = self._transform.rotate_deg(270)
 
     def _set_tri_right(self):
-        self._transform = Affine2D().scale(0.5).rotate_deg(90)
-        self._snap_threshold = 5.0
-        self._filled = False
-        self._path = self._tri_path
+        self._set_tri_down()
+        self._transform = self._transform.rotate_deg(90)
 
     _caret_path = Path([[-1.0, 1.5], [0.0, 0.0], [1.0, 1.5]])
 
@@ -779,55 +760,45 @@ def _set_caretdown(self):
         self._joinstyle = 'miter'
 
     def _set_caretup(self):
-        self._transform = Affine2D().scale(0.5).rotate_deg(180)
-        self._snap_threshold = 3.0
-        self._filled = False
-        self._path = self._caret_path
-        self._joinstyle = 'miter'
+        self._set_caretdown()
+        self._transform = self._transform.rotate_deg(180)
 
     def _set_caretleft(self):
-        self._transform = Affine2D().scale(0.5).rotate_deg(270)
-        self._snap_threshold = 3.0
-        self._filled = False
-        self._path = self._caret_path
-        self._joinstyle = 'miter'
+        self._set_caretdown()
+        self._transform = self._transform.rotate_deg(270)
 
     def _set_caretright(self):
-        self._transform = Affine2D().scale(0.5).rotate_deg(90)
-        self._snap_threshold = 3.0
-        self._filled = False
-        self._path = self._caret_path
-        self._joinstyle = 'miter'
+        self._set_caretdown()
+        self._transform = self._transform.rotate_deg(90)
 
     _caret_path_base = Path([[-1.0, 0.0], [0.0, -1.5], [1.0, 0]])
 
     def _set_caretdownbase(self):
-        self._transform = Affine2D().scale(0.5)
-        self._snap_threshold = 3.0
-        self._filled = False
+        self._set_caretdown()
         self._path = self._caret_path_base
-        self._joinstyle = 'miter'
 
     def _set_caretupbase(self):
-        self._transform = Affine2D().scale(0.5).rotate_deg(180)
-        self._snap_threshold = 3.0
-        self._filled = False
-        self._path = self._caret_path_base
-        self._joinstyle = 'miter'
+        self._set_caretdownbase()
+        self._transform = self._transform.rotate_deg(180)
 
     def _set_caretleftbase(self):
-        self._transform = Affine2D().scale(0.5).rotate_deg(270)
-        self._snap_threshold = 3.0
-        self._filled = False
-        self._path = self._caret_path_base
-        self._joinstyle = 'miter'
+        self._set_caretdownbase()
+        self._transform = self._transform.rotate_deg(270)
 
     def _set_caretrightbase(self):
-        self._transform = Affine2D().scale(0.5).rotate_deg(90)
-        self._snap_threshold = 3.0
+        self._set_caretdownbase()
+        self._transform = self._transform.rotate_deg(90)
+
+    _plus_path = Path([[-1.0, 0.0], [1.0, 0.0],
+                       [0.0, -1.0], [0.0, 1.0]],
+                      [Path.MOVETO, Path.LINETO,
+                       Path.MOVETO, Path.LINETO])
+
+    def _set_plus(self):
+        self._transform = Affine2D().scale(0.5)
+        self._snap_threshold = 1.0
         self._filled = False
-        self._path = self._caret_path_base
-        self._joinstyle = 'miter'
+        self._path = self._plus_path
 
     _x_path = Path([[-1.0, -1.0], [1.0, 1.0],
                     [-1.0, 1.0], [1.0, -1.0]],
