-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* fix(volumeLoad): should not have missing slices when loading (#3287) * fix(volumeLoad): should not have missing slices when loading * add review comments * feat(DoubleClick): double click a viewport to one up and back (#3285) * feat(DoubleClick): double click a viewport to one up and back Added a toggleOneUp command that puts the active viewport into a 1x1 grid layout and it toggles out of 'one-up' by restoring its saved 'toggleOneUpViewportGridStore' from the StateSyncService. Added double click customization for the Cornerstone extension with the default double click handling being the toggleOneUp command. Added a cypress test for the double click functionality. * PR feedback: - tracked viewport measurements no longer show as dashed when toggling one up - disallowed double clicking near a measurement - updated cornerstone3D dependencies to fix double click of TMTV and volume viewport 3D - created ViewportGridService.getLayoutOptionsFromState * Updated the ViewportGridService docs. * Switched to using 'cornerstoneViewportClickCommands' and consistency with the context menu clicks. * feat(tmtv): add more stages to pt/ct (#3290) * feat(tmtv): add more stages to pt/ct * make error stage change to info * apply review comments * fix(viewports): The display of linked viewports during drag and drop has a race (#3286) * fix: The display of linked viewports during drag and drop has a race * PR review comments * fix: Segmentation display two up * Removing console logs * Fix the blank viewport can have stuff added to it * Fix the null name on HP module * Fix the navigate to initial image * Fix the nth interleave loader * Fix the unit tests * PR comments - docs mostly * fix: Exception thrown on change displayset after double click * feat(multiframe): enhanced support for multiframe dicom (#3164) * Changes in cswil version and multiframe * Minor changes * wip * Adding support for NM multiframe images * Applying PR suggestions * fixing package versions * Restoring default.js config file * Check if NM subtype is reconstructable * Restore default.js values * refactore code * feat: add flag for strict zspacing --------- Co-authored-by: Alireza <[email protected]> * feat(URL): add param for initial series and sop uids to display (#3265) * feat: Allow navigating to a specified series and sop instance This was a feature in OHIF v2, so adding it to v3, albeit with new parameters. feat: Allow comma separated as well as repeated args params * docs * Test fixes * feat: Navigate to SOP selected - PR fixes * Updated docs * PR fixes * fix(crosshairs): suppressed error for crosshair (#3237) * fix(SRTool): Ellipse Display for DICOMSR Tool (#3307) * feat(App): support async config function (#3313) * fix(URL): allow multi filter query (#3314) * fix(viewport): Initial blank image on SR/SEG initial display (#3304) * fix: Blank display area on initial DICOM SR load * Docs * Fix a NPE * fix(ROIThreshold): fix setWeight not updating properly for ROIThreshold panel (#3315) * fix(hp): Add displaySetMatchDetails and displaySets to options in (#3320) The sameAs function requires displaySetMatchDetails and displaySets to compare attributes between display sets, but these properties were not being passed into the options object. This commit adds the necessary lines of code to include displaySetMatchDetails and displaySets in the options object, fixing the issue where the custom attribute function 'sameAs' was missing required data. * feat(measurements): add CircleROI Tool (#3211) * [refactor] measurement service mapping files - rename to .ts files * [fix] RectangleROI - measurement service mapping _getReport() function - tool name fix * [feat] added CircleROI tool from updated cornerstone3D * [refactor] fix for typescript strong typing warnings * [feat] cornerstone-dicom-sr extension - added CircleROI tool * [feat] added toolbar button for CircleROI tool * [doc] doc updates for CircleROI tool * [update] library - dcmjs to 0.29.5 * [fix] roundNumber() function when given strings * [fix] refactor after upgrading conerstonejs library 0.49.0 * yarn.lock file change * fix: Service consistency typing (#3309) * Use more consistent type/structure for services * Fix restoring SR so the tests described work * One more typed service * Added types for the Cornerstone library * Couple more type fixes * feat: Add a new hanging protocol @ohif/mn (#3305) * feat: Add a new hanging protocol @ohif/mn * Add @ohif/seg example * PR comments and a couple more fixes to make things cleaner * PR comment * Added an example to cause the PR checks to rerun
- Loading branch information
Showing
125 changed files
with
2,923 additions
and
1,640 deletions.
There are no files selected for viewing
78 changes: 78 additions & 0 deletions
78
extensions/cornerstone-dicom-seg/src/getHangingProtocolModule.ts
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 |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| import { Types } from '@ohif/core'; | ||
|
|
||
| const segProtocol: Types.HangingProtocol.Protocol = { | ||
| id: '@ohif/seg', | ||
| // Don't store this hanging protocol as it applies to the currently active | ||
| // display set by default | ||
| // cacheId: null, | ||
| hasUpdatedPriorsInformation: false, | ||
| name: 'Segmentations', | ||
| // Just apply this one when specifically listed | ||
| protocolMatchingRules: [], | ||
| toolGroupIds: ['default'], | ||
| // -1 would be used to indicate active only, whereas other values are | ||
| // the number of required priors referenced - so 0 means active with | ||
| // 0 or more priors. | ||
| numberOfPriorsReferenced: 0, | ||
| // Default viewport is used to define the viewport when | ||
| // additional viewports are added using the layout tool | ||
| defaultViewport: { | ||
| viewportOptions: { | ||
| viewportType: 'stack', | ||
| toolGroupId: 'default', | ||
| allowUnmatchedView: true, | ||
| }, | ||
| displaySets: [ | ||
| { | ||
| id: 'segDisplaySetId', | ||
| matchedDisplaySetsIndex: -1, | ||
| }, | ||
| ], | ||
| }, | ||
| displaySetSelectors: { | ||
| segDisplaySetId: { | ||
| seriesMatchingRules: [ | ||
| { | ||
| attribute: 'Modality', | ||
| constraint: { | ||
| equals: 'SEG', | ||
| }, | ||
| }, | ||
| ], | ||
| }, | ||
| }, | ||
| stages: [ | ||
| { | ||
| name: 'Segmentations', | ||
| viewportStructure: { | ||
| layoutType: 'grid', | ||
| properties: { | ||
| rows: 1, | ||
| columns: 1, | ||
| }, | ||
| }, | ||
| viewports: [ | ||
| { | ||
| viewportOptions: { allowUnmatchedView: true }, | ||
| displaySets: [ | ||
| { | ||
| id: 'segDisplaySetId', | ||
| }, | ||
| ], | ||
| }, | ||
| ], | ||
| }, | ||
| ], | ||
| }; | ||
|
|
||
| function getHangingProtocolModule() { | ||
| return [ | ||
| { | ||
| name: segProtocol.id, | ||
| protocol: segProtocol, | ||
| }, | ||
| ]; | ||
| } | ||
|
|
||
| export default getHangingProtocolModule; | ||
| export { segProtocol }; |
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
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
78 changes: 78 additions & 0 deletions
78
extensions/cornerstone-dicom-sr/src/getHangingProtocolModule.ts
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 |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| import { Types } from '@ohif/core'; | ||
|
|
||
| const srProtocol: Types.HangingProtocol.Protocol = { | ||
| id: '@ohif/sr', | ||
| // Don't store this hanging protocol as it applies to the currently active | ||
| // display set by default | ||
| // cacheId: null, | ||
| hasUpdatedPriorsInformation: false, | ||
| name: 'SR Key Images', | ||
| // Just apply this one when specifically listed | ||
| protocolMatchingRules: [], | ||
| toolGroupIds: ['default'], | ||
| // -1 would be used to indicate active only, whereas other values are | ||
| // the number of required priors referenced - so 0 means active with | ||
| // 0 or more priors. | ||
| numberOfPriorsReferenced: 0, | ||
| // Default viewport is used to define the viewport when | ||
| // additional viewports are added using the layout tool | ||
| defaultViewport: { | ||
| viewportOptions: { | ||
| viewportType: 'stack', | ||
| toolGroupId: 'default', | ||
| allowUnmatchedView: true, | ||
| }, | ||
| displaySets: [ | ||
| { | ||
| id: 'srDisplaySetId', | ||
| matchedDisplaySetsIndex: -1, | ||
| }, | ||
| ], | ||
| }, | ||
| displaySetSelectors: { | ||
| srDisplaySetId: { | ||
| seriesMatchingRules: [ | ||
| { | ||
| attribute: 'Modality', | ||
| constraint: { | ||
| equals: 'SR', | ||
| }, | ||
| }, | ||
| ], | ||
| }, | ||
| }, | ||
| stages: [ | ||
| { | ||
| name: 'SR Key Images', | ||
| viewportStructure: { | ||
| layoutType: 'grid', | ||
| properties: { | ||
| rows: 1, | ||
| columns: 1, | ||
| }, | ||
| }, | ||
| viewports: [ | ||
| { | ||
| viewportOptions: { allowUnmatchedView: true }, | ||
| displaySets: [ | ||
| { | ||
| id: 'srDisplaySetId', | ||
| }, | ||
| ], | ||
| }, | ||
| ], | ||
| }, | ||
| ], | ||
| }; | ||
|
|
||
| function getHangingProtocolModule() { | ||
| return [ | ||
| { | ||
| name: srProtocol.id, | ||
| protocol: srProtocol, | ||
| }, | ||
| ]; | ||
| } | ||
|
|
||
| export default getHangingProtocolModule; | ||
| export { srProtocol }; |
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
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
Oops, something went wrong.