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.

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

Jump to bottom

feature(viewer.js): Polygon/Point/Ellipse/Rectangle 2D and 3D bulk annotations support #116

Merged
merged 61 commits into from
Jul 12, 2024
Merged

feature(viewer.js): Polygon/Point/Ellipse/Rectangle 2D and 3D bulk annotations support #116

merged 61 commits into from
Jul 12, 2024

Conversation

igoroctaviano
Copy link
Collaborator

@igoroctaviano igoroctaviano commented Mar 14, 2024 •
edited
Loading

Related PR: ImagingDataCommons/slim#170

Polygon/Point/Ellipse/Rectangle 2D and 3D bulk annotations support

  • Render full 2D and 3D polygon/ellipse/rectangle at the highest resolution
  • Render clusters at lower resolutions
  • Use yarn.lock

Testing

  • Check out to SLIM's branch feat/polygon-bulk-annotations and link this library to SLIM via yarn link
  • If you are not using SLIM's docker-compose, check out the docker-compose changes from branch feat/polygon-bulk-annotations. There's a change there to increase the Java heap size (1024) to properly handle the large bulk annotation without buffer/memory errors

@igoroctaviano
Bump dcmjs, dicomweb-client and ol versions
35c9818
@igoroctaviano
Export utils
8ca01f2
@igoroctaviano
Only render polygons inside boundaries of viewport
353870f
@igoroctaviano
Reload annotations on viewport changes
4c7b725
@igoroctaviano
Address caching of bulk data annotations
7540990
@igoroctaviano
Rollback annotations optimization
662d19d
@igoroctaviano
Improve for loop
3a0a979
@igoroctaviano
Improve performance
40d374c
@igoroctaviano
Improve performance
33cc431
@igoroctaviano
Add multi layer support (auto replace) and basic color support
d9798a9
@igoroctaviano
Remove test code
743fe90
@igoroctaviano
Use random points instead of centroids for points layer
3a28495
@igoroctaviano
Extract utils and allow selection of polygons
5c01245
@igoroctaviano
Run viewport checks only for polygons
2aa94b7
@igoroctaviano
Process annotations even if measurements request failed
2da7707
@igoroctaviano
Merge branch 'master' of github.com:ImagingDataCommons/dicom-microsco…
37f5505 
…py-viewer into feat/polygon-bulk-annotations
@igoroctaviano
Update workflow to use yarn
00e7708
@igoroctaviano
Bump actions
16d8984
@igoroctaviano
Update cache dependency path
cca01cf
@igoroctaviano
Add lock file
59aaf5b
@igoroctaviano
Remove node 12x
3ea7038
@igoroctaviano
Run linting
79e7215
@igoroctaviano
Use clusters
3ca344d
@igoroctaviano
Extract style functions
ebeba82
@igoroctaviano
Add point support alongisde polygon
7ae7fa0
@igoroctaviano
Add 2d support
c3ebc32
@igoroctaviano
Remove unused cluster func
0c3ecbc
@igoroctaviano
Unify geometry functions
a45a42a
@igoroctaviano
Fix 2d and 3d annotation toggling
5222658
@igoroctaviano
Merge branch 'master' of github.com:ImagingDataCommons/dicom-microsco…
06797fa 
…py-viewer into feat/polygon-bulk-annotations
@igoroctaviano
Update cleanup function
69949d9
@igoroctaviano
Update condition for source clear
a1d1812
@igoroctaviano
Improve error logging
8868466
@igoroctaviano
Fix annotation group algorithm logic check
1a12e14
@igoroctaviano
Add warnings for annotation group sequence index
c79778b
@igoroctaviano
Fix changing color of annotation disposing source issue and top left …
953c396 
…bottom right inverted
@igoroctaviano
Fallback to p10 to retrieve coordinate and graphic index / render clu…
ddb8c23 
…sters with one feature
@igoroctaviano
Change default color and width of polygons
ecc4915
@igoroctaviano
Add support for polyline
224118b
@igoroctaviano
Use right geometry for polyline
8742a28
@igoroctaviano
Calculate affine for right pyramid level
09a40e2
@igoroctaviano
Render clusters if numberOfAnnotations is greater than 1000
5bbf7b3
@igoroctaviano
Refactor styles update for layers
c1f0861
@igoroctaviano
Merge branch 'master' of github.com:ImagingDataCommons/dicom-microsco…
e57625c 
…py-viewer into feat/bulk-annotations
@igoroctaviano
Revert "fix: Setup the dynamic import so it is separate from other pa…
26165d3 
…ckages (#113)"

This reverts commit 2834944.
@igoroctaviano
Merge branch 'master' of github.com:ImagingDataCommons/dicom-microsco…
a3a23dd 
…py-viewer into feat/bulk-annotations
@igoroctaviano
Merge branch 'master' of github.com:ImagingDataCommons/dicom-microsco…
6e977d4 
…py-viewer into feat/bulk-annotations
@igoroctaviano
Refactor cluster styles and fix shadowed clusters issue
b5cfdd7
@igoroctaviano igoroctaviano mentioned this pull request May 10, 2024
Open
@pedrokohler
feat: add reference series sequence tag (#126)
5491860 
* feat: add reference series sequence tag

* fix: change to referencedSeriesInstanceUID
@pedrokohler
feat: add pointer move event (#128)
1b39195
@igoroctaviano igoroctaviano merged commit dea2a23 into master Jul 12, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pedrokohler pedrokohler pedrokohler approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@igoroctaviano @pedrokohler