Skip to content

Improved pretty #1170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JuliaSprenger merged 2 commits into from
Nov 4, 2022
Merged

Improved pretty #1170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02e9ab8
Improvements to the "pretty" output in IPython
apdavison Sep 23, 2022
4650f48
revert change that shouldn't be part of this pull request
apdavison Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion neo/core/epoch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,14 @@ def __repr__(self):
return '<Epoch: %s>' % ', '.join(objs)

def _repr_pretty_(self, pp, cycle):
super()._repr_pretty_(pp, cycle)
labels = ""
if self._labels is not None:
labels = " with labels"
pp.text(f"{self.__class__.__name__} containing {self.size} epochs{labels}; "
f"time units {self.units.dimensionality.string}; datatype {self.dtype} ")
if self._has_repr_pretty_attrs_():
pp.breakable()
self._repr_pretty_attrs_(pp, cycle)

def rescale(self, units):
'''
Expand Down
9 changes: 8 additions & 1 deletion neo/core/event.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,14 @@ def __repr__(self):
return '<Event: %s>' % ', '.join(objs)

def _repr_pretty_(self, pp, cycle):
super()._repr_pretty_(pp, cycle)
labels = ""
if self._labels is not None:
labels = " with labels"
pp.text(f"{self.__class__.__name__} containing {self.size} events{labels}; "
f"time units {self.units.dimensionality.string}; datatype {self.dtype} ")
if self._has_repr_pretty_attrs_():
pp.breakable()
self._repr_pretty_attrs_(pp, cycle)

def rescale(self, units):
'''
Expand Down
16 changes: 15 additions & 1 deletion neo/core/spiketrain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,21 @@ def __init__(self, times, t_stop, units=None, dtype=None, copy=True,
array_annotations=array_annotations, **annotations)

def _repr_pretty_(self, pp, cycle):
super()._repr_pretty_(pp, cycle)
waveforms = ""
if self.waveforms:
waveforms = "with waveforms"
pp.text(f"{self.__class__.__name__} containing {self.size} spikes{waveforms}; "
f"units {self.units.dimensionality.string}; datatype {self.dtype} ")
if self._has_repr_pretty_attrs_():
pp.breakable()
self._repr_pretty_attrs_(pp, cycle)

def _pp(line):
pp.breakable()
with pp.group(indent=1):
pp.text(line)

_pp(f"time: {self.t_start} to {self.t_stop}")

def rescale(self, units):
'''
Expand Down