@@ -546,12 +546,13 @@ def notify_axes_change(fig):
546
546
'this will be called whenever the current axes is changed'
547
547
if self .navigation is not None :
548
548
self .navigation .update ()
549
- elif self .toolbar is not None : self .toolbar .update ()
549
+ elif self .toolbar is not None :
550
+ self .toolbar .update ()
550
551
self .canvas .figure .add_axobserver (notify_axes_change )
551
552
552
553
def _get_toolbar (self , canvas ):
553
- if matplotlib .rcParams ['toolbar' ]== 'toolbar2' :
554
- toolbar = NavigationToolbar2TkAgg ( canvas , self .window )
554
+ if matplotlib .rcParams ['toolbar' ] == 'toolbar2' :
555
+ toolbar = NavigationToolbar2TkAgg (canvas , self .window )
555
556
elif matplotlib .rcParams ['toolbar' ] == 'navigation' :
556
557
self .navigation = NavigationTk (canvas , ToolbarTk )
557
558
toolbar = self .navigation .toolbar
@@ -898,16 +899,21 @@ def draw_rubberband(self, event, caller, x0, y0, x1, y1):
898
899
if not self .canvas .widgetlock .available (caller ):
899
900
return
900
901
height = self .canvas .figure .bbox .height
901
- y0 = height - y0
902
- y1 = height - y1
903
- try : self .lastrect
904
- except AttributeError : pass
905
- else : self .canvas ._tkcanvas .delete (self .lastrect )
902
+ y0 = height - y0
903
+ y1 = height - y1
904
+ try :
905
+ self .lastrect
906
+ except AttributeError :
907
+ pass
908
+ else :
909
+ self .canvas ._tkcanvas .delete (self .lastrect )
906
910
self .lastrect = self .canvas ._tkcanvas .create_rectangle (x0 , y0 , x1 , y1 )
907
911
908
912
def remove_rubberband (self , event , caller ):
909
- try : self .lastrect
910
- except AttributeError : pass
913
+ try :
914
+ self .lastrect
915
+ except AttributeError :
916
+ pass
911
917
else :
912
918
self .canvas ._tkcanvas .delete (self .lastrect )
913
919
del self .lastrect
@@ -917,7 +923,7 @@ class ToolbarTk(ToolbarBase, Tk.Frame):
917
923
def __init__ (self , manager ):
918
924
ToolbarBase .__init__ (self , manager )
919
925
xmin , xmax = self .manager .canvas .figure .bbox .intervalx
920
- height , width = 50 , xmax - xmin
926
+ height , width = 50 , xmax - xmin
921
927
Tk .Frame .__init__ (self , master = self .manager .window ,
922
928
width = int (width ), height = int (height ),
923
929
borderwidth = 2 )
@@ -931,15 +937,14 @@ def _add_toolitem(self, name, tooltip_text, image_file, position,
931
937
if tooltip_text is not None :
932
938
ToolTip .createToolTip (button , tooltip_text )
933
939
self ._toolitems [name ] = button
934
-
940
+
935
941
def _Button (self , text , file , toggle ):
936
- extension = '.ppm'
937
942
if file is not None :
938
- img_file = os .path .join (rcParams ['datapath' ], 'images' , file )
943
+ img_file = os .path .join (rcParams ['datapath' ], 'images' , file )
939
944
im = Tk .PhotoImage (master = self , file = img_file )
940
945
else :
941
946
im = None
942
-
947
+
943
948
if not toggle :
944
949
b = Tk .Button (
945
950
master = self , text = text , padx = 2 , pady = 2 , image = im ,
@@ -951,7 +956,7 @@ def _Button(self, text, file, toggle):
951
956
b ._ntimage = im
952
957
b .pack (side = Tk .LEFT )
953
958
return b
954
-
959
+
955
960
def _button_click (self , name ):
956
961
self .manager .navigation ._toolbar_callback (name )
957
962
@@ -979,6 +984,7 @@ def _remove_toolitem(self, name):
979
984
def set_toolitem_visibility (self , name , visible ):
980
985
pass
981
986
987
+
982
988
class SaveFigureTk (SaveFigureBase ):
983
989
def trigger (self , * args ):
984
990
from six .moves import tkinter_tkfiledialog , tkinter_messagebox
@@ -1023,7 +1029,8 @@ def trigger(self, *args):
1023
1029
rcParams ['savefig.directory' ] = initialdir
1024
1030
else :
1025
1031
# save dir for next time
1026
- rcParams ['savefig.directory' ] = os .path .dirname (six .text_type (fname ))
1032
+ rcParams ['savefig.directory' ] = os .path .dirname (
1033
+ six .text_type (fname ))
1027
1034
try :
1028
1035
# This method will handle the delegation to the correct type
1029
1036
self .figure .canvas .print_figure (fname )
@@ -1034,16 +1041,16 @@ def trigger(self, *args):
1034
1041
class ConfigureSubplotsTk (ConfigureSubplotsBase ):
1035
1042
def __init__ (self , * args , ** kwargs ):
1036
1043
ConfigureSubplotsBase .__init__ (self , * args , ** kwargs )
1037
- toolfig = Figure (figsize = (6 ,3 ))
1044
+ toolfig = Figure (figsize = (6 , 3 ))
1038
1045
self .window = Tk .Tk ()
1039
-
1046
+
1040
1047
canvas = FigureCanvasTkAgg (toolfig , master = self .window )
1041
1048
toolfig .subplots_adjust (top = 0.9 )
1042
- tool = SubplotTool (self .figure , toolfig )
1049
+ _tool = SubplotTool (self .figure , toolfig )
1043
1050
canvas .show ()
1044
1051
canvas .get_tk_widget ().pack (side = Tk .TOP , fill = Tk .BOTH , expand = 1 )
1045
1052
self .window .protocol ("WM_DELETE_WINDOW" , self .destroy )
1046
-
1053
+
1047
1054
def trigger (self , event ):
1048
1055
self .window .lift ()
1049
1056
0 commit comments