Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
  • maxence.ferrari/ipi_annot
1 result
Select Git revision
Loading items
Show changes
Commits on Source (2)
...@@ -141,7 +141,7 @@ class MyMultiCursor(AxesWidget): ...@@ -141,7 +141,7 @@ class MyMultiCursor(AxesWidget):
lineprops['animated'] = True lineprops['animated'] = True
self.linev = [] self.linev = []
for i in range(self.n_axes): for i in range(self.n_axes):
self.linev.append(axes[i].axvline(axes[i].get_xbound()[0], visible=False, **lineprops)) self.linev.append(axes[i].axes.axvline(axes[i].axes.get_xbound()[0], visible=False, **lineprops))
self.background = self.n_axes*[None] self.background = self.n_axes*[None]
self.needclear = False self.needclear = False
...@@ -152,7 +152,7 @@ class MyMultiCursor(AxesWidget): ...@@ -152,7 +152,7 @@ class MyMultiCursor(AxesWidget):
return return
for i in range(self.n_axes): for i in range(self.n_axes):
if self.useblit: if self.useblit:
self.background[i] = self.canvas.copy_from_bbox(self.axes[i].bbox) self.background[i] = self.canvas.copy_from_bbox(self.axes[i].axes.bbox)
self.linev[i].set_visible(False) self.linev[i].set_visible(False)
def onmove(self, event): def onmove(self, event):
...@@ -171,7 +171,9 @@ class MyMultiCursor(AxesWidget): ...@@ -171,7 +171,9 @@ class MyMultiCursor(AxesWidget):
self.needclear = True self.needclear = True
if not self.visible: if not self.visible:
return return
ax_idx = self.axes.index(event.inaxes) for ax_idx, ax in enumerate(self.axes):
if ax.axes == event.inaxes:
break
if ax_idx < 2: if ax_idx < 2:
if ax_idx == 1: if ax_idx == 1:
pos = event.xdata*1e3 pos = event.xdata*1e3
...@@ -225,8 +227,8 @@ class MyMultiCursor(AxesWidget): ...@@ -225,8 +227,8 @@ class MyMultiCursor(AxesWidget):
for i in range(self.n_axes): for i in range(self.n_axes):
if self.background[i] is not None: if self.background[i] is not None:
self.canvas.restore_region(self.background[i]) self.canvas.restore_region(self.background[i])
self.axes[i].draw_artist(self.linev[i]) self.axes[i].axes.draw_artist(self.linev[i])
self.canvas.blit(self.axes[i].bbox) self.canvas.blit(self.axes[i].axes.bbox)
else: else:
self.canvas.draw_idle() self.canvas.draw_idle()
return False return False
...@@ -574,6 +576,10 @@ class AxesWithCursor: ...@@ -574,6 +576,10 @@ class AxesWithCursor:
for cursor in self.cursors: for cursor in self.cursors:
cursor.set_visible(state) cursor.set_visible(state)
@property
def figure(self):
return self.axes.figure
class AxesGroup: class AxesGroup:
__slots__ = ['signal', 'spectrogram', 'correlation', 'cepstrum'] __slots__ = ['signal', 'spectrogram', 'correlation', 'cepstrum']
...@@ -592,7 +598,7 @@ class AxesGroup: ...@@ -592,7 +598,7 @@ class AxesGroup:
(ax_spec.axvline(0.01, c='k', linestyle='--'), ax_spec.axvline(0.01, c='k'))) (ax_spec.axvline(0.01, c='k', linestyle='--'), ax_spec.axvline(0.01, c='k')))
self.spectrogram.im.set_clim(2000, 2100) self.spectrogram.im.set_clim(2000, 2100)
ax_spec.set_ylim(0, min(20e3, sr/2)) ax_spec.set_ylim(0, min(20e3, sr/2))
ax_spec.set_ytickslabels((ax_spec.get_yticks() / 1e3).astype(int)) ax_spec.set_yticklabels((ax_spec.get_yticks() / 1e3).astype(int))
self.correlation = AxesWithCursor(ax_corr, self.correlation = AxesWithCursor(ax_corr,
ax_corr.plot(np.linspace(0, 10, int(10e-3 * sr), False), ax_corr.plot(np.linspace(0, 10, int(10e-3 * sr), False),
np.zeros(int(10e-3 * sr)))[0], np.zeros(int(10e-3 * sr)))[0],
...@@ -618,6 +624,12 @@ class AxesGroup: ...@@ -618,6 +624,12 @@ class AxesGroup:
def __len__(self): def __len__(self):
return 4 return 4
def __contains__(self, item):
if isinstance(item, AxesWithCursor):
return any(item == ax for ax in self)
else:
return any(item == ax.axes for ax in self)
def set_visible(self, state): def set_visible(self, state):
self.signal.set_visible(state) self.signal.set_visible(state)
self.spectrogram.set_visible(state) self.spectrogram.set_visible(state)
......