-
Notifications
You must be signed in to change notification settings - Fork 67
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
Fetch roi info #724
Merged
Merged
Fetch roi info #724
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
85740ad
feat(regionofinterest): add endpoints to expose info about the ROI se…
bnmajor d74a2ef
feat(imjoypluginapi): add plugin API wrappers for ROI publicAPI endpo…
bnmajor 2231877
refactor(regionofinterest): simplify parameter conditionals
bnmajor 9312463
style(getloadedscale): fix type getloadedScale -> getLoadedScale
bnmajor File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
@@ -1,3 +1,4 @@ | ||||||||||
import { mat4 } from 'gl-matrix' | ||||||||||
import { inspect } from '@xstate/inspect' | ||||||||||
import { interpret } from 'xstate' | ||||||||||
|
||||||||||
|
@@ -13,11 +14,13 @@ import hex2rgb from './UserInterface/hex2rgb' | |||||||||
import ViewerStore from './ViewerStore' | ||||||||||
|
||||||||||
import toMultiscaleSpatialImage from './IO/toMultiscaleSpatialImage' | ||||||||||
import { worldBoundsToIndexBounds } from './IO/MultiscaleSpatialImage' | ||||||||||
import viewerMachineOptions from './viewerMachineOptions' | ||||||||||
import createViewerMachine from './createViewerMachine' | ||||||||||
import ViewerMachineContext from './Context/ViewerMachineContext' | ||||||||||
import { | ||||||||||
addCroppingPlanes, | ||||||||||
getCropWidgetBounds, | ||||||||||
updateCroppingParameters, | ||||||||||
} from './Rendering/VTKJS/Main/croppingPlanes' | ||||||||||
|
||||||||||
|
@@ -1254,6 +1257,37 @@ const createViewer = async ( | |||||||||
return context.maxConcurrency | ||||||||||
} | ||||||||||
|
||||||||||
publicAPI.getloadedScale = name => { | ||||||||||
if (typeof name === 'undefined') { | ||||||||||
name = context.images.selectedName | ||||||||||
} | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice 👍 |
||||||||||
const actorContext = context.images.actorContext.get(name) | ||||||||||
return actorContext.loadedScale | ||||||||||
} | ||||||||||
|
||||||||||
publicAPI.getCroppedImageWorldBounds = () => { | ||||||||||
return getCropWidgetBounds(context) | ||||||||||
} | ||||||||||
|
||||||||||
publicAPI.getCroppedIndexBounds = async (scale, name) => { | ||||||||||
if (typeof name === 'undefined') { | ||||||||||
name = context.images.selectedName | ||||||||||
} | ||||||||||
const actorContext = context.images.actorContext.get(name) | ||||||||||
if (typeof scale === 'undefined' || scale < 0) { | ||||||||||
scale = actorContext.loadedScale | ||||||||||
} | ||||||||||
const image = actorContext.image | ||||||||||
const bounds = getCropWidgetBounds(context) | ||||||||||
const indexToWorld = await image.scaleIndexToWorld(scale) | ||||||||||
const fullIndexBounds = image.getIndexBounds(scale) | ||||||||||
return worldBoundsToIndexBounds({ | ||||||||||
bounds, | ||||||||||
fullIndexBounds, | ||||||||||
worldToIndex: mat4.invert([], indexToWorld), | ||||||||||
}) | ||||||||||
} | ||||||||||
|
||||||||||
addKeyboardShortcuts(context.uiContainer, service) | ||||||||||
|
||||||||||
// must come before moving/main image | ||||||||||
|
Oops, something went wrong.
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.
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.
getLoadedScale
,l
->L
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.
and calls
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.
Oh my 🙃 Fixed!