Skip to content

Refactor code duplication in matplotlib.markers #8340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 30, 2017
Merged

Refactor code duplication in matplotlib.markers #8340

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
73f1ed4
refactored duplication in vline hline
sindunuragarp Mar 13, 2017
34d014f
Moved plus function closer to similar x function
sindunuragarp Mar 13, 2017
acb7061
Refactored repeated code in _set_tri_xxx functions
sindunuragarp Mar 13, 2017
8f86eb6
Refactored repeated code in _set_caretxxx functions
sindunuragarp Mar 13, 2017
b37e0b7
Merge branch 'master' into refactor_markers
sindunuragarp Mar 19, 2017
162c04c
Removed unnecessary file
sindunuragarp Mar 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 31 additions & 60 deletions lib/matplotlib/markers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]])

Expand Down Expand Up @@ -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]],
Expand All @@ -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]])

Expand All @@ -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]],
Expand Down