Skip to content

Commit 10d972e

Browse files
committed
Merge branch 'main' into Xiang
2 parents ef2878c + 25fc3d0 commit 10d972e

File tree

41 files changed

+2486
-227
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2486
-227
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ dist-ssr
1414

1515
# Editor directories and files
1616
.vscode/*
17+
CLAUDE.md
18+
python/.vscode/*
1719
!.vscode/extensions.json
1820
.idea
1921
.DS_Store

README.md

Lines changed: 47 additions & 28 deletions
Large diffs are not rendered by default.

public/docs/videos.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Supplementary Videos:
2+
3+
- [video 1:](https://vimeo.com/1019958933/a61cfa4120) inTRACKtive web-viewer
4+
- [video 2:](https://vimeo.com/1019959289/edfcb4d6a7) Virtual Embryo Zoo website
5+
- [video 3: ](https://vimeo.com/1037262379/86bd332f4e) Color cell labeling in inTRACKtive based on any attribute
6+
- [video 4: ](https://vimeo.com/1067871601/b7272b46e3) Visualizing velocity, density, and structure tensor in inTRACKtive
7+
- [video 5: ](https://vimeo.com/1088515499/483f98cd9d) Using inTRACKtive from the command line, from napari, from a Jupyter notebook, and within a Jupyter notebook

python/.pre-commit-config.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,9 @@ repos:
2626
- id: isort
2727
args: ["--profile", "black", "--filter-files"]
2828

29-
# formatting
30-
- repo: https://github.com/psf/black
31-
rev: 22.3.0
32-
hooks:
33-
- id: black
34-
3529
- repo: https://github.com/astral-sh/ruff-pre-commit
3630
# Ruff version.
37-
rev: v0.5.7
31+
rev: v0.12.5
3832
hooks:
3933
# Run the linter.
4034
- id: ruff
@@ -43,6 +37,7 @@ repos:
4337
# Run the formatter.
4438
- id: ruff-format
4539
types_or: [python, pyi, jupyter]
40+
args: [--line-length=88]
4641

4742
- repo: https://github.com/pre-commit/pre-commit-hooks
4843
rev: v4.4.0 # You can check for the latest version

python/pyproject.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ dependencies = [
2727
"scipy",
2828
"scikit-image",
2929
"pandas",
30-
"zarr<3",
30+
"zarr>=3",
31+
"geff>=1",
3132
"pyarrow",
3233
]
3334

@@ -45,10 +46,13 @@ intracktive = "intracktive:napari.yaml"
4546
[tool.hatch.version]
4647
path = "src/intracktive/__about__.py"
4748

49+
[tool.hatch.metadata]
50+
allow-direct-references = true
51+
4852
[tool.coverage.run]
4953
source_pkgs = ["intracktive"]
5054
branch = true
51-
parallel = true
55+
parallel = false
5256
omit = [
5357
"src/intracktive/__about__.py",
5458
]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.1.0"
1+
__version__ = "0.1.3"

python/src/intracktive/__main__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
from intracktive.main import main
2+
3+
if __name__ == "__main__":
4+
main()
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
{
2+
"geff": {
3+
"axes": [
4+
{
5+
"max": 91.0,
6+
"min": 0.0,
7+
"name": "t",
8+
"offset": null,
9+
"scale": null,
10+
"scaled_unit": null,
11+
"type": "time",
12+
"unit": null
13+
},
14+
{
15+
"max": 680.0,
16+
"min": 4.088235294117647,
17+
"name": "y",
18+
"offset": null,
19+
"scale": null,
20+
"scaled_unit": null,
21+
"type": "space",
22+
"unit": null
23+
},
24+
{
25+
"max": 1079.0,
26+
"min": 14.0,
27+
"name": "x",
28+
"offset": null,
29+
"scale": null,
30+
"scaled_unit": null,
31+
"type": "space",
32+
"unit": null
33+
}
34+
],
35+
"directed": true,
36+
"display_hints": null,
37+
"edge_props_metadata": {},
38+
"ellipsoid": null,
39+
"extra": {},
40+
"geff_version": "1.0.0.1.1.dev3+g1d804267a.d20250925",
41+
"node_props_metadata": {
42+
"t": {
43+
"description": null,
44+
"dtype": "int64",
45+
"identifier": "t",
46+
"name": null,
47+
"unit": null,
48+
"varlength": false
49+
},
50+
"tracklet_id": {
51+
"description": null,
52+
"dtype": "int64",
53+
"identifier": "tracklet_id",
54+
"name": null,
55+
"unit": null,
56+
"varlength": false
57+
},
58+
"x": {
59+
"description": null,
60+
"dtype": "float64",
61+
"identifier": "x",
62+
"name": null,
63+
"unit": null,
64+
"varlength": false
65+
},
66+
"y": {
67+
"description": null,
68+
"dtype": "float64",
69+
"identifier": "y",
70+
"name": null,
71+
"unit": null,
72+
"varlength": false
73+
}
74+
},
75+
"related_objects": null,
76+
"sphere": null,
77+
"track_node_props": null
78+
}
79+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"zarr_format": 2
3+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"zarr_format": 2
3+
}

0 commit comments

Comments
 (0)