some cleanup

This commit is contained in:
Jan Grewe 2024-12-22 12:43:44 +01:00
parent 1a22362872
commit 4a5f6eebea
2 changed files with 21 additions and 14 deletions

View File

@ -1,5 +1,5 @@
import logging
from PyQt6.QtWidgets import QWidget, QStackedLayout
from PyQt6.QtWidgets import QWidget, QStackedLayout, QSizePolicy
from PyQt6.QtCore import Qt
from fixtracks.taskwidgets import FixTracks
@ -10,17 +10,19 @@ class CentralWidget(QWidget):
def __init__(self, parent=None):
super().__init__(parent)
layout = QStackedLayout()
layout.setAlignment(Qt.AlignmentFlag.AlignVCenter)
self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
self._tw = TasksWidget()
self._tw.setMaximumHeight(200)
self._tw.clicked.connect(self._select_task)
self._tasksindex = layout.addWidget(self._tw)
self._mergewidget = MergeDetections(self)
self._mergewidget.back.connect(self._on_back)
self._trackwidget = FixTracks(self)
layout = QStackedLayout()
layout.setAlignment(Qt.AlignmentFlag.AlignCenter)
self._tasksindex = layout.addWidget(self._tw)
self._mergeindex = layout.addWidget(self._mergewidget)
self._trackindex = layout.addWidget(self._trackwidget)
self.setLayout(layout)
def _select_task(self, s):
@ -32,8 +34,12 @@ class CentralWidget(QWidget):
self.layout().setCurrentIndex(self._trackindex)
self._trackwidget.fileList = self._tw.fileList
else:
self.layout().setCurrentIndex(self._tasksindex)
logging.warning("Centralwidget: got invalid task request: %s", s)
def _on_back(self):
self.layout().setCurrentIndex(self._tasksindex)
# # @Slot(None)
# def on_exit(self):
# self.exit_signal.emit()

View File

@ -1,7 +1,7 @@
import logging
import pathlib
from PyQt6.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout, QLabel, QPushButton, QFileDialog, QSizePolicy
from PyQt6.QtWidgets import QWidget, QVBoxLayout, QPushButton, QFileDialog, QSizePolicy
from PyQt6.QtCore import pyqtSignal, Qt
@ -10,28 +10,29 @@ class TasksWidget(QWidget):
def __init__(self, parent = None):
super().__init__(parent)
l = QHBoxLayout()
l.setAlignment(Qt.AlignmentFlag.AlignVCenter)
folderBtn = QPushButton("Select data folder")
folderBtn.setEnabled(True)
folderBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
folderBtn.setMaximumSize(200, 100)
folderBtn.clicked.connect(self._open_folder)
l.addWidget(folderBtn)
sublayout = QVBoxLayout()
self.mergeBtn = QPushButton("Merge detections")
self.mergeBtn.setEnabled(False)
self.mergeBtn.setMaximumSize(200, 100)
self.mergeBtn.clicked.connect(self._merge_clicked)
self.mergeBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
self.tracksBtn = QPushButton("Join tracks")
self.tracksBtn.setEnabled(False)
self.tracksBtn.setMaximumSize(200, 100)
self.tracksBtn.clicked.connect(self._tracks_clicked)
self.tracksBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
sublayout.addWidget(self.mergeBtn)
sublayout.addWidget(self.tracksBtn)
l.addLayout(sublayout)
l = QVBoxLayout()
l.setAlignment(Qt.AlignmentFlag.AlignVCenter)
l.addWidget(folderBtn)
l.addWidget(self.mergeBtn)
l.addWidget(self.tracksBtn)
self.setLayout(l)
self._file_list = []