From 0865b9950ab37daddae8863afd320a49e23e107b Mon Sep 17 00:00:00 2001 From: Truong Pham Date: Mon, 21 Nov 2016 21:31:49 -0800 Subject: [PATCH 1/4] Fix wrong direction curly quotes in marker table, fit the (numsides, style, angle) description inside the table, group 'nothing' marker --- lib/matplotlib/markers.py | 97 +++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 51 deletions(-) diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py index ba43041174d3..038468abef40 100644 --- a/lib/matplotlib/markers.py +++ b/lib/matplotlib/markers.py @@ -8,31 +8,29 @@ ============================== =============================================== marker description ============================== =============================================== -"." point -"," pixel -"o" circle -"v" triangle_down -"^" triangle_up -"<" triangle_left -">" triangle_right -"1" tri_down -"2" tri_up -"3" tri_left -"4" tri_right -"8" octagon -"s" square -"p" pentagon -"*" star -"h" hexagon1 -"H" hexagon2 -"+" plus -"x" x -"D" diamond -"d" thin_diamond -"|" vline -"_" hline -"P" plus (filled) -"X" x (filled) +`"."` point +`","` pixel +`"o"` circle +`"v"` triangle_down +`"^"` triangle_up +`"<"` triangle_left +`">"` triangle_right +`"1"` tri_down +`"2"` tri_up +`"3"` tri_left +`"4"` tri_right +`"8"` octagon +`"s"` square +`"p"` pentagon +`"*"` star +`"h"` hexagon1 +`"H"` hexagon2 +`"+"` plus (filled) +`"x"` x (filled) +`"D"` diamond +`"d"` thin_diamond +`"|"` vline +`"_"` hline TICKLEFT tickleft TICKRIGHT tickright TICKUP tickup @@ -44,43 +42,40 @@ CARETLEFTBASE caretleft (centered at base) CARETRIGHTBASE caretright (centered at base) CARETUPBASE caretup (centered at base) -"None" nothing -None nothing -" " nothing -"" nothing +`"None"`, None, `" "`, or `""` nothing ``'$...$'`` render the string using mathtext. `verts` a list of (x, y) pairs used for Path vertices. The center of the marker is located at (0,0) and the size is normalized. path a `~matplotlib.path.Path` instance. -(`numsides`, `style`, `angle`) see below +(`numsides`, `style`, `angle`) The marker can also be a tuple (`numsides`, + `style`, `angle`), which will create a custom, + regular symbol. + + `numsides`: + the number of sides + + `style`: + the style of the regular symbol: + """""" + ===== =================================== + Value Description + 0 a regular polygon + 1 a star-like symbol + 2 an asterisk + 3 a circle (`numsides` and `angle` is + ignored) + ===== =================================== + """""" + `angle`: + the angle of rotation of the symbol ============================== =============================================== -The marker can also be a tuple (`numsides`, `style`, `angle`), which -will create a custom, regular symbol. - - `numsides`: - the number of sides - - `style`: - the style of the regular symbol: - - ===== ============================================= - Value Description - ===== ============================================= - 0 a regular polygon - 1 a star-like symbol - 2 an asterisk - 3 a circle (`numsides` and `angle` is ignored) - ===== ============================================= - - `angle`: - the angle of rotation of the symbol, in degrees - For backward compatibility, the form (`verts`, 0) is also accepted, but it is equivalent to just `verts` for giving a raw set of vertices that define the shape. """ + from __future__ import (absolute_import, division, print_function, unicode_literals) From 3c4f845ccbf546bcafeffffcafe3f5ca8b28ea34 Mon Sep 17 00:00:00 2001 From: Truong Pham Date: Tue, 22 Nov 2016 11:19:57 -0800 Subject: [PATCH 2/4] Remove from table --- lib/matplotlib/markers.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py index 038468abef40..4a4b45aa574e 100644 --- a/lib/matplotlib/markers.py +++ b/lib/matplotlib/markers.py @@ -42,11 +42,15 @@ CARETLEFTBASE caretleft (centered at base) CARETRIGHTBASE caretright (centered at base) CARETUPBASE caretup (centered at base) -`"None"`, None, `" "`, or `""` nothing +`" "`, or `""` nothing ``'$...$'`` render the string using mathtext. `verts` a list of (x, y) pairs used for Path vertices. The center of the marker is located at (0,0) and - the size is normalized. + the size is normalized. For backward + compatibility, the form (`verts`, 0) is also + accepted, but it is equivalent to just `verts` + for giving a raw set of vertices that define the + shape. path a `~matplotlib.path.Path` instance. (`numsides`, `style`, `angle`) The marker can also be a tuple (`numsides`, `style`, `angle`), which will create a custom, @@ -71,9 +75,9 @@ the angle of rotation of the symbol ============================== =============================================== -For backward compatibility, the form (`verts`, 0) is also accepted, -but it is equivalent to just `verts` for giving a raw set of vertices -that define the shape. +`None` is the default which often means 'nothing', however this table is +referred to from other docs for the valid inputs from marker inputs and in +those cases `None` still means 'default'. """ from __future__ import (absolute_import, division, print_function, From c5a8b6b5474c82f765802315f25f7dd934d490c5 Mon Sep 17 00:00:00 2001 From: Truong Pham Date: Mon, 28 Nov 2016 00:51:31 -0800 Subject: [PATCH 3/4] Add missing markers 'P' and 'X' --- lib/matplotlib/markers.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py index 4a4b45aa574e..d19f5cec8464 100644 --- a/lib/matplotlib/markers.py +++ b/lib/matplotlib/markers.py @@ -25,12 +25,14 @@ `"*"` star `"h"` hexagon1 `"H"` hexagon2 -`"+"` plus (filled) -`"x"` x (filled) +`"+"` plus +`"x"` x `"D"` diamond `"d"` thin_diamond `"|"` vline `"_"` hline +`"P"` plus (filled) +`"X"` x (filled) TICKLEFT tickleft TICKRIGHT tickright TICKUP tickup @@ -42,15 +44,11 @@ CARETLEFTBASE caretleft (centered at base) CARETRIGHTBASE caretright (centered at base) CARETUPBASE caretup (centered at base) -`" "`, or `""` nothing +`"None"`, `" "` or `""` nothing ``'$...$'`` render the string using mathtext. `verts` a list of (x, y) pairs used for Path vertices. The center of the marker is located at (0,0) and - the size is normalized. For backward - compatibility, the form (`verts`, 0) is also - accepted, but it is equivalent to just `verts` - for giving a raw set of vertices that define the - shape. + the size is normalized. path a `~matplotlib.path.Path` instance. (`numsides`, `style`, `angle`) The marker can also be a tuple (`numsides`, `style`, `angle`), which will create a custom, @@ -75,7 +73,11 @@ the angle of rotation of the symbol ============================== =============================================== -`None` is the default which often means 'nothing', however this table is +For backward compatibility, the form (`verts`, 0) is also accepted, +but it is equivalent to just `verts` for giving a raw set of vertices +that define the shape. + +`None` is the default which means 'nothing', however this table is referred to from other docs for the valid inputs from marker inputs and in those cases `None` still means 'default'. """ From fb2ebb2e30f1a650d9091d28d13a3b43e52fd7ac Mon Sep 17 00:00:00 2001 From: Truong Pham Date: Tue, 29 Nov 2016 11:28:43 -0800 Subject: [PATCH 4/4] Group 'P' and 'X' with the lower case versions --- lib/matplotlib/markers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py index d19f5cec8464..3dc27636bf1a 100644 --- a/lib/matplotlib/markers.py +++ b/lib/matplotlib/markers.py @@ -22,17 +22,17 @@ `"8"` octagon `"s"` square `"p"` pentagon +`"P"` plus (filled) `"*"` star `"h"` hexagon1 `"H"` hexagon2 `"+"` plus `"x"` x +`"X"` x (filled) `"D"` diamond `"d"` thin_diamond `"|"` vline `"_"` hline -`"P"` plus (filled) -`"X"` x (filled) TICKLEFT tickleft TICKRIGHT tickright TICKUP tickup