From 12287df477bf102d684e3204fb3ff8c3c3be51ae Mon Sep 17 00:00:00 2001 From: Jan Grewe Date: Wed, 22 Jan 2025 18:20:52 +0100 Subject: [PATCH] [detectionpreview] nice and shiny --- .pylintrc | 647 ++++++++++++++++++++++++++++ fixtracks/dialogs/previewdialog.py | 31 +- fixtracks/widgets/detectionmerge.py | 6 +- fixtracks/widgets/mergepreview.py | 129 +++++- 4 files changed, 782 insertions(+), 31 deletions(-) create mode 100644 .pylintrc diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 0000000..911e556 --- /dev/null +++ b/.pylintrc @@ -0,0 +1,647 @@ +[MAIN] + +# Analyse import fallback blocks. This can be used to support both Python 2 and +# 3 compatible code, which means that the block might have code that exists +# only in one or another interpreter, leading to false positives when analysed. +analyse-fallback-blocks=no + +# Clear in-memory caches upon conclusion of linting. Useful if running pylint +# in a server-like mode. +clear-cache-post-run=no + +# Load and enable all available extensions. Use --list-extensions to see a list +# all available extensions. +#enable-all-extensions= + +# In error mode, messages with a category besides ERROR or FATAL are +# suppressed, and no reports are done by default. Error mode is compatible with +# disabling specific errors. +#errors-only= + +# Always return a 0 (non-error) status code, even if lint errors are found. +# This is primarily useful in continuous integration scripts. +#exit-zero= + +# A comma-separated list of package or module names from where C extensions may +# be loaded. Extensions are loading into the active Python interpreter and may +# run arbitrary code. +extension-pkg-allow-list= + +# A comma-separated list of package or module names from where C extensions may +# be loaded. Extensions are loading into the active Python interpreter and may +# run arbitrary code. (This is an alternative name to extension-pkg-allow-list +# for backward compatibility.) +extension-pkg-whitelist= + +# Return non-zero exit code if any of these messages/categories are detected, +# even if score is above --fail-under value. Syntax same as enable. Messages +# specified are enabled, while categories only check already-enabled messages. +fail-on= + +# Specify a score threshold under which the program will exit with error. +fail-under=10 + +# Interpret the stdin as a python script, whose filename needs to be passed as +# the module_or_package argument. +#from-stdin= + +# Files or directories to be skipped. They should be base names, not paths. +ignore=CVS + +# Add files or directories matching the regular expressions patterns to the +# ignore-list. The regex matches against paths and can be in Posix or Windows +# format. Because '\\' represents the directory delimiter on Windows systems, +# it can't be used as an escape character. +ignore-paths= + +# Files or directories matching the regular expression patterns are skipped. +# The regex matches against base names, not paths. The default value ignores +# Emacs file locks +ignore-patterns=^\.# + +# List of module names for which member attributes should not be checked and +# will not be imported (useful for modules/projects where namespaces are +# manipulated during runtime and thus existing member attributes cannot be +# deduced by static analysis). It supports qualified module names, as well as +# Unix pattern matching. +ignored-modules= + +# Python code to execute, usually for sys.path manipulation such as +# pygtk.require(). +#init-hook= + +# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the +# number of processors available to use, and will cap the count on Windows to +# avoid hangs. +jobs=1 + +# Control the amount of potential inferred values when inferring a single +# object. This can help the performance when dealing with large functions or +# complex, nested conditions. +limit-inference-results=100 + +# List of plugins (as comma separated values of python module names) to load, +# usually to register additional checkers. +load-plugins= + +# Pickle collected data for later comparisons. +persistent=yes + +# Resolve imports to .pyi stubs if available. May reduce no-member messages and +# increase not-an-iterable messages. +prefer-stubs=no + +# Minimum Python version to use for version dependent checks. Will default to +# the version used to run pylint. +py-version=3.12 + +# Discover python modules and packages in the file system subtree. +recursive=no + +# Add paths to the list of the source roots. Supports globbing patterns. The +# source root is an absolute path or a path relative to the current working +# directory used to determine a package namespace for modules located under the +# source root. +source-roots= + +# When enabled, pylint would attempt to guess common misconfiguration and emit +# user-friendly hints instead of false-positive error messages. +suggestion-mode=yes + +# Allow loading of arbitrary C extensions. Extensions are imported into the +# active Python interpreter and may run arbitrary code. +unsafe-load-any-extension=no + +# In verbose mode, extra non-checker-related info will be displayed. +#verbose= + + +[BASIC] + +# Naming style matching correct argument names. +argument-naming-style=snake_case + +# Regular expression matching correct argument names. Overrides argument- +# naming-style. If left empty, argument names will be checked with the set +# naming style. +#argument-rgx= + +# Naming style matching correct attribute names. +attr-naming-style=snake_case + +# Regular expression matching correct attribute names. Overrides attr-naming- +# style. If left empty, attribute names will be checked with the set naming +# style. +#attr-rgx= + +# Bad variable names which should always be refused, separated by a comma. +bad-names=foo, + bar, + baz, + toto, + tutu, + tata + +# Bad variable names regexes, separated by a comma. If names match any regex, +# they will always be refused +bad-names-rgxs= + +# Naming style matching correct class attribute names. +class-attribute-naming-style=any + +# Regular expression matching correct class attribute names. Overrides class- +# attribute-naming-style. If left empty, class attribute names will be checked +# with the set naming style. +#class-attribute-rgx= + +# Naming style matching correct class constant names. +class-const-naming-style=UPPER_CASE + +# Regular expression matching correct class constant names. Overrides class- +# const-naming-style. If left empty, class constant names will be checked with +# the set naming style. +#class-const-rgx= + +# Naming style matching correct class names. +class-naming-style=PascalCase + +# Regular expression matching correct class names. Overrides class-naming- +# style. If left empty, class names will be checked with the set naming style. +#class-rgx= + +# Naming style matching correct constant names. +const-naming-style=UPPER_CASE + +# Regular expression matching correct constant names. Overrides const-naming- +# style. If left empty, constant names will be checked with the set naming +# style. +#const-rgx= + +# Minimum line length for functions/classes that require docstrings, shorter +# ones are exempt. +docstring-min-length=-1 + +# Naming style matching correct function names. +function-naming-style=snake_case + +# Regular expression matching correct function names. Overrides function- +# naming-style. If left empty, function names will be checked with the set +# naming style. +#function-rgx= + +# Good variable names which should always be accepted, separated by a comma. +good-names=i, + j, + k, + ex, + Run, + _ + +# Good variable names regexes, separated by a comma. If names match any regex, +# they will always be accepted +good-names-rgxs= + +# Include a hint for the correct naming format with invalid-name. +include-naming-hint=no + +# Naming style matching correct inline iteration names. +inlinevar-naming-style=any + +# Regular expression matching correct inline iteration names. Overrides +# inlinevar-naming-style. If left empty, inline iteration names will be checked +# with the set naming style. +#inlinevar-rgx= + +# Naming style matching correct method names. +method-naming-style=snake_case + +# Regular expression matching correct method names. Overrides method-naming- +# style. If left empty, method names will be checked with the set naming style. +#method-rgx= + +# Naming style matching correct module names. +module-naming-style=snake_case + +# Regular expression matching correct module names. Overrides module-naming- +# style. If left empty, module names will be checked with the set naming style. +#module-rgx= + +# Colon-delimited sets of names that determine each other's naming style when +# the name regexes allow several styles. +name-group= + +# Regular expression which should only match function or class names that do +# not require a docstring. +no-docstring-rgx=^_ + +# List of decorators that produce properties, such as abc.abstractproperty. Add +# to this list to register other decorators that produce valid properties. +# These decorators are taken in consideration only for invalid-name. +property-classes=abc.abstractproperty + +# Regular expression matching correct type alias names. If left empty, type +# alias names will be checked with the set naming style. +#typealias-rgx= + +# Regular expression matching correct type variable names. If left empty, type +# variable names will be checked with the set naming style. +#typevar-rgx= + +# Naming style matching correct variable names. +variable-naming-style=snake_case + +# Regular expression matching correct variable names. Overrides variable- +# naming-style. If left empty, variable names will be checked with the set +# naming style. +#variable-rgx= + + +[CLASSES] + +# Warn about protected attribute access inside special methods +check-protected-access-in-special-methods=no + +# List of method names used to declare (i.e. assign) instance attributes. +defining-attr-methods=__init__, + __new__, + setUp, + asyncSetUp, + __post_init__ + +# List of member names, which should be excluded from the protected access +# warning. +exclude-protected=_asdict,_fields,_replace,_source,_make,os._exit + +# List of valid names for the first argument in a class method. +valid-classmethod-first-arg=cls + +# List of valid names for the first argument in a metaclass class method. +valid-metaclass-classmethod-first-arg=mcs + + +[DESIGN] + +# List of regular expressions of class ancestor names to ignore when counting +# public methods (see R0903) +exclude-too-few-public-methods= + +# List of qualified class names to ignore when counting class parents (see +# R0901) +ignored-parents= + +# Maximum number of arguments for function / method. +max-args=5 + +# Maximum number of attributes for a class (see R0902). +max-attributes=7 + +# Maximum number of boolean expressions in an if statement (see R0916). +max-bool-expr=5 + +# Maximum number of branch for function / method body. +max-branches=12 + +# Maximum number of locals for function / method body. +max-locals=15 + +# Maximum number of parents for a class (see R0901). +max-parents=7 + +# Maximum number of positional arguments for function / method. +max-positional-arguments=5 + +# Maximum number of public methods for a class (see R0904). +max-public-methods=20 + +# Maximum number of return / yield for function / method body. +max-returns=6 + +# Maximum number of statements in function / method body. +max-statements=50 + +# Minimum number of public methods for a class (see R0903). +min-public-methods=2 + + +[EXCEPTIONS] + +# Exceptions that will emit a warning when caught. +overgeneral-exceptions=builtins.BaseException,builtins.Exception + + +[FORMAT] + +# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. +expected-line-ending-format= + +# Regexp for a line that is allowed to be longer than the limit. +ignore-long-lines=^\s*(# )??$ + +# Number of spaces of indent required inside a hanging or continued line. +indent-after-paren=4 + +# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 +# tab). +indent-string=' ' + +# Maximum number of characters on a single line. +max-line-length=120 + +# Maximum number of lines in a module. +max-module-lines=1000 + +# Allow the body of a class to be on the same line as the declaration if body +# contains single statement. +single-line-class-stmt=no + +# Allow the body of an if to be on the same line as the test if there is no +# else. +single-line-if-stmt=no + + +[IMPORTS] + +# List of modules that can be imported at any level, not just the top level +# one. +allow-any-import-level= + +# Allow explicit reexports by alias from a package __init__. +allow-reexport-from-package=no + +# Allow wildcard imports from modules that define __all__. +allow-wildcard-with-all=no + +# Deprecated modules which should not be used, separated by a comma. +deprecated-modules= + +# Output a graph (.gv or any supported image format) of external dependencies +# to the given file (report RP0402 must not be disabled). +ext-import-graph= + +# Output a graph (.gv or any supported image format) of all (i.e. internal and +# external) dependencies to the given file (report RP0402 must not be +# disabled). +import-graph= + +# Output a graph (.gv or any supported image format) of internal dependencies +# to the given file (report RP0402 must not be disabled). +int-import-graph= + +# Force import order to recognize a module as part of the standard +# compatibility libraries. +known-standard-library= + +# Force import order to recognize a module as part of a third party library. +known-third-party=enchant + +# Couples of modules and preferred modules, separated by a comma. +preferred-modules= + + +[LOGGING] + +# The type of string formatting that logging methods do. `old` means using % +# formatting, `new` is for `{}` formatting. +logging-format-style=old + +# Logging modules to check that the string format arguments are in logging +# function parameter format. +logging-modules=logging + + +[MESSAGES CONTROL] + +# Only show warnings with the listed confidence levels. Leave empty to show +# all. Valid levels: HIGH, CONTROL_FLOW, INFERENCE, INFERENCE_FAILURE, +# UNDEFINED. +confidence=HIGH, + CONTROL_FLOW, + INFERENCE, + INFERENCE_FAILURE, + UNDEFINED + +# Disable the message, report, category or checker with the given id(s). You +# can either give multiple identifiers separated by comma (,) or put this +# option multiple times (only on the command line, not in the configuration +# file where it should appear only once). You can also use "--disable=all" to +# disable everything first and then re-enable specific checks. For example, if +# you want to run only the similarities checker, you can use "--disable=all +# --enable=similarities". If you want to run only the classes checker, but have +# no Warning level messages displayed, use "--disable=all --enable=classes +# --disable=W". +disable=raw-checker-failed, + bad-inline-option, + locally-disabled, + file-ignored, + suppressed-message, + useless-suppression, + deprecated-pragma, + use-implicit-booleaness-not-comparison-to-string, + use-implicit-booleaness-not-comparison-to-zero, + use-symbolic-message-instead + +# Enable the message, report, category or checker with the given id(s). You can +# either give multiple identifier separated by comma (,) or put this option +# multiple time (only on the command line, not in the configuration file where +# it should appear only once). See also the "--disable" option for examples. +enable= + + +[METHOD_ARGS] + +# List of qualified names (i.e., library.method) which require a timeout +# parameter e.g. 'requests.api.get,requests.api.post' +timeout-methods=requests.api.delete,requests.api.get,requests.api.head,requests.api.options,requests.api.patch,requests.api.post,requests.api.put,requests.api.request + + +[MISCELLANEOUS] + +# List of note tags to take in consideration, separated by a comma. +notes=FIXME, + XXX, + TODO + +# Regular expression of note tags to take in consideration. +notes-rgx= + + +[REFACTORING] + +# Maximum number of nested blocks for function / method body +max-nested-blocks=5 + +# Complete name of functions that never returns. When checking for +# inconsistent-return-statements if a never returning function is called then +# it will be considered as an explicit return statement and no message will be +# printed. +never-returning-functions=sys.exit,argparse.parse_error + +# Let 'consider-using-join' be raised when the separator to join on would be +# non-empty (resulting in expected fixes of the type: ``"- " + " - +# ".join(items)``) +suggest-join-with-non-empty-separator=yes + + +[REPORTS] + +# Python expression which should return a score less than or equal to 10. You +# have access to the variables 'fatal', 'error', 'warning', 'refactor', +# 'convention', and 'info' which contain the number of messages in each +# category, as well as 'statement' which is the total number of statements +# analyzed. This score is used by the global evaluation report (RP0004). +evaluation=max(0, 0 if fatal else 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)) + +# Template used to display messages. This is a python new-style format string +# used to format the message information. See doc for all details. +msg-template= + +# Set the output format. Available formats are: text, parseable, colorized, +# json2 (improved json format), json (old json format) and msvs (visual +# studio). You can also give a reporter class, e.g. +# mypackage.mymodule.MyReporterClass. +#output-format= + +# Tells whether to display a full report or only the messages. +reports=no + +# Activate the evaluation score. +score=yes + + +[SIMILARITIES] + +# Comments are removed from the similarity computation +ignore-comments=yes + +# Docstrings are removed from the similarity computation +ignore-docstrings=yes + +# Imports are removed from the similarity computation +ignore-imports=yes + +# Signatures are removed from the similarity computation +ignore-signatures=yes + +# Minimum lines number of a similarity. +min-similarity-lines=4 + + +[SPELLING] + +# Limits count of emitted suggestions for spelling mistakes. +max-spelling-suggestions=4 + +# Spelling dictionary name. No available dictionaries : You need to install +# both the python package and the system dependency for enchant to work. +spelling-dict= + +# List of comma separated words that should be considered directives if they +# appear at the beginning of a comment and should not be checked. +spelling-ignore-comment-directives=fmt: on,fmt: off,noqa:,noqa,nosec,isort:skip,mypy: + +# List of comma separated words that should not be checked. +spelling-ignore-words= + +# A path to a file that contains the private dictionary; one word per line. +spelling-private-dict-file= + +# Tells whether to store unknown words to the private dictionary (see the +# --spelling-private-dict-file option) instead of raising a message. +spelling-store-unknown-words=no + + +[STRING] + +# This flag controls whether inconsistent-quotes generates a warning when the +# character used as a quote delimiter is used inconsistently within a module. +check-quote-consistency=no + +# This flag controls whether the implicit-str-concat should generate a warning +# on implicit string concatenation in sequences defined over several lines. +check-str-concat-over-line-jumps=no + + +[TYPECHECK] + +# List of decorators that produce context managers, such as +# contextlib.contextmanager. Add to this list to register other decorators that +# produce valid context managers. +contextmanager-decorators=contextlib.contextmanager + +# List of members which are set dynamically and missed by pylint inference +# system, and so shouldn't trigger E1101 when accessed. Python regular +# expressions are accepted. +generated-members= + +# Tells whether to warn about missing members when the owner of the attribute +# is inferred to be None. +ignore-none=yes + +# This flag controls whether pylint should warn about no-member and similar +# checks whenever an opaque object is returned when inferring. The inference +# can return multiple potential results while evaluating a Python object, but +# some branches might not be evaluated, which results in partial inference. In +# that case, it might be useful to still emit no-member and other checks for +# the rest of the inferred objects. +ignore-on-opaque-inference=yes + +# List of symbolic message names to ignore for Mixin members. +ignored-checks-for-mixins=no-member, + not-async-context-manager, + not-context-manager, + attribute-defined-outside-init + +# List of class names for which member attributes should not be checked (useful +# for classes with dynamically set attributes). This supports the use of +# qualified names. +ignored-classes=optparse.Values,thread._local,_thread._local,argparse.Namespace + +# Show a hint with possible names when a member name was not found. The aspect +# of finding the hint is based on edit distance. +missing-member-hint=yes + +# The minimum edit distance a name should have in order to be considered a +# similar match for a missing member name. +missing-member-hint-distance=1 + +# The total number of similar names that should be taken in consideration when +# showing a hint for a missing member. +missing-member-max-choices=1 + +# Regex pattern to define which classes are considered mixins. +mixin-class-rgx=.*[Mm]ixin + +# List of decorators that change the signature of a decorated function. +signature-mutators= + + +[VARIABLES] + +# List of additional names supposed to be defined in builtins. Remember that +# you should avoid defining new builtins when possible. +additional-builtins= + +# Tells whether unused global variables should be treated as a violation. +allow-global-unused-variables=yes + +# List of names allowed to shadow builtins +allowed-redefined-builtins= + +# List of strings which can identify a callback function by name. A callback +# name must start or end with one of those strings. +callbacks=cb_, + _cb + +# A regular expression matching the name of dummy variables (i.e. expected to +# not be used). +dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_ + +# Argument names that match this expression will be ignored. +ignored-argument-names=_.*|^ignored_|^unused_ + +# Tells whether we should check for unused import in __init__ files. +init-import=no + +# List of qualified module names which can have objects that can redefine +# builtins. +redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io diff --git a/fixtracks/dialogs/previewdialog.py b/fixtracks/dialogs/previewdialog.py index c590d1b..532183f 100644 --- a/fixtracks/dialogs/previewdialog.py +++ b/fixtracks/dialogs/previewdialog.py @@ -1,8 +1,7 @@ import logging -import pickle -import pandas as pd from PySide6.QtWidgets import QDialog, QVBoxLayout, QHBoxLayout, QPushButton, QFileDialog, QProgressBar from PySide6.QtCore import QThreadPool +from PySide6.QtGui import QImage from fixtracks.widgets.mergepreview import MergePreview from fixtracks.utils.reader import PickleLoader @@ -24,16 +23,8 @@ class PreviewDialog(QDialog): self._opendataBtn = QPushButton("open data") self._opendataBtn.clicked.connect(self.on_openData) - self._openleftBtn = QPushButton("open left video") - self._openleftBtn.clicked.connect(self.on_openleftVideo) - - self._openrightBtn = QPushButton("open right video") - self._openrightBtn.clicked.connect(self.on_openrightVideo) - btn_box = QHBoxLayout() btn_box.addWidget(self._opendataBtn) - btn_box.addWidget(self._openleftBtn) - btn_box.addWidget(self._openrightBtn) layout = QVBoxLayout() layout.addLayout(btn_box) @@ -43,9 +34,22 @@ class PreviewDialog(QDialog): self.setLayout(layout) def on_openData(self): - file_dialog = QFileDialog(self, "Select pickled DataFrame", "", "Pandas DataFrame (*.pkl)") infile = None + imgfile = None + + file_dialog = QFileDialog(self, "Select merged image") + file_dialog.setFileMode(QFileDialog.ExistingFile) + file_dialog.setNameFilters([ + "Image Files (*.png *.jpg *.jpeg)", + "All Files (*)" + ]) + if file_dialog.exec(): + imgfile = file_dialog.selectedFiles()[0] + if imgfile is not None: + img = QImage(imgfile) + self.merge_preview.set_image(img) + file_dialog = QFileDialog(self, "Select pickled DataFrame", "", "Pandas DataFrame (*.pkl)") if file_dialog.exec(): infile = file_dialog.selectedFiles()[0] if infile is not None: @@ -62,11 +66,6 @@ class PreviewDialog(QDialog): self.merge_preview.set_dataframe(self._df) self._reader = None - def on_openleftVideo(self): - pass - - def on_openrightVideo(self): - pass def main(): diff --git a/fixtracks/widgets/detectionmerge.py b/fixtracks/widgets/detectionmerge.py index a1179e9..e073809 100644 --- a/fixtracks/widgets/detectionmerge.py +++ b/fixtracks/widgets/detectionmerge.py @@ -323,11 +323,11 @@ class MergeDetections(QWidget): lrect = QRect(0, 0, left_cut, limg.height()) rrect = QRect(right_cut, 0, rimg.width() - right_cut, rimg.height()) - imgsize = QSize(lrect.width() + rrect.width(), rrect.height()) lselection = limg.copy(lrect) - rselection = rimg.copy(rrect)\ - + rselection = rimg.copy(rrect) + imgsize = QSize(lrect.width() + rrect.width(), rrect.height()) img = QImage(imgsize, limg.format()) + painter = QPainter(img) painter.drawImage(QPoint(0,0), lselection) painter.drawImage(QPoint(lrect.width(), 0), rselection) diff --git a/fixtracks/widgets/mergepreview.py b/fixtracks/widgets/mergepreview.py index a1156fb..357b1e2 100644 --- a/fixtracks/widgets/mergepreview.py +++ b/fixtracks/widgets/mergepreview.py @@ -3,6 +3,7 @@ import numpy as np from PySide6.QtWidgets import QWidget, QGridLayout, QVBoxLayout, QHBoxLayout, QLabel, QPushButton, QComboBox, QSizePolicy, QSpinBox, QGraphicsView, QGraphicsScene, QGraphicsLineItem, QSpacerItem, QProgressDialog, QFileDialog, QSlider from PySide6.QtCore import Qt +from PySide6.QtGui import QPixmap, QBrush, QColor from fixtracks.utils.reader import ImageReader @@ -13,20 +14,66 @@ class MergePreview(QWidget): super().__init__(parent) self._dataframe = None self._image = None + self._pixmapitem = None + self._frames = None + self._keypoints = None + self._scene = None + self._view = QGraphicsView() + self._view.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding) + self._brush = QBrush(QColor.fromString("red")) + self._brush2 = QBrush(QColor.fromString("white")) self._startSlider = QSlider(orientation=Qt.Orientation.Horizontal) - self._stopSlider = QSlider(orientation=Qt.Orientation.Horizontal) + self._startSlider.setTickPosition(QSlider.TickPosition.TicksBelow) self._startSlider.setRange(0, 100) + self._startSlider.setTickInterval(self._startSlider.maximum() // 10) + self._startSlider.sliderReleased.connect(self._on_startSliderReleased) + self._startSlider.valueChanged.connect(self._on_sliderChanged) + + self._stopSlider = QSlider(orientation=Qt.Orientation.Horizontal) + self._stopSlider.setTickPosition(QSlider.TickPosition.TicksBelow) self._stopSlider.setRange(0, 100) + self._stopSlider.setTickInterval(self._stopSlider.maximum() // 10) + self._stopSlider.sliderReleased.connect(self._on_stopSliderReleased) + self._stopSlider.valueChanged.connect(self._on_sliderChanged) + + self._keypointCombo = QComboBox() + self._keypointCombo.currentIndexChanged.connect(self._on_keypointSelection) + + self._numpointsSpinner = QSpinBox() + self._numpointsSpinner.setRange(500, 50000) + self._numpointsSpinner.setValue(25000) + self._numpointsSpinner.setSingleStep(500) + self._numpointsSpinner.valueChanged.connect(self.update) + settingsbox = QHBoxLayout() + settingsbox.addWidget(QLabel("Select keypoint")) + settingsbox.addWidget(self._keypointCombo) + settingsbox.addWidget(QLabel("Number of displayed points")) + settingsbox.addWidget(self._numpointsSpinner) + + startsliderbox = QHBoxLayout() + startsliderbox.addWidget(QLabel("Start position")) + startsliderbox.addWidget(self._startSlider) + + stopsliderbox = QHBoxLayout() + stopsliderbox.addWidget(QLabel("Stop position")) + stopsliderbox.addWidget(self._stopSlider) - self._startSlider.valueChanged.connect(self._on_start_slider_changed) - self._stopSlider.valueChanged.connect(self._on_stop_slider_changed) + self._startLabel = QLabel("0") + self._stopLabel = QLabel("100") + messagebox = QHBoxLayout() + messagebox.addWidget(QLabel("Current segment from frame:")) + messagebox.addWidget(self._startLabel) + messagebox.addWidget(QLabel("to")) + messagebox.addWidget(self._stopLabel) + messagebox.addSpacerItem(QSpacerItem(100, 10, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)) layout = QVBoxLayout() - layout.addWidget(QLabel("Start Slider")) - layout.addWidget(self._startSlider) - layout.addWidget(QLabel("Stop Slider")) - layout.addWidget(self._stopSlider) + layout.addWidget(self._view) + layout.addLayout(settingsbox) + layout.addLayout(startsliderbox) + layout.addLayout(stopsliderbox) + layout.addLayout(messagebox) self.setLayout(layout) def resetSlider(self, framecount=100): @@ -34,20 +81,78 @@ class MergePreview(QWidget): self._stopSlider.setRange(0, framecount) self._startSlider.setSliderPosition(0) self._stopSlider.setSliderPosition(framecount) + self._startSlider.setTickInterval(self._startSlider.maximum() // 10) + self._stopSlider.setTickInterval(self._stopSlider.maximum() // 10) + + def resetKeypointcombo(self, numkeypoints): + self._keypointCombo.clear() + self._keypointCombo.addItems([f"keypoint {i}" for i in range(numkeypoints)]) def set_dataframe(self, newdf): self._dataframe = newdf + self._frames = self._dataframe.frame.values + self._keypoints = self._dataframe.keypoints.values self.resetSlider(np.max(self._dataframe.frame)) + self.resetKeypointcombo(len(self._keypoints[0])) + self.update() + + def _on_keypointSelection(self): + self.update() - def _on_start_slider_changed(self, value): + def _on_startSliderReleased(self): + value = self._startSlider.value() if value > self._stopSlider.value(): self._stopSlider.setValue(value) + self.update() - def _on_stop_slider_changed(self, value): + def _on_stopSliderReleased(self): + value = self._stopSlider.value() if value < self._startSlider.value(): self._startSlider.setValue(value) + self.update() + + def _on_sliderChanged(self, value): + self._startLabel.setText(str(self._startSlider.value())) + self._stopLabel.setText(str(self._stopSlider.value())) + + def set_image(self, img): + self._image = img + self.update() + + def _draw_detections(self): + start_frame = self._startSlider.value() + stop_frame = self._stopSlider.value() + selection = self._keypoints[self._frames[(self._frames >= start_frame) & (self._frames < stop_frame)]] + image_rect = self._pixmapitem.boundingRect() + keypoint = self._keypointCombo.currentIndex() + num_points = self._numpointsSpinner.value() + step = 1 if len(selection) < num_points else int(len(selection) // num_points) + for coords in selection[::step]: + x = coords[keypoint, 0] + y = coords[keypoint, 1] + self._scene.addEllipse(image_rect.left() + x, image_rect.top() + y, 10, 10, brush=self._brush) + + def update(self): + if self._image is not None: + self._scene = QGraphicsScene() + self._pixmapitem = self._scene.addPixmap(QPixmap.fromImage(self._image)) + self._view.setScene(self._scene) + self._view.fitInView(self._scene.sceneRect(), aspectRadioMode=Qt.AspectRatioMode.KeepAspectRatio) + self._view.show() + if self._dataframe is not None: + self._scene = QGraphicsScene() + self._pixmapitem = self._scene.addPixmap(QPixmap.fromImage(self._image)) + self._view.setScene(self._scene) + self._view.fitInView(self._scene.sceneRect(), aspectRadioMode=Qt.AspectRatioMode.KeepAspectRatio) + self._view.show() + self._draw_detections() - @staticmethod - def mergeImages(left, right, left_cut, right_cut): + def fit_image_to_view(self): + """Scale the image to fit the QGraphicsView.""" + if self._pixmapitem is not None: + self._view.fitInView(self._pixmapitem, Qt.KeepAspectRatio) - pass \ No newline at end of file + def resizeEvent(self, event): + """Handle window resizing to fit the image.""" + super().resizeEvent(event) + self.fit_image_to_view() \ No newline at end of file