-
Notifications
You must be signed in to change notification settings - Fork 326
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
fix: get correct imageData with targetId in BaseTool #294
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fix: get correct viewport when there are multiple viewport with same stack data
✅ Deploy Preview for cornerstone-3d-docs ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
DMIAOCHEN
changed the title
get correct imageData with targetId in BaseTool
fix: get correct imageData with targetId in BaseTool
Nov 13, 2022
sedghi
approved these changes
Nov 16, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good to me, thanks
sedghi
added a commit
that referenced
this pull request
Dec 7, 2022
* fix: mouse-up should not unhighlight annotations (#305) * fix: annotation highlighted and tooling for ellipticalROI * update build * fix tests * chore(release): publish [skip ci] - [email protected] - @cornerstonejs/[email protected] * fix: stack viewport flip scroll (#304) * fix: use focal point for pan cache for stack viewport * fix: pan dir with flip * fix pan values while flipped * update build * apply review comments * fix build * chore(release): publish [skip ci] - @cornerstonejs/[email protected] - [email protected] - @cornerstonejs/[email protected] - @cornerstonejs/[email protected] * feat: add referenceCursors tool (#275) * added basic cursorCrosshairSync tool with example, TODO: for now cursorSync is displayed regardless of distance, create configurable distance and also sync the position of all viewports over which the mouse is not to scroll to a slice that is close to the currentMousePosition in 3d space * addde stack syncing for StackViewport and syncing for volumeViewport on imageChange events, added configuration for max display distance * refactored tool functions * added comment to possible bug * added configuration options to example * changed look of crosshair to 4 lines with central space * undid local tsconfig change * undid yarn.lock changes * added tool to example-info.json * removed from example-runner because it broke build * readded example and fixed typo * readded example-info and changed example to trigger rebuild * added cleanup for mouseoverElement when tool is disabled * added cleanup when tool gets disabled, this does not get called when toolGroup gets destroyed, might cause remaining listeners * applied naming changes, reworked adding annotation logic * removed event listeners and moved logic to check for stack scrolling into rendering logic * added planeDistanceToPoint to planar utilities * added getClosestStackImageIndexForPoint * rewrote logic to use onCameraModified * updated example-info * fixed bug with 0 being falsey * added logic to remove cursor if wanted * modified toolGroup so that setting a tool active only changes the cursor to default if there is no primary mouse cursor * fixed bug not updating disable cursor * fixed missing parentheses from merge * readded scrollWheel scrolling and api changes * fixed typos * chore(release): publish [skip ci] - @cornerstonejs/[email protected] - [email protected] - @cornerstonejs/[email protected] - @cornerstonejs/[email protected] * fix: ZoomTool fix for polyData actors with no imageData (#308) * chore(release): publish [skip ci] - [email protected] - @cornerstonejs/[email protected] * fix: If planar annotation is not visible, filter it (#318) Co-authored-by: edward65 <[email protected]> * fix: filter planarFreeHandeROI based on parallel normals instead of equal normals. (#315) Co-authored-by: Ramon Emiliani <[email protected]> * fix: get correct imageData with targetId in BaseTool (#294) * limit disabled element not need to render * Update BaseTool.ts fix: get correct viewport when there are multiple viewport with same stack data Co-authored-by: chendingmiao <[email protected]> * chore(release): publish [skip ci] - [email protected] - @cornerstonejs/[email protected] * fix: htj2k and keymodifier (#313) * fix(htj2k):Support htj2k in the streaming volume loader * fix(decodeImage):Fix htj2k image decode and mouse key modifiers * Update for PR * update ci build * chore(release): publish [skip ci] - [email protected] - @cornerstonejs/[email protected] - @cornerstonejs/[email protected] * fix: coronal view should not be flipped (#321) * chore(release): publish [skip ci] - @cornerstonejs/[email protected] - [email protected] - @cornerstonejs/[email protected] - @cornerstonejs/[email protected] * fix: bidirectional tool when short and long axis changes (#309) * fix rotation for handles * fix: short axis movement * fix: bidirectional tool incorrect interaction * chore(release): publish [skip ci] - @cornerstonejs/[email protected] - [email protected] - @cornerstonejs/[email protected] - @cornerstonejs/[email protected] * fix(volumeViewport): Add optional scaling as the volume can be undefined (#323) While trying to get the volume from the cache, it can be undefined so getting the scaling attribute would throw an error in that case. This is a quick fix * chore(release): publish [skip ci] - @cornerstonejs/[email protected] - [email protected] - @cornerstonejs/[email protected] - @cornerstonejs/[email protected] * fix: Use queryselector instead of firstChild to get svg-layer (#268) * chore(release): publish [skip ci] - [email protected] - @cornerstonejs/[email protected] * [wip] initial dicom-loader typescript conversion * [wip] initial typescript conversion * [wip] update types for tests Co-authored-by: Alireza <[email protected]> Co-authored-by: ohif-bot <[email protected]> Co-authored-by: Niclas do <[email protected]> Co-authored-by: Neil <[email protected]> Co-authored-by: Edward Son <[email protected]> Co-authored-by: edward65 <[email protected]> Co-authored-by: ramonemiliani93 <[email protected]> Co-authored-by: Ramon Emiliani <[email protected]> Co-authored-by: 陈定苗 <[email protected]> Co-authored-by: chendingmiao <[email protected]> Co-authored-by: Bill Wallace <[email protected]> Co-authored-by: Gabriel Lebaudy <[email protected]> Co-authored-by: Mustafa ÇİNİ <[email protected]> Co-authored-by: James Manners <[email protected]>
sedghi
pushed a commit
that referenced
this pull request
Jan 6, 2023
* fix: mouse-up should not unhighlight annotations (#305) * fix: annotation highlighted and tooling for ellipticalROI * update build * fix tests * chore(release): publish [skip ci] - [email protected] - @cornerstonejs/[email protected] * fix: stack viewport flip scroll (#304) * fix: use focal point for pan cache for stack viewport * fix: pan dir with flip * fix pan values while flipped * update build * apply review comments * fix build * chore(release): publish [skip ci] - @cornerstonejs/[email protected] - [email protected] - @cornerstonejs/[email protected] - @cornerstonejs/[email protected] * feat: add referenceCursors tool (#275) * added basic cursorCrosshairSync tool with example, TODO: for now cursorSync is displayed regardless of distance, create configurable distance and also sync the position of all viewports over which the mouse is not to scroll to a slice that is close to the currentMousePosition in 3d space * addde stack syncing for StackViewport and syncing for volumeViewport on imageChange events, added configuration for max display distance * refactored tool functions * added comment to possible bug * added configuration options to example * changed look of crosshair to 4 lines with central space * undid local tsconfig change * undid yarn.lock changes * added tool to example-info.json * removed from example-runner because it broke build * readded example and fixed typo * readded example-info and changed example to trigger rebuild * added cleanup for mouseoverElement when tool is disabled * added cleanup when tool gets disabled, this does not get called when toolGroup gets destroyed, might cause remaining listeners * applied naming changes, reworked adding annotation logic * removed event listeners and moved logic to check for stack scrolling into rendering logic * added planeDistanceToPoint to planar utilities * added getClosestStackImageIndexForPoint * rewrote logic to use onCameraModified * updated example-info * fixed bug with 0 being falsey * added logic to remove cursor if wanted * modified toolGroup so that setting a tool active only changes the cursor to default if there is no primary mouse cursor * fixed bug not updating disable cursor * fixed missing parentheses from merge * readded scrollWheel scrolling and api changes * fixed typos * chore(release): publish [skip ci] - @cornerstonejs/[email protected] - [email protected] - @cornerstonejs/[email protected] - @cornerstonejs/[email protected] * fix: ZoomTool fix for polyData actors with no imageData (#308) * chore(release): publish [skip ci] - [email protected] - @cornerstonejs/[email protected] * fix: If planar annotation is not visible, filter it (#318) Co-authored-by: edward65 <[email protected]> * fix: filter planarFreeHandeROI based on parallel normals instead of equal normals. (#315) Co-authored-by: Ramon Emiliani <[email protected]> * fix: get correct imageData with targetId in BaseTool (#294) * limit disabled element not need to render * Update BaseTool.ts fix: get correct viewport when there are multiple viewport with same stack data Co-authored-by: chendingmiao <[email protected]> * chore(release): publish [skip ci] - [email protected] - @cornerstonejs/[email protected] * fix: htj2k and keymodifier (#313) * fix(htj2k):Support htj2k in the streaming volume loader * fix(decodeImage):Fix htj2k image decode and mouse key modifiers * Update for PR * update ci build * chore(release): publish [skip ci] - [email protected] - @cornerstonejs/[email protected] - @cornerstonejs/[email protected] * fix: coronal view should not be flipped (#321) * chore(release): publish [skip ci] - @cornerstonejs/[email protected] - [email protected] - @cornerstonejs/[email protected] - @cornerstonejs/[email protected] * fix: bidirectional tool when short and long axis changes (#309) * fix rotation for handles * fix: short axis movement * fix: bidirectional tool incorrect interaction * chore(release): publish [skip ci] - @cornerstonejs/[email protected] - [email protected] - @cornerstonejs/[email protected] - @cornerstonejs/[email protected] * fix(volumeViewport): Add optional scaling as the volume can be undefined (#323) While trying to get the volume from the cache, it can be undefined so getting the scaling attribute would throw an error in that case. This is a quick fix * chore(release): publish [skip ci] - @cornerstonejs/[email protected] - [email protected] - @cornerstonejs/[email protected] - @cornerstonejs/[email protected] * fix: Use queryselector instead of firstChild to get svg-layer (#268) * chore(release): publish [skip ci] - [email protected] - @cornerstonejs/[email protected] * [wip] initial dicom-loader typescript conversion * [wip] initial typescript conversion * [wip] update types for tests * feat: enable having multiple instances of the same tool and add more seg tools (#327) * feat: add floodFill and advanced brushTool * feat: enable adding tool instances from a parent tool class * fix threshold and brush size * chore(release): publish [skip ci] - [email protected] - @cornerstonejs/[email protected] * feat: Add new 3D volume viewport (#281) * Extract common volume viewport functionality to base class * Add viewport presets * Add utility function for applying preset to volume actor * Add new 3D volume viewport * Add example for VolumeViewport3D * feat: add presets dropdown to demo * update example info json Co-authored-by: Luccas Correa <[email protected]> Co-authored-by: Alireza <[email protected]> * chore(release): publish [skip ci] - @cornerstonejs/[email protected] - [email protected] - @cornerstonejs/[email protected] - @cornerstonejs/[email protected] * fix: Add coplanar check in stackImageSync callback (#335) * Add coplanar check in stackImageSync callback * Refactoring function * chore(release): publish [skip ci] - [email protected] - @cornerstonejs/[email protected] * fix: could not access 'index' before initialization (#337) * Avoid circular dependancy with vite build * Nicer import * chore(release): publish [skip ci] - [email protected] - @cornerstonejs/[email protected] * [dicom-loader] update CornerstoneWadoLoaderOptions to include optional params * [dicom-image-loader] types update * [dicom-image-loader] port wadoImageLoader tests to monorepo * [dicom-image-loader] port changes from cornerstoneWADOImageLoader commit id 9d71753
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
when multiple viewport display same stack data at the same time,
getTargetIdImage
method get viewport by targetId without judging whether the first viewport is what we want. then i foundcalculateCachedStats
inEllipticalROITool
will failed.