Skip to content
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.

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

CoTracker integration prototype for automated label generation #128

Draft
wants to merge 37 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
c20ac6c
Add first plugin draft
C-Achard Apr 26, 2024
49316ee
Update _tracking_worker.py
C-Achard Apr 26, 2024
2d5441b
Add missing manifest
C-Achard Apr 26, 2024
a7b3c24
Add basic worker signals
C-Achard Apr 26, 2024
0be39e1
Merge pull request #1 from arashsm79/cy/tracking-demo-plugin
arashsm79 Apr 26, 2024
83a7bdd
tracking: fix migration errors
arashsm79 Apr 26, 2024
4a3b7a1
Add proper worker start and yield
C-Achard Apr 26, 2024
a06ce57
tracking: fix migration errors
arashsm79 Apr 26, 2024
2af5f43
implemented run_tracking
n-poulsen Apr 26, 2024
2677f7c
Merge pull request #2 from arashsm79/tracking_worker
arashsm79 Apr 26, 2024
2c291cb
Merge branch 'main' into cy/tracking-worker
arashsm79 Apr 26, 2024
27498e5
Try to display colors
C-Achard Apr 26, 2024
45c7472
Update _tracking_worker.py
C-Achard Apr 26, 2024
e11ff4c
Fix color display
C-Achard Apr 26, 2024
1dc9f8c
attempt 1
n-poulsen Apr 26, 2024
925e8c8
closer
n-poulsen Apr 26, 2024
2d653f7
oops
n-poulsen Apr 26, 2024
f903b2e
it works :)
n-poulsen Apr 26, 2024
ec0333e
:)
n-poulsen Apr 27, 2024
350bebe
Update .gitignore
C-Achard Apr 27, 2024
623662a
Redo config setup
C-Achard Apr 27, 2024
171b4a6
minor log changes
n-poulsen Apr 27, 2024
c6d3de6
cleaned tracking, added init_frame option
n-poulsen Apr 27, 2024
cc87fd2
added init frame parameter
n-poulsen Apr 27, 2024
2231eeb
First functional prototype of retracking
C-Achard Apr 27, 2024
104c6ab
Fix saving with frame id
C-Achard Apr 27, 2024
c69b397
Fix error in saving retracking
C-Achard Apr 27, 2024
2fd3f40
Update _tracking_worker.py
C-Achard Apr 27, 2024
b4dcb6b
Remove unnecessary conversion
C-Achard Apr 27, 2024
d8f94be
Update _tracking_worker.py
C-Achard Apr 27, 2024
ff1965d
Fix worker
C-Achard Apr 27, 2024
7858920
tracking
arashsm79 Apr 27, 2024
3e448be
Functional retracking
C-Achard Apr 27, 2024
1d64769
Fix start button after finish
C-Achard Apr 27, 2024
2cfa341
Add retracking when already run
C-Achard Apr 27, 2024
2bacd13
bug fix
n-poulsen Apr 27, 2024
2531501
fix
n-poulsen Apr 27, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,4 @@ venv/
# written by setuptools_scm
**/_version.py

*.txt
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "src/co-tracker"]
path = src/co-tracker
url = https://github.com/facebookresearch/co-tracker
16 changes: 8 additions & 8 deletions .napari/DESCRIPTION.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ the functionality of your plugin. Its content will be rendered on your plugin's
napari hub page.

The sections below are given as a guide for the flow of information only, and
are in no way prescriptive. You should feel free to merge, remove, add and
rename sections at will to make this document work best for your plugin.
are in no way prescriptive. You should feel free to merge, remove, add and
rename sections at will to make this document work best for your plugin.

# Description

This should be a detailed description of the context of your plugin and its
This should be a detailed description of the context of your plugin and its
intended purpose.

If you have videos or screenshots of your plugin in action, you should include them
here as well, to make them front and center for new users.
here as well, to make them front and center for new users.

You should use absolute links to these assets, so that we can easily display them
You should use absolute links to these assets, so that we can easily display them
on the hub. The easiest way to include a video is to use a GIF, for example hosted
on imgur. You can then reference this GIF as an image.

Expand Down Expand Up @@ -59,7 +59,7 @@ anywhere, feel free to also include this information here.
This section should go through step-by-step examples of how your plugin should be used.
Where your plugin provides multiple dock widgets or functions, you should split these
out into separate subsections for easy browsing. Include screenshots and videos
wherever possible to elucidate your descriptions.
wherever possible to elucidate your descriptions.

Ideally, this section should start with minimal examples for those who just want a
quick overview of the plugin's functionality, but you should definitely link out to
Expand All @@ -72,8 +72,8 @@ for the majority of plugins. They will include instructions to pip install, and
to install via napari itself.

Most plugins can be installed out-of-the-box by just specifying the package requirements
over in `setup.cfg`. However, if your plugin has any more complex dependencies, or
requires any additional preparation before (or after) installation, you should add
over in `setup.cfg`. However, if your plugin has any more complex dependencies, or
requires any additional preparation before (or after) installation, you should add
this information here.

# Getting Help
Expand Down
31 changes: 11 additions & 20 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,26 @@ repos:
- id: check-docstring-first
- id: end-of-file-fixer
- id: trailing-whitespace
- id: check-yaml
- id: check-added-large-files
args: [--maxkb=5000]
- id: check-toml
- repo: https://github.com/asottile/setup-cfg-fmt
rev: v1.20.0
hooks:
- id: setup-cfg-fmt
- repo: https://github.com/PyCQA/flake8
rev: 4.0.1
- repo: https://github.com/charliermarsh/ruff-pre-commit
# Ruff version.
rev: 'v0.0.262'
hooks:
- id: flake8
additional_dependencies: [flake8-typing-imports==1.7.0]
- repo: https://github.com/myint/autoflake
rev: v1.4
hooks:
- id: autoflake
args: ["--in-place", "--remove-all-unused-imports"]
- repo: https://github.com/PyCQA/isort
rev: 5.10.1
hooks:
- id: isort
- id: ruff
args: [ --fix, --exit-non-zero-on-fix ]
- repo: https://github.com/psf/black
rev: 22.1.0
rev: 23.3.0
hooks:
- id: black
- repo: https://github.com/asottile/pyupgrade
rev: v2.31.0
hooks:
- id: pyupgrade
args: [--py37-plus, --keep-runtime-typing]
- repo: https://github.com/tlambert03/napari-plugin-checks
rev: v0.2.0
rev: v0.3.0
hooks:
- id: napari-plugin-checks
# https://mypy.readthedocs.io/en/stable/introduction.html
Expand Down
52 changes: 52 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,58 @@
requires = ["setuptools", "wheel", "setuptools_scm"]
build-backend = "setuptools.build_meta"

[tool.ruff]
target-version = "py38"
select = [
"E", "F", "W",
"A",
"B",
"G",
"I",
"PT",
"SIM",
"NPY",
]
# Never enforce `E501` (line length violations) and 'E741' (ambiguous variable names)
# and 'G004' (do not use f-strings in logging)
# and 'A003' (Shadowing python builtins)
# and 'F401' (imported but unused)
ignore = ["E501", "E741", "G004", "A003", "F401"]
exclude = [
".bzr",
".direnv",
".eggs",
".git",
".git-rewrite",
".hg",
".mypy_cache",
".nox",
".pants.d",
".pytype",
".ruff_cache",
".svn",
".tox",
".venv",
"__pypackages__",
"_build",
"buck-out",
"build",
"dist",
"node_modules",
"venv",
"docs/conf.py",
"napari_cellseg3d/_tests/conftest.py",
]

[tool.ruff.pydocstyle]
convention = "google"

[tool.black]
line-length = 79

[tool.isort]
profile = "black"
line_length = 79

[tool.setuptools_scm]
write_to = "src/napari_deeplabcut/_version.py"
Expand Down
Loading
Loading