jgrewe/fixtracks
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

some cleanup

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fixtracks/centralwidget.py
View File

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

17
fixtracks/taskwidget.py
View File

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