@@ -854,7 +854,7 @@ def plot_epochs(epochs, picks=None, scalings=None, n_epochs=20, n_channels=20,
854854 projs = epochs .info ['projs' ]
855855 noise_cov = _check_cov (noise_cov , epochs .info )
856856
857- params = dict (epochs = epochs , info = epochs .info .copy (), t_start = 0. ,
857+ params = dict (epochs = epochs , info = epochs .info .copy (), t_start = 0 ,
858858 bad_color = (0.8 , 0.8 , 0.8 ), histogram = None , decim = decim ,
859859 data_picks = data_picks , noise_cov = noise_cov ,
860860 use_noise_cov = noise_cov is not None ,
@@ -1092,10 +1092,10 @@ def _prepare_mne_browse_epochs(params, projs, n_channels, n_epochs, scalings,
10921092 ax .set_yticks (offsets )
10931093 ax .set_ylim (ylim )
10941094 ticks = epoch_times + 0.5 * n_times
1095- ax . set_xticks ( ticks )
1096- ax2 .set_xticks (ticks [:n_epochs ])
1095+ for ax_ in ( ax , ax2 ):
1096+ ax_ .set_xticks (ticks [:n_epochs ])
10971097 labels = list (range (0 , len (ticks ))) # epoch numbers
1098- ax .set_xticklabels (labels )
1098+ ax .set_xticklabels (labels [: n_epochs ] )
10991099 xlim = epoch_times [- 1 ] + len (orig_epoch_times )
11001100 ax_hscroll .set_xlim (0 , xlim )
11011101 vertline_t = ax_hscroll .text (0 , 1 , '' , color = 'y' , va = 'bottom' , ha = 'right' )
@@ -1252,13 +1252,14 @@ def _plot_traces(params):
12521252
12531253 n_times = len (epochs .times )
12541254 tick_list = list ()
1255- start_idx = int ( params ['t_start' ] / n_times )
1255+ start_idx = params ['t_start' ] // n_times
12561256 end = params ['t_start' ] + params ['duration' ]
1257- end_idx = int ( end / n_times )
1258- xlabels = params ['labels' ][start_idx :]
1259- event_ids = params ['epochs' ].events [: , 2 ]
1260- params ['ax2' ].set_xticklabels (event_ids [ start_idx :] )
1257+ end_idx = end // n_times
1258+ xlabels = params ['labels' ][start_idx :end_idx ]
1259+ event_ids = params ['epochs' ].events [start_idx : end_idx , 2 ]
1260+ params ['ax2' ].set_xticklabels (event_ids )
12611261 ax .set_xticklabels (xlabels )
1262+ del event_ids , xlabels
12621263 ylabels = ax .yaxis .get_ticklabels ()
12631264 # do the plotting
12641265 for line_idx in range (n_channels ):
@@ -1339,7 +1340,7 @@ def _plot_traces(params):
13391340 0 , ylim + 1 , ylim / (4 * max (len (chan_types_split ), 1 )))
13401341 offset_pos = np .arange (2 , (len (chan_types_split ) * 4 ) + 1 , 4 )
13411342 ax .set_yticks (ticks )
1342- labels = ['' ] * 20
1343+ labels = ['' ] * len ( ticks )
13431344 labels = [0 if idx in range (2 , len (labels ), 4 ) else label
13441345 for idx , label in enumerate (labels )]
13451346 for idx_chan , chan_type in enumerate (chan_types_split ):
@@ -1356,6 +1357,7 @@ def _plot_traces(params):
13561357 labels [li ] = round (label , 2 )
13571358 ax .set_yticklabels (labels , fontsize = 12 , color = 'black' )
13581359 else :
1360+ ax .set_yticks (params ['offsets' ][:len (tick_list )])
13591361 ax .set_yticklabels (tick_list , fontsize = 12 )
13601362 _set_ax_label_style (ax , params )
13611363
@@ -1382,7 +1384,7 @@ def _plot_update_epochs_proj(params, bools=None):
13821384 n_epochs = params ['n_epochs' ]
13831385 params ['projector' ], params ['whitened_ch_names' ] = _setup_plot_projector (
13841386 params ['info' ], params ['noise_cov' ], True , params ['use_noise_cov' ])
1385- start = int ( params ['t_start' ] / len (epochs .times ) )
1387+ start = params ['t_start' ] // len (epochs .times )
13861388 end = start + n_epochs
13871389 if epochs .preload :
13881390 data = np .concatenate (epochs .get_data ()[start :end ], axis = 1 )
@@ -1419,6 +1421,7 @@ def _handle_picks(epochs):
14191421def _plot_window (value , params ):
14201422 """Deal with horizontal shift of the viewport."""
14211423 max_times = len (params ['times' ]) - params ['duration' ]
1424+ value = int (round (value ))
14221425 if value > max_times :
14231426 value = len (params ['times' ]) - params ['duration' ]
14241427 if value < 0 :
@@ -1681,7 +1684,8 @@ def _plot_onkey(event, params):
16811684 return
16821685 n_times = len (params ['epochs' ].times )
16831686 ticks = params ['epoch_times' ] + 0.5 * n_times
1684- params ['ax2' ].set_xticks (ticks [:n_epochs ])
1687+ for key in ('ax' , 'ax2' ):
1688+ params [key ].set_xticks (ticks [:n_epochs ])
16851689 params ['n_epochs' ] = n_epochs
16861690 params ['duration' ] -= n_times
16871691 params ['hsel_patch' ].set_width (params ['duration' ])
@@ -1693,7 +1697,8 @@ def _plot_onkey(event, params):
16931697 if n_times * n_epochs > len (params ['times' ]):
16941698 return
16951699 ticks = params ['epoch_times' ] + 0.5 * n_times
1696- params ['ax2' ].set_xticks (ticks [:n_epochs ])
1700+ for key in ('ax' , 'ax2' ):
1701+ params [key ].set_xticks (ticks [:n_epochs ])
16971702 params ['n_epochs' ] = n_epochs
16981703 if len (params ['vert_lines' ]) > 0 :
16991704 ax = params ['ax' ]
@@ -1842,7 +1847,8 @@ def _update_channels_epochs(event, params):
18421847 n_epochs = int (np .around (params ['epoch_slider' ].val ))
18431848 n_times = len (params ['epochs' ].times )
18441849 ticks = params ['epoch_times' ] + 0.5 * n_times
1845- params ['ax2' ].set_xticks (ticks [:n_epochs ])
1850+ for key in ('ax' , 'ax2' ):
1851+ params [key ].set_xticks (ticks [:n_epochs ])
18461852 params ['n_epochs' ] = n_epochs
18471853 params ['duration' ] = n_times * n_epochs
18481854 params ['hsel_patch' ].set_width (params ['duration' ])
@@ -2003,7 +2009,7 @@ def _draw_event_lines(params):
20032009 includes_tzero = False
20042010 epochs = params ['epochs' ]
20052011 n_times = len (epochs .times )
2006- start_idx = int ( params ['t_start' ] / n_times )
2012+ start_idx = params ['t_start' ] // n_times
20072013 color = params ['event_colors' ]
20082014 ax = params ['ax' ]
20092015 for ev_line in params ['ev_lines' ]:
0 commit comments