Visitar URL original
merge `main` into `pytorch_dlc` by n-poulsen · Pull Request #2731 · DeepLabCut/DeepLabCut · GitHub
Skip to content

merge main into pytorch_dlc #2731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MMathisLab merged 6 commits into from
Sep 2, 2024
Merged

merge main into pytorch_dlc #2731

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6277d77
Add feature to evaluate network for specfic, named snapshots. (#2508)
Tetra-quark Jul 5, 2024
9e9d677
fixed file dialog not showing uppercase file extension video files (#…
park-jsdev Jul 5, 2024
165462f
Swap button added to the track refinement GUI (#2680)
JulianAlvarezdeGiorgi Aug 13, 2024
dd0ef5a
Fixes for testscript_3d.py (#2443)
jesse-gilmer Aug 13, 2024
2fc50b7
Allow processing of videos in MKV containers (#2701)
ximion Aug 26, 2024
094e826
Merge branch 'main' into niels/2024_09_02_main_update
Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed file dialog not showing uppercase file extension video files (#… 
…2645)

* fixed file dialog not showing uppercase file extension video files

* bug fix: no shuffle_change slot in main window

* bug fix

---------

Co-authored-by: Niels Poulsen <niels.poulsen@epfl.ch>
Co-authored-by: Mackenzie Mathis <mathis@rowland.harvard.edu>
  • Loading branch information
@park-jsdev Niels Poulsen @MMathisLab
3 people authored Jul 5, 2024
commit 9e9d677832a148f2dd19b313b9fd976413f4e271
16 changes: 12 additions & 4 deletions deeplabcut/gui/components.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import os

from PySide6 import QtWidgets
from PySide6.QtCore import Qt
from PySide6.QtCore import Qt, Slot
from deeplabcut.gui.dlc_params import DLCParams
from deeplabcut.gui.widgets import ConfigEditor

Expand Down Expand Up @@ -54,7 +54,7 @@ def _create_grid_layout(
alignment=None,
spacing: int = 20,
margins: tuple = None,
) -> QtWidgets.QGridLayout():
) -> QtWidgets.QGridLayout:
layout = QtWidgets.QGridLayout()
layout.setAlignment(Qt.AlignLeft | Qt.AlignTop)
layout.setSpacing(spacing)
Expand Down Expand Up @@ -155,11 +155,19 @@ def _update_video_selection(self, videopaths):

def select_videos(self):
cwd = self.root.project_folder

# Create a filter string with both lowercase and uppercase extensions

video_types = [f"*.{ext.lower()}" for ext in DLCParams.VIDEOTYPES[1:]] + [
f"*.{ext.upper()}" for ext in DLCParams.VIDEOTYPES[1:]
]
video_files = f"Videos ({' '.join(video_types)})"

filenames = QtWidgets.QFileDialog.getOpenFileNames(
self,
"Select video(s) to analyze",
cwd,
f"Videos ({' *.'.join(DLCParams.VIDEOTYPES)[1:]})",
video_files,
)

if filenames[0]:
Expand Down Expand Up @@ -190,7 +198,7 @@ def __init__(self, root, parent):
self.root = root
self.parent = parent

self.setMaximum(100)
self.setMaximum(10_000)
self.setValue(self.root.shuffle_value)
self.valueChanged.connect(self.root.update_shuffle)

Expand Down