@@ -233,7 +233,7 @@ def __init__(self, xdata, ydata,
233233 self .set_markerfacecolor (markerfacecolor )
234234 self .set_markeredgecolor (markeredgecolor )
235235 self .set_markeredgewidth (markeredgewidth )
236- self .set_fillstyle (fillstyle )
236+ self .set_fillstyle (fillstyle )
237237
238238 self ._point_size_reduction = 0.5
239239
@@ -323,9 +323,9 @@ def set_pickradius(self,d):
323323
324324 def get_fillstyle (self ):
325325 """
326- return the marker fillstyle
326+ return the marker fillstyle
327327 """
328- return self ._fillstyle
328+ return self ._fillstyle
329329
330330 def set_fillstyle (self , fs ):
331331 """
@@ -335,7 +335,7 @@ def set_fillstyle(self, fs):
335335 ACCEPTS: ['full' | 'left' | 'right' | 'bottom' | 'top']
336336 """
337337 assert fs in ['full' , 'left' , 'right' , 'bottom' , 'top' ]
338- self ._fillstyle = fs
338+ self ._fillstyle = fs
339339
340340 def set_markevery (self , every ):
341341 """
@@ -396,7 +396,7 @@ def set_data(self, *args):
396396 """
397397 Set the x and y data
398398
399- ACCEPTS: 2D array
399+ ACCEPTS: 2D array (rows are x, y) or two 1D arrays
400400 """
401401 if len (args )== 1 :
402402 x , y = args [0 ]
@@ -931,8 +931,8 @@ def _draw_dotted(self, renderer, gc, path, trans):
931931
932932
933933 def _draw_point (self , renderer , gc , path , path_trans ):
934- fs = self .get_fillstyle ()
935- if fs != 'full' :
934+ fs = self .get_fillstyle ()
935+ if fs != 'full' :
936936 raise NotImplementedError ('non-full markers have not been implemented for this marker style yet; please contribute' )
937937
938938 w = renderer .points_to_pixels (self ._markersize ) * \
@@ -946,8 +946,8 @@ def _draw_point(self, renderer, gc, path, path_trans):
946946
947947 _draw_pixel_transform = Affine2D ().translate (- 0.5 , - 0.5 )
948948 def _draw_pixel (self , renderer , gc , path , path_trans ):
949- fs = self .get_fillstyle ()
950- if fs != 'full' :
949+ fs = self .get_fillstyle ()
950+ if fs != 'full' :
951951 raise NotImplementedError ('non-full markers have not been implemented for this marker style yet; please contribute' )
952952
953953 rgbFace = self ._get_rgb_face ()
@@ -958,8 +958,8 @@ def _draw_pixel(self, renderer, gc, path, path_trans):
958958
959959
960960 def _draw_circle (self , renderer , gc , path , path_trans ):
961- fs = self .get_fillstyle ()
962- if fs != 'full' :
961+ fs = self .get_fillstyle ()
962+ if fs != 'full' :
963963 raise NotImplementedError ('non-full markers have not been implemented for this marker style yet; please contribute' )
964964
965965 w = renderer .points_to_pixels (self ._markersize ) * 0.5
@@ -974,8 +974,8 @@ def _draw_circle(self, renderer, gc, path, path_trans):
974974 _triangle_path = Path ([[0.0 , 1.0 ], [- 1.0 , - 1.0 ], [1.0 , - 1.0 ], [0.0 , 1.0 ]])
975975 def _draw_triangle_up (self , renderer , gc , path , path_trans ):
976976
977- fs = self .get_fillstyle ()
978- if fs != 'full' :
977+ fs = self .get_fillstyle ()
978+ if fs != 'full' :
979979 raise NotImplementedError ('non-full markers have not been implemented for this marker style yet; please contribute' )
980980
981981 gc .set_snap (renderer .points_to_pixels (self ._markersize ) >= 5.0 )
@@ -987,8 +987,8 @@ def _draw_triangle_up(self, renderer, gc, path, path_trans):
987987
988988
989989 def _draw_triangle_down (self , renderer , gc , path , path_trans ):
990- fs = self .get_fillstyle ()
991- if fs != 'full' :
990+ fs = self .get_fillstyle ()
991+ if fs != 'full' :
992992 raise NotImplementedError ('non-full markers have not been implemented for this marker style yet; please contribute' )
993993
994994 gc .set_snap (renderer .points_to_pixels (self ._markersize ) >= 5.0 )
@@ -1000,8 +1000,8 @@ def _draw_triangle_down(self, renderer, gc, path, path_trans):
10001000
10011001
10021002 def _draw_triangle_left (self , renderer , gc , path , path_trans ):
1003- fs = self .get_fillstyle ()
1004- if fs != 'full' :
1003+ fs = self .get_fillstyle ()
1004+ if fs != 'full' :
10051005 raise NotImplementedError ('non-full markers have not been implemented for this marker style yet; please contribute' )
10061006
10071007 gc .set_snap (renderer .points_to_pixels (self ._markersize ) >= 5.0 )
@@ -1013,8 +1013,8 @@ def _draw_triangle_left(self, renderer, gc, path, path_trans):
10131013
10141014
10151015 def _draw_triangle_right (self , renderer , gc , path , path_trans ):
1016- fs = self .get_fillstyle ()
1017- if fs != 'full' :
1016+ fs = self .get_fillstyle ()
1017+ if fs != 'full' :
10181018 raise NotImplementedError ('non-full markers have not been implemented for this marker style yet; please contribute' )
10191019
10201020 gc .set_snap (renderer .points_to_pixels (self ._markersize ) >= 5.0 )
@@ -1030,8 +1030,8 @@ def _draw_square(self, renderer, gc, path, path_trans):
10301030 side = renderer .points_to_pixels (self ._markersize )
10311031 transform = Affine2D ().translate (- 0.5 , - 0.5 ).scale (side )
10321032 rgbFace = self ._get_rgb_face ()
1033- fs = self .get_fillstyle ()
1034- if fs == 'full' :
1033+ fs = self .get_fillstyle ()
1034+ if fs == 'full' :
10351035 renderer .draw_markers (gc , Path .unit_rectangle (), transform ,
10361036 path , path_trans , rgbFace )
10371037 else :
@@ -1052,8 +1052,8 @@ def _draw_square(self, renderer, gc, path, path_trans):
10521052 path , path_trans , None )
10531053
10541054 def _draw_diamond (self , renderer , gc , path , path_trans ):
1055- fs = self .get_fillstyle ()
1056- if fs != 'full' :
1055+ fs = self .get_fillstyle ()
1056+ if fs != 'full' :
10571057 raise NotImplementedError ('non-full markers have not been implemented for this marker style yet; please contribute' )
10581058 gc .set_snap (renderer .points_to_pixels (self ._markersize ) >= 5.0 )
10591059 side = renderer .points_to_pixels (self ._markersize )
@@ -1064,8 +1064,8 @@ def _draw_diamond(self, renderer, gc, path, path_trans):
10641064
10651065
10661066 def _draw_thin_diamond (self , renderer , gc , path , path_trans ):
1067- fs = self .get_fillstyle ()
1068- if fs != 'full' :
1067+ fs = self .get_fillstyle ()
1068+ if fs != 'full' :
10691069 raise NotImplementedError ('non-full markers have not been implemented for this marker style yet; please contribute' )
10701070 gc .set_snap (renderer .points_to_pixels (self ._markersize ) >= 3.0 )
10711071 offset = renderer .points_to_pixels (self ._markersize )
@@ -1077,8 +1077,8 @@ def _draw_thin_diamond(self, renderer, gc, path, path_trans):
10771077
10781078
10791079 def _draw_pentagon (self , renderer , gc , path , path_trans ):
1080- fs = self .get_fillstyle ()
1081- if fs != 'full' :
1080+ fs = self .get_fillstyle ()
1081+ if fs != 'full' :
10821082 raise NotImplementedError ('non-full markers have not been implemented for this marker style yet; please contribute' )
10831083 gc .set_snap (renderer .points_to_pixels (self ._markersize ) >= 5.0 )
10841084 offset = 0.5 * renderer .points_to_pixels (self ._markersize )
@@ -1088,8 +1088,8 @@ def _draw_pentagon(self, renderer, gc, path, path_trans):
10881088 path , path_trans , rgbFace )
10891089
10901090 def _draw_star (self , renderer , gc , path , path_trans ):
1091- fs = self .get_fillstyle ()
1092- if fs != 'full' :
1091+ fs = self .get_fillstyle ()
1092+ if fs != 'full' :
10931093 raise NotImplementedError ('non-full markers have not been implemented for this marker style yet; please contribute' )
10941094 gc .set_snap (renderer .points_to_pixels (self ._markersize ) >= 5.0 )
10951095 offset = 0.5 * renderer .points_to_pixels (self ._markersize )
@@ -1101,8 +1101,8 @@ def _draw_star(self, renderer, gc, path, path_trans):
11011101
11021102
11031103 def _draw_hexagon1 (self , renderer , gc , path , path_trans ):
1104- fs = self .get_fillstyle ()
1105- if fs != 'full' :
1104+ fs = self .get_fillstyle ()
1105+ if fs != 'full' :
11061106 raise NotImplementedError ('non-full markers have not been implemented for this marker style yet; please contribute' )
11071107 gc .set_snap (renderer .points_to_pixels (self ._markersize ) >= 5.0 )
11081108 offset = 0.5 * renderer .points_to_pixels (self ._markersize )
@@ -1113,8 +1113,8 @@ def _draw_hexagon1(self, renderer, gc, path, path_trans):
11131113
11141114
11151115 def _draw_hexagon2 (self , renderer , gc , path , path_trans ):
1116- fs = self .get_fillstyle ()
1117- if fs != 'full' :
1116+ fs = self .get_fillstyle ()
1117+ if fs != 'full' :
11181118 raise NotImplementedError ('non-full markers have not been implemented for this marker style yet; please contribute' )
11191119 gc .set_snap (renderer .points_to_pixels (self ._markersize ) >= 5.0 )
11201120 offset = 0.5 * renderer .points_to_pixels (self ._markersize )
0 commit comments