@@ -1045,86 +1045,88 @@ def draw(self, renderer):
10451045 if not self .get_visible ():
10461046 return
10471047 renderer .open_group ('figure' )
1048+ try :
1049+ if self .get_tight_layout () and self .axes :
1050+ try :
1051+ self .tight_layout (renderer , ** self ._tight_parameters )
1052+ except ValueError :
1053+ pass
1054+ # ValueError can occur when resizing a window.
10481055
1049- if self .get_tight_layout () and self .axes :
1050- try :
1051- self .tight_layout (renderer , ** self ._tight_parameters )
1052- except ValueError :
1053- pass
1054- # ValueError can occur when resizing a window.
1055-
1056- if self .frameon :
1057- self .patch .draw (renderer )
1058-
1059- # a list of (zorder, func_to_call, list_of_args)
1060- dsu = []
1061-
1062- for a in self .patches :
1063- dsu .append ((a .get_zorder (), a , a .draw , [renderer ]))
1064-
1065- for a in self .lines :
1066- dsu .append ((a .get_zorder (), a , a .draw , [renderer ]))
1067-
1068- for a in self .artists :
1069- dsu .append ((a .get_zorder (), a , a .draw , [renderer ]))
1056+ if self .frameon :
1057+ self .patch .draw (renderer )
10701058
1071- # override the renderer default if self.suppressComposite
1072- # is not None
1073- not_composite = renderer .option_image_nocomposite ()
1074- if self .suppressComposite is not None :
1075- not_composite = self .suppressComposite
1059+ # a list of (zorder, func_to_call, list_of_args)
1060+ dsu = []
10761061
1077- if (len (self .images ) <= 1 or not_composite or
1078- not cbook .allequal ([im .origin for im in self .images ])):
1079- for a in self .images :
1062+ for a in self .patches :
10801063 dsu .append ((a .get_zorder (), a , a .draw , [renderer ]))
1081- else :
1082- # make a composite image blending alpha
1083- # list of (_image.Image, ox, oy)
1084- mag = renderer .get_image_magnification ()
1085- ims = [(im .make_image (mag ), im .ox , im .oy , im .get_alpha ())
1086- for im in self .images ]
10871064
1088- im = _image .from_images (int (self .bbox .height * mag ),
1089- int (self .bbox .width * mag ),
1090- ims )
1091-
1092- im .is_grayscale = False
1093- l , b , w , h = self .bbox .bounds
1094-
1095- def draw_composite ():
1096- gc = renderer .new_gc ()
1097- gc .set_clip_rectangle (self .bbox )
1098- gc .set_clip_path (self .get_clip_path ())
1099- renderer .draw_image (gc , l , b , im )
1100- gc .restore ()
1065+ for a in self .lines :
1066+ dsu .append ((a .get_zorder (), a , a .draw , [renderer ]))
11011067
1102- dsu . append (( self . images [ 0 ]. get_zorder (), self .images [ 0 ],
1103- draw_composite , []))
1068+ for a in self .artists :
1069+ dsu . append (( a . get_zorder (), a , a . draw , [renderer ]))
11041070
1105- # render the axes
1106- for a in self .axes :
1107- dsu .append ((a .get_zorder (), a , a .draw , [renderer ]))
1071+ # override the renderer default if self.suppressComposite
1072+ # is not None
1073+ not_composite = renderer .option_image_nocomposite ()
1074+ if self .suppressComposite is not None :
1075+ not_composite = self .suppressComposite
11081076
1109- # render the figure text
1110- for a in self .texts :
1111- dsu .append ((a .get_zorder (), a , a .draw , [renderer ]))
1077+ if (len (self .images ) <= 1 or not_composite or
1078+ not cbook .allequal ([im .origin for im in self .images ])):
1079+ for a in self .images :
1080+ dsu .append ((a .get_zorder (), a , a .draw , [renderer ]))
1081+ else :
1082+ # make a composite image blending alpha
1083+ # list of (_image.Image, ox, oy)
1084+ mag = renderer .get_image_magnification ()
1085+ ims = [(im .make_image (mag ), im .ox , im .oy , im .get_alpha ())
1086+ for im in self .images ]
1087+
1088+ im = _image .from_images (int (self .bbox .height * mag ),
1089+ int (self .bbox .width * mag ),
1090+ ims )
1091+
1092+ im .is_grayscale = False
1093+ l , b , w , h = self .bbox .bounds
1094+
1095+ def draw_composite ():
1096+ gc = renderer .new_gc ()
1097+ gc .set_clip_rectangle (self .bbox )
1098+ gc .set_clip_path (self .get_clip_path ())
1099+ renderer .draw_image (gc , l , b , im )
1100+ gc .restore ()
1101+
1102+ dsu .append ((self .images [0 ].get_zorder (), self .images [0 ],
1103+ draw_composite , []))
1104+
1105+ # render the axes
1106+ for a in self .axes :
1107+ dsu .append ((a .get_zorder (), a , a .draw , [renderer ]))
11121108
1113- for a in self .legends :
1114- dsu .append ((a .get_zorder (), a , a .draw , [renderer ]))
1109+ # render the figure text
1110+ for a in self .texts :
1111+ dsu .append ((a .get_zorder (), a , a .draw , [renderer ]))
11151112
1116- dsu = [row for row in dsu if not row [1 ].get_animated ()]
1117- dsu .sort (key = itemgetter (0 ))
1118- for zorder , a , func , args in dsu :
1119- func (* args )
1120- a .stale = False
1113+ for a in self .legends :
1114+ dsu .append ((a .get_zorder (), a , a .draw , [renderer ]))
11211115
1122- renderer .close_group ('figure' )
1116+ dsu = [row for row in dsu if not row [1 ].get_animated ()]
1117+ dsu .sort (key = itemgetter (0 ))
1118+ for zorder , a , func , args in dsu :
1119+ func (* args )
1120+ a .stale = False
1121+ finally :
1122+ renderer .close_group ('figure' )
1123+ self .stale = False
11231124
11241125 self ._cachedRenderer = renderer
1125- self .stale = False
11261126 self .canvas .draw_event (renderer )
11271127
1128+
1129+
11281130 def draw_artist (self , a ):
11291131 """
11301132 draw :class:`matplotlib.artist.Artist` instance *a* only --
0 commit comments