2
0
forked from awendt/pyrelacs

cosmetics

This commit is contained in:
Jan Grewe 2024-09-29 10:30:15 +02:00
parent 58decf0283
commit b2f223168c
3 changed files with 15 additions and 19 deletions

View File

@ -1,14 +1,13 @@
import sys import sys
import importlib.util
import ast import ast
import pathlib import pathlib
from IPython import embed
import nixio as nix import nixio as nix
from pyrelacs.util.logging import config_logging import importlib.util
from pyrelacs.util.logging import config_logging
log = config_logging() log = config_logging()
from IPython import embed
class Repro: class Repro:
def __init__(self) -> None: def __init__(self) -> None:

View File

@ -1,4 +1,3 @@
import os
import pathlib import pathlib
from PyQt6.QtGui import QPixmap from PyQt6.QtGui import QPixmap
@ -7,7 +6,7 @@ from PyQt6.QtCore import Qt
class AboutDialog(QDialog): class AboutDialog(QDialog):
def __init__(self, parent=None) -> None: def __init__(self, parent=None) -> None:
super().__init__(parent=parent) super().__init__(parent=parent)
self.setModal(True) self.setModal(True)
@ -20,11 +19,11 @@ class AboutDialog(QDialog):
class About(QWidget): class About(QWidget):
def __init__(self, parent=None) -> None: def __init__(self, parent=None) -> None:
super().__init__(parent=parent) super().__init__(parent=parent)
self.setLayout(QVBoxLayout()) self.setLayout(QVBoxLayout())
heading = QLabel("pyRelacs") heading = QLabel("pyRelacs")
font = heading.font() font = heading.font()
font.setPointSize(18) font.setPointSize(18)
@ -33,10 +32,10 @@ class About(QWidget):
heading.setAlignment(Qt.AlignmentFlag.AlignCenter) heading.setAlignment(Qt.AlignmentFlag.AlignCenter)
subheading = QLabel("relacsed electrophysiological recordings") subheading = QLabel("relacsed electrophysiological recordings")
subheading.setAlignment(Qt.AlignmentFlag.AlignCenter) subheading.setAlignment(Qt.AlignmentFlag.AlignCenter)
nix_link = QLabel("https://github.com/bendalab") nix_link = QLabel("https://github.com/relacs")
nix_link.setOpenExternalLinks(True) nix_link.setOpenExternalLinks(True)
nix_link.setAlignment(Qt.AlignmentFlag.AlignCenter) nix_link.setAlignment(Qt.AlignmentFlag.AlignCenter)
rtd_link = QLabel("https://nixio.readthedocs.io/en/master/") rtd_link = QLabel("https://relacs.net")
rtd_link.setOpenExternalLinks(True) rtd_link.setOpenExternalLinks(True)
rtd_link.setAlignment(Qt.AlignmentFlag.AlignCenter) rtd_link.setAlignment(Qt.AlignmentFlag.AlignCenter)
@ -50,7 +49,7 @@ class About(QWidget):
iconlabel.setMaximumWidth(300) iconlabel.setMaximumWidth(300)
iconlabel.setAlignment(Qt.AlignmentFlag.AlignCenter) iconlabel.setAlignment(Qt.AlignmentFlag.AlignCenter)
iconlabel.setScaledContents(True) iconlabel.setScaledContents(True)
self.layout().addWidget(heading) self.layout().addWidget(heading)
self.layout().addWidget(subheading) self.layout().addWidget(subheading)
self.layout().addWidget(iconlabel) self.layout().addWidget(iconlabel)

View File

@ -16,7 +16,6 @@ import nixio as nix
import pyqtgraph as pg import pyqtgraph as pg
from pathlib import Path as path from pathlib import Path as path
from importlib.resources import files as rsrc_files
from scipy.signal import welch, find_peaks from scipy.signal import welch, find_peaks
from ..worker import Worker from ..worker import Worker
@ -100,7 +99,7 @@ class PyRelacs(QMainWindow):
file_menu = menu.addMenu("&File") file_menu = menu.addMenu("&File")
file_menu.addAction(self._rlx_exitaction) file_menu.addAction(self._rlx_exitaction)
file_menu.addAction(self._rlx_aboutaction) file_menu.addAction(self._rlx_aboutaction)
device_menu = menu.addMenu("&DAQ") device_menu = menu.addMenu("&DAQ")
device_menu.addAction(self._daq_connectaction) device_menu.addAction(self._daq_connectaction)
device_menu.addAction(self._daq_disconnectaction) device_menu.addAction(self._daq_disconnectaction)
@ -109,7 +108,6 @@ class PyRelacs(QMainWindow):
help_menu = menu.addMenu("&Help") help_menu = menu.addMenu("&Help")
help_menu.addSeparator() help_menu.addSeparator()
# help_menu.addAction(self._about_action)
# help_menu.addAction(self._help_action) # help_menu.addAction(self._help_action)
self.setMenuBar(menu) self.setMenuBar(menu)
@ -117,7 +115,7 @@ class PyRelacs(QMainWindow):
rlx_toolbar = QToolBar("Relacs") rlx_toolbar = QToolBar("Relacs")
rlx_toolbar.addAction(self._rlx_exitaction) rlx_toolbar.addAction(self._rlx_exitaction)
rlx_toolbar.setIconSize(QSize(24, 24)) rlx_toolbar.setIconSize(QSize(24, 24))
self.addToolBar(Qt.ToolBarArea.TopToolBarArea, rlx_toolbar) self.addToolBar(Qt.ToolBarArea.TopToolBarArea, rlx_toolbar)
daq_toolbar = QToolBar("DAQ") daq_toolbar = QToolBar("DAQ")
daq_toolbar.addAction(self._daq_connectaction) daq_toolbar.addAction(self._daq_connectaction)
@ -128,12 +126,12 @@ class PyRelacs(QMainWindow):
repro_toolbar = QToolBar("Repros") repro_toolbar = QToolBar("Repros")
repro_names, file_names = self.repros.names_of_repros() repro_names, file_names = self.repros.names_of_repros()
for rep, fn in zip(repro_names, file_names): for rep, fn in zip(repro_names, file_names):
individual_repro_button = QAction(rep, self) repro_action = QAction(rep, self)
individual_repro_button.setStatusTip(rep) repro_action.setStatusTip(rep)
individual_repro_button.triggered.connect( repro_action.triggered.connect(
lambda checked, n=rep, f=fn: self.run_repro(n, f) lambda checked, n=rep, f=fn: self.run_repro(n, f)
) )
repro_toolbar.addAction(individual_repro_button) repro_toolbar.addAction(repro_action)
self.addToolBar(Qt.ToolBarArea.TopToolBarArea, repro_toolbar) self.addToolBar(Qt.ToolBarArea.TopToolBarArea, repro_toolbar)
def create_buttons(self): def create_buttons(self):