Skip to content

Commit

Permalink
Merge 13544f7 into 0100986
Browse files Browse the repository at this point in the history
  • Loading branch information
@jpgill86
jpgill86 committed Mar 12, 2020
2 parents 0100986 + 13544f7 commit 96b8e79
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 20 deletions.
39 changes: 20 additions & 19 deletions neurotic/gui/config.py
View file
Expand Up @@ -103,15 +103,6 @@ def __init__(self, metadata, blk, lazy = False):
'label_fill_color': '#DDDDDDDD', # transparent light gray
}

self.default_font_size = ephyviewer.QT.QFont().pointSize()
self.ui_scales = {
'tiny': {'app_font_size': self.default_font_size-4, 'channel_label_size': self.default_font_size-4, 'scatter_size': 4},
'small': {'app_font_size': self.default_font_size-2, 'channel_label_size': self.default_font_size-2, 'scatter_size': 6},
'medium': {'app_font_size': self.default_font_size, 'channel_label_size': self.default_font_size, 'scatter_size': 8},
'large': {'app_font_size': self.default_font_size+4, 'channel_label_size': self.default_font_size+4, 'scatter_size': 10},
'huge': {'app_font_size': self.default_font_size+8, 'channel_label_size': self.default_font_size+8, 'scatter_size': 12},
}

# hide and disable viewers for which inputs are missing
if not self.blk.segments[0].analogsignals:
self.viewer_settings['traces']['show'] = False
Expand Down Expand Up @@ -246,7 +237,7 @@ def hide_all(self):
for name in self.viewer_settings:
self.hide(name)

def launch_ephyviewer(self, theme='light', ui_scale='small', support_increased_line_width=False, show_datetime=False, datetime_format='%Y-%m-%d %H:%M:%S'):
def launch_ephyviewer(self, theme='light', ui_scale='medium', support_increased_line_width=False, show_datetime=False, datetime_format='%Y-%m-%d %H:%M:%S'):
"""
Start a Qt app and create an ephyviewer window.
"""
Expand All @@ -256,7 +247,7 @@ def launch_ephyviewer(self, theme='light', ui_scale='small', support_increased_l
win.show()
app.exec_()

def create_ephyviewer_window(self, theme='light', ui_scale='small', support_increased_line_width=False, show_datetime=False, datetime_format='%Y-%m-%d %H:%M:%S'):
def create_ephyviewer_window(self, theme='light', ui_scale='medium', support_increased_line_width=False, show_datetime=False, datetime_format='%Y-%m-%d %H:%M:%S'):
"""
Load data into each ephyviewer viewer and return the main window.
"""
Expand Down Expand Up @@ -304,9 +295,19 @@ def create_ephyviewer_window(self, theme='light', ui_scale='small', support_incr
# delete on close so that memory and file resources are released
win.setAttribute(ephyviewer.QT.WA_DeleteOnClose, True)

# determine ui_scale parameters
default_font_size = ephyviewer.QT.QFont().pointSize()
ui_scales = {
'tiny': {'app_font_size': default_font_size-4, 'channel_label_size': default_font_size-4, 'scatter_size': 4},
'small': {'app_font_size': default_font_size-2, 'channel_label_size': default_font_size-2, 'scatter_size': 6},
'medium': {'app_font_size': default_font_size, 'channel_label_size': default_font_size, 'scatter_size': 8},
'large': {'app_font_size': default_font_size+4, 'channel_label_size': default_font_size+4, 'scatter_size': 10},
'huge': {'app_font_size': default_font_size+8, 'channel_label_size': default_font_size+8, 'scatter_size': 12},
}

# set the font size for most text
font = win.font()
font.setPointSize(self.ui_scales[ui_scale]['app_font_size'])
font.setPointSize(ui_scales[ui_scale]['app_font_size'])
win.setFont(font)

########################################################################
Expand Down Expand Up @@ -426,9 +427,9 @@ def create_ephyviewer_window(self, theme='light', ui_scale='small', support_incr

trace_view.params['xratio'] = self.metadata.get('past_fraction', 0.3)
trace_view.params['auto_scale_factor'] = 0.02
trace_view.params['scatter_size'] = self.ui_scales[ui_scale]['scatter_size']
trace_view.params['scatter_size'] = ui_scales[ui_scale]['scatter_size']
trace_view.params['line_width'] = line_width
trace_view.params['label_size'] = self.ui_scales[ui_scale]['channel_label_size']
trace_view.params['label_size'] = ui_scales[ui_scale]['channel_label_size']
trace_view.params['display_labels'] = True
trace_view.params['antialias'] = True

Expand Down Expand Up @@ -488,7 +489,7 @@ def create_ephyviewer_window(self, theme='light', ui_scale='small', support_incr

trace_rauc_view.params['xratio'] = self.metadata.get('past_fraction', 0.3)
trace_rauc_view.params['line_width'] = line_width
trace_rauc_view.params['label_size'] = self.ui_scales[ui_scale]['channel_label_size']
trace_rauc_view.params['label_size'] = ui_scales[ui_scale]['channel_label_size']
trace_rauc_view.params['display_labels'] = True
trace_rauc_view.params['display_offset'] = True
trace_rauc_view.params['antialias'] = True
Expand Down Expand Up @@ -579,7 +580,7 @@ def create_ephyviewer_window(self, theme='light', ui_scale='small', support_incr
pass

spike_train_view.params['xratio'] = self.metadata.get('past_fraction', 0.3)
spike_train_view.params['label_size'] = self.ui_scales[ui_scale]['channel_label_size']
spike_train_view.params['label_size'] = ui_scales[ui_scale]['channel_label_size']

########################################################################
# TRACES OF FIRING RATES
Expand Down Expand Up @@ -607,7 +608,7 @@ def create_ephyviewer_window(self, theme='light', ui_scale='small', support_incr

trace_rates_view.params['xratio'] = self.metadata.get('past_fraction', 0.3)
trace_rates_view.params['line_width'] = line_width
trace_rates_view.params['label_size'] = self.ui_scales[ui_scale]['channel_label_size']
trace_rates_view.params['label_size'] = ui_scales[ui_scale]['channel_label_size']
trace_rates_view.params['display_labels'] = True
trace_rates_view.params['display_offset'] = True
trace_rates_view.params['antialias'] = True
Expand Down Expand Up @@ -665,7 +666,7 @@ def create_ephyviewer_window(self, theme='light', ui_scale='small', support_incr
pass

epoch_view.params['xratio'] = self.metadata.get('past_fraction', 0.3)
epoch_view.params['label_size'] = self.ui_scales[ui_scale]['channel_label_size']
epoch_view.params['label_size'] = ui_scales[ui_scale]['channel_label_size']

########################################################################
# EPOCH ENCODER
Expand Down Expand Up @@ -707,7 +708,7 @@ def create_ephyviewer_window(self, theme='light', ui_scale='small', support_incr
# TODO add support for combo_cmap

epoch_encoder.params['xratio'] = self.metadata.get('past_fraction', 0.3)
epoch_encoder.params['label_size'] = self.ui_scales[ui_scale]['channel_label_size']
epoch_encoder.params['label_size'] = ui_scales[ui_scale]['channel_label_size']

########################################################################
# VIDEO
Expand Down
2 changes: 1 addition & 1 deletion neurotic/gui/standalone.py
View file
Expand Up @@ -66,7 +66,7 @@ class MainWindow(QT.QMainWindow):
request_download = QT.pyqtSignal()
request_load_dataset = QT.pyqtSignal()

def __init__(self, file=None, initial_selection=None, lazy=True, theme='light', ui_scale='small', support_increased_line_width=False, show_datetime=False):
def __init__(self, file=None, initial_selection=None, lazy=True, theme='light', ui_scale='medium', support_increased_line_width=False, show_datetime=False):
"""
Initialize a new MainWindow.
"""
Expand Down

0 comments on commit 96b8e79

Please sign in to comment.