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

Compare commits

base: jgrewe:2c62ee28a9e6910d53e37aeec962fed30f1c1a6d
Branches Tags
jgrewe:main
..
compare: jgrewe:20b2915b6bd2dc26daff4f8002f4472eac5478b8
Branches Tags
jgrewe:main

No commits in common. "2c62ee28a9e6910d53e37aeec962fed30f1c1a6d" and "20b2915b6bd2dc26daff4f8002f4472eac5478b8" have entirely different histories.
2c62ee28a9 ... 20b2915b6b

5 changed files with 19 additions and 45 deletions
Show Stats Expand all files Collapse all files

7
fixtracks/utils/enums.py
View File

@ -1,7 +0,0 @@
from enum import Enum
class DetectionData(Enum):
ID = 0
FRAME = 1
COORDINATES = 2
TRACK_ID = 3

18
fixtracks/utils/styles.py
View File

@ -1,18 +0,0 @@
def pushBtnStyle(color):
style = f"""
QPushButton {{
background-color: {color};
border-style: outset;
border-width: 1px;
border-radius: 5px;
border-color: white;
font: bold 10px;
min-width: 10em;
padding: 3px;
}}
QPushButton:pressed {{
background-color: rgb(220, 220, 220);
border-style: inset;
}}
"""
return style

9
fixtracks/widgets/detectionview.py
View File

@ -1,3 +1,4 @@
import enum
import logging
import numpy as np
@ -7,7 +8,13 @@ from PySide6.QtGui import QPixmap, QBrush, QColor, QImage
from fixtracks.info import PACKAGE_ROOT
from fixtracks.utils.signals import DetectionSignals, DetectionViewSignals, DetectionSceneSignals
from ..utils.enums import DetectionData
class DetectionData(enum.Enum):
ID = 0
FRAME = 1
COORDINATES = 2
TRACK_ID = 3
class Detection(QGraphicsEllipseItem):

28
fixtracks/widgets/selection_control.py
View File

@ -6,7 +6,6 @@ from PySide6.QtGui import QFont
from PySide6.QtWidgets import QWidget, QLabel, QPushButton, QSizePolicy
from PySide6.QtWidgets import QGridLayout, QVBoxLayout
from fixtracks.utils.styles import pushBtnStyle
class SelectionControls(QWidget):
fwd = Signal(float)
@ -24,7 +23,6 @@ class SelectionControls(QWidget):
font = QFont()
font.setBold(True)
font.setPointSize(10)
fullstep = 1.0
halfstep = 0.5
quarterstep = 0.25
@ -34,22 +32,19 @@ class SelectionControls(QWidget):
backBtn.setShortcut(Qt.Key.Key_Left)
backBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
backBtn.setToolTip(f"Go back to previous window ({backBtn.shortcut().toString()})")
backBtn.setStyleSheet(pushBtnStyle("darkgray"))
backBtn.clicked.connect(lambda: self.on_Back(fullstep))
halfstepBackBtn = QPushButton("<<")
halfstepBackBtn.setFont(font)
halfstepBackBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
halfstepBackBtn.setShortcut(Qt.KeyboardModifier.AltModifier | Qt.Key.Key_Left)
halfstepBackBtn.setToolTip(f"Go back by half a window ({halfstepBackBtn.shortcut().toString()})")
halfstepBackBtn.setStyleSheet(pushBtnStyle("darkgray"))
halfstepBackBtn.clicked.connect(lambda: self.on_Back(halfstep))
quarterstepBackBtn = QPushButton("<")
quarterstepBackBtn.setFont(font)
quarterstepBackBtn.setShortcut(Qt.KeyboardModifier.ShiftModifier | Qt.Key.Key_Left)
quarterstepBackBtn.setToolTip(f"Go back by a quarter window ({quarterstepBackBtn.shortcut().toString()})")
quarterstepBackBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
quarterstepBackBtn.setStyleSheet(pushBtnStyle("darkgray"))
quarterstepBackBtn.clicked.connect(lambda: self.on_Back(quarterstep))
quarterstepBackBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
fwdBtn = QPushButton(">>|")
@ -57,26 +52,23 @@ class SelectionControls(QWidget):
fwdBtn.setShortcut(Qt.Key.Key_Right)
fwdBtn.setFont(font)
fwdBtn.setToolTip(f"Proceed to next window ({fwdBtn.shortcut().toString()})")
fwdBtn.setStyleSheet(pushBtnStyle("darkgray"))
fwdBtn.clicked.connect(lambda: self.on_Fwd(fullstep))
halfstepFwdBtn = QPushButton(">>")
halfstepFwdBtn.setFont(font)
halfstepFwdBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
halfstepFwdBtn.setShortcut(Qt.KeyboardModifier.AltModifier | Qt.Key.Key_Right)
halfstepFwdBtn.setToolTip(f"Proceed by half a window ({halfstepFwdBtn.shortcut().toString()})")
halfstepFwdBtn.setStyleSheet(pushBtnStyle("darkgray"))
halfstepFwdBtn.clicked.connect(lambda: self.on_Fwd(halfstep))
quarterstepFwdBtn = QPushButton(">")
quarterstepFwdBtn.setFont(font)
quarterstepFwdBtn.setShortcut(Qt.KeyboardModifier.ShiftModifier | Qt.Key.Key_Right)
quarterstepFwdBtn.setToolTip(f"Proceed by a quarter window ({quarterstepFwdBtn.shortcut().toString()})")
quarterstepFwdBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
quarterstepFwdBtn.setStyleSheet(pushBtnStyle("darkgray"))
quarterstepFwdBtn.clicked.connect(lambda: self.on_Fwd(quarterstep))
quarterstepFwdBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
assignOneBtn = QPushButton("Track One")
assignOneBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
assignOneBtn.setStyleSheet(pushBtnStyle("orange"))
assignOneBtn.setStyleSheet("QPushButton { background-color: orange; }")
assignOneBtn.setShortcut("Ctrl+1")
assignOneBtn.setToolTip(f"Assign current selection to Track One ({assignOneBtn.shortcut().toString()})")
assignOneBtn.setFont(font)
@ -85,7 +77,7 @@ class SelectionControls(QWidget):
assignTwoBtn = QPushButton("Track Two")
assignTwoBtn.setShortcut("Ctrl+2")
assignTwoBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
assignTwoBtn.setStyleSheet(pushBtnStyle("green"))
assignTwoBtn.setStyleSheet("QPushButton { background-color: green; }")
assignTwoBtn.setToolTip(f"Assign current selection to Track Two ({assignTwoBtn.shortcut().toString()})")
assignTwoBtn.setFont(font)
assignTwoBtn.clicked.connect(self.on_TrackTwo)
@ -94,35 +86,35 @@ class SelectionControls(QWidget):
assignOtherBtn.setShortcut("Ctrl+0")
assignOtherBtn.setFont(font)
assignOtherBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
assignOtherBtn.setStyleSheet(pushBtnStyle("gray"))
# assignOtherBtn.setStyleSheet("QPushButton { background-color: gray; }")
assignOtherBtn.setToolTip(f"Assign current selection to Unassigned ({assignOtherBtn.shortcut().toString()})")
assignOtherBtn.clicked.connect(self.on_TrackOther)
acceptBtn = QPushButton("accept")
acceptBtn.setFont(font)
acceptBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
acceptBtn.setStyleSheet(pushBtnStyle("darkgray"))
# acceptBtn.setStyleSheet("QPushButton { background-color: red; }")
acceptBtn.setToolTip(f"Accept assignments of current selection as TRUE")
acceptBtn.clicked.connect(self.on_Accept)
unacceptBtn = QPushButton("un-accept")
unacceptBtn.setFont(font)
unacceptBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
unacceptBtn.setStyleSheet(pushBtnStyle("darkgray"))
# acceptBtn.setStyleSheet("QPushButton { background-color: red; }")
unacceptBtn.setToolTip(f"Revoke current selection TRUE status")
unacceptBtn.clicked.connect(self.on_Unaccept)
deleteBtn = QPushButton("delete")
deleteBtn.setFont(font)
deleteBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
deleteBtn.setStyleSheet(pushBtnStyle("red"))
deleteBtn.setStyleSheet("QPushButton { background-color: red; }")
deleteBtn.setToolTip(f"DANGERZONE! Delete current selection of detections!")
deleteBtn.clicked.connect(self.on_Delete)
revertBtn = QPushButton("revert assignments")
revertBtn.setFont(font)
revertBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
revertBtn.setStyleSheet(pushBtnStyle("red"))
revertBtn.setStyleSheet("QPushButton { background-color: red; }")
revertBtn.setToolTip(f"DANGERZONE! Remove ALL assignments!")
revertBtn.clicked.connect(self.on_RevertAll)
@ -170,7 +162,7 @@ class SelectionControls(QWidget):
grid.setColumnStretch(0, 1)
grid.setColumnStretch(7, 1)
self.setLayout(grid)
self.setMaximumSize(QSize(500, 500))
self.setMaximumSize(QSize(400, 300))
def setWindow(self, start:int=0, end:int=0):
self.startframe.setText(f"{start:.0f}")

2
fixtracks/widgets/skeleton.py
View File

@ -6,7 +6,7 @@ from PySide6.QtWidgets import QGraphicsScene, QGraphicsEllipseItem, QGraphicsRec
from PySide6.QtCore import Qt
from PySide6.QtGui import QBrush, QColor, QPen, QPainter, QFont
from fixtracks.utils.enums import DetectionData
from fixtracks.widgets.detectionview import DetectionData
class Skeleton(QGraphicsRectItem):
skeleton_grid = [(0, 1), (1, 2), (1, 3), (1, 4), (2, 5)]