@cornerstonejs/tools 0.1.4 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/{stateManagement/segmentation/helpers → constants}/COLOR_LUT.d.ts +0 -0
- package/dist/cjs/{stateManagement/segmentation/helpers → constants}/COLOR_LUT.js +0 -0
- package/dist/{esm/stateManagement/segmentation/helpers → cjs/constants}/COLOR_LUT.js.map +1 -1
- package/dist/cjs/constants/index.d.ts +2 -0
- package/dist/cjs/constants/index.js +9 -0
- package/dist/cjs/constants/index.js.map +1 -0
- package/dist/cjs/enums/Events.d.ts +3 -2
- package/dist/cjs/enums/Events.js +3 -2
- package/dist/cjs/enums/Events.js.map +1 -1
- package/dist/cjs/eventListeners/index.d.ts +2 -2
- package/dist/cjs/eventListeners/index.js +4 -2
- package/dist/cjs/eventListeners/index.js.map +1 -1
- package/dist/cjs/eventListeners/segmentation/index.d.ts +4 -2
- package/dist/cjs/eventListeners/segmentation/index.js +7 -3
- package/dist/cjs/eventListeners/segmentation/index.js.map +1 -1
- package/dist/cjs/eventListeners/segmentation/segmentationDataModifiedEventListener.js +7 -12
- package/dist/cjs/eventListeners/segmentation/segmentationDataModifiedEventListener.js.map +1 -1
- package/dist/cjs/eventListeners/segmentation/segmentationModifiedEventListener.d.ts +3 -0
- package/dist/cjs/eventListeners/segmentation/segmentationModifiedEventListener.js +18 -0
- package/dist/cjs/eventListeners/segmentation/segmentationModifiedEventListener.js.map +1 -0
- package/dist/cjs/eventListeners/segmentation/segmentationRepresentationModifiedEventListener.d.ts +3 -0
- package/dist/cjs/eventListeners/segmentation/{segmentationStateModifiedEventListener.js → segmentationRepresentationModifiedEventListener.js} +3 -3
- package/dist/cjs/eventListeners/segmentation/segmentationRepresentationModifiedEventListener.js.map +1 -0
- package/dist/cjs/eventListeners/segmentation/segmentationRepresentationRemovedEventListener.d.ts +3 -0
- package/dist/cjs/eventListeners/segmentation/segmentationRepresentationRemovedEventListener.js +12 -0
- package/dist/cjs/eventListeners/segmentation/segmentationRepresentationRemovedEventListener.js.map +1 -0
- package/dist/cjs/index.d.ts +2 -1
- package/dist/cjs/index.js +3 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/init.js +14 -18
- package/dist/cjs/init.js.map +1 -1
- package/dist/cjs/stateManagement/index.d.ts +2 -2
- package/dist/cjs/stateManagement/index.js +2 -2
- package/dist/cjs/stateManagement/index.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/SegmentationStateManager.d.ts +15 -18
- package/dist/cjs/stateManagement/segmentation/SegmentationStateManager.js +87 -120
- package/dist/cjs/stateManagement/segmentation/SegmentationStateManager.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/activeSegmentation.d.ts +4 -7
- package/dist/cjs/stateManagement/segmentation/activeSegmentation.js +15 -15
- package/dist/cjs/stateManagement/segmentation/activeSegmentation.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/addSegmentationRepresentations.d.ts +3 -0
- package/dist/cjs/stateManagement/segmentation/addSegmentationRepresentations.js +41 -0
- package/dist/cjs/stateManagement/segmentation/addSegmentationRepresentations.js.map +1 -0
- package/dist/cjs/stateManagement/segmentation/addSegmentations.d.ts +3 -0
- package/dist/cjs/stateManagement/segmentation/addSegmentations.js +17 -0
- package/dist/cjs/stateManagement/segmentation/addSegmentations.js.map +1 -0
- package/dist/cjs/stateManagement/segmentation/createNewSegmentationForToolGroup.js +5 -5
- package/dist/cjs/stateManagement/segmentation/createNewSegmentationForToolGroup.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/helpers/index.d.ts +2 -4
- package/dist/cjs/stateManagement/segmentation/helpers/index.js +3 -7
- package/dist/cjs/stateManagement/segmentation/helpers/index.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/helpers/normalizeSegmentationInput.d.ts +3 -0
- package/dist/cjs/stateManagement/segmentation/helpers/normalizeSegmentationInput.js +18 -0
- package/dist/cjs/stateManagement/segmentation/helpers/normalizeSegmentationInput.js.map +1 -0
- package/dist/cjs/stateManagement/segmentation/helpers/validateSegmentationInput.d.ts +3 -0
- package/dist/cjs/stateManagement/segmentation/helpers/validateSegmentationInput.js +45 -0
- package/dist/cjs/stateManagement/segmentation/helpers/validateSegmentationInput.js.map +1 -0
- package/dist/cjs/stateManagement/segmentation/index.d.ts +3 -2
- package/dist/cjs/stateManagement/segmentation/index.js +5 -3
- package/dist/cjs/stateManagement/segmentation/index.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/removeSegmentationsFromToolGroup.d.ts +1 -1
- package/dist/cjs/stateManagement/segmentation/removeSegmentationsFromToolGroup.js +21 -16
- package/dist/cjs/stateManagement/segmentation/removeSegmentationsFromToolGroup.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/segmentIndex.d.ts +2 -2
- package/dist/cjs/stateManagement/segmentation/segmentIndex.js +22 -22
- package/dist/cjs/stateManagement/segmentation/segmentIndex.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/segmentLocking.d.ts +3 -3
- package/dist/cjs/stateManagement/segmentation/segmentLocking.js +26 -26
- package/dist/cjs/stateManagement/segmentation/segmentLocking.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/segmentationColor.d.ts +3 -3
- package/dist/cjs/stateManagement/segmentation/segmentationColor.js +5 -5
- package/dist/cjs/stateManagement/segmentation/segmentationColor.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/segmentationConfig.d.ts +8 -12
- package/dist/cjs/stateManagement/segmentation/segmentationConfig.js +16 -42
- package/dist/cjs/stateManagement/segmentation/segmentationConfig.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/segmentationState.d.ts +16 -19
- package/dist/cjs/stateManagement/segmentation/segmentationState.js +80 -97
- package/dist/cjs/stateManagement/segmentation/segmentationState.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/segmentationVisibility.d.ts +2 -2
- package/dist/cjs/stateManagement/segmentation/segmentationVisibility.js +12 -10
- package/dist/cjs/stateManagement/segmentation/segmentationVisibility.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/triggerSegmentationEvents.d.ts +5 -4
- package/dist/cjs/stateManagement/segmentation/triggerSegmentationEvents.js +36 -21
- package/dist/cjs/stateManagement/segmentation/triggerSegmentationEvents.js.map +1 -1
- package/dist/cjs/store/ToolGroupManager/destroy.js +2 -2
- package/dist/cjs/store/ToolGroupManager/destroy.js.map +1 -1
- package/dist/cjs/store/ToolGroupManager/destroyToolGroupById.d.ts +2 -0
- package/dist/cjs/store/ToolGroupManager/{destroyToolGroupByToolGroupId.js → destroyToolGroupById.js} +3 -3
- package/dist/cjs/store/ToolGroupManager/destroyToolGroupById.js.map +1 -0
- package/dist/cjs/store/ToolGroupManager/getToolGroupById.d.ts +3 -0
- package/dist/cjs/store/ToolGroupManager/{getToolGroupByToolGroupId.js → getToolGroupById.js} +3 -3
- package/dist/cjs/store/ToolGroupManager/getToolGroupById.js.map +1 -0
- package/dist/cjs/store/ToolGroupManager/index.d.ts +3 -3
- package/dist/cjs/store/ToolGroupManager/index.js +5 -5
- package/dist/cjs/store/ToolGroupManager/index.js.map +1 -1
- package/dist/cjs/tools/displayTools/Labelmap/addLabelmapToElement.d.ts +2 -0
- package/dist/cjs/tools/displayTools/Labelmap/addLabelmapToElement.js +29 -0
- package/dist/cjs/tools/displayTools/Labelmap/addLabelmapToElement.js.map +1 -0
- package/dist/cjs/tools/displayTools/Labelmap/index.d.ts +3 -3
- package/dist/cjs/tools/displayTools/Labelmap/index.js +5 -5
- package/dist/cjs/tools/displayTools/Labelmap/labelmapConfig.d.ts +5 -0
- package/dist/cjs/tools/displayTools/Labelmap/{LabelmapConfig.js → labelmapConfig.js} +1 -1
- package/dist/cjs/tools/displayTools/Labelmap/labelmapConfig.js.map +1 -0
- package/dist/cjs/tools/displayTools/Labelmap/labelmapDisplay.d.ts +11 -0
- package/dist/cjs/tools/displayTools/Labelmap/{LabelmapDisplay.js → labelmapDisplay.js} +68 -59
- package/dist/cjs/tools/displayTools/Labelmap/labelmapDisplay.js.map +1 -0
- package/dist/cjs/tools/displayTools/Labelmap/removeLabelmapFromElement.d.ts +2 -0
- package/dist/cjs/tools/displayTools/Labelmap/removeLabelmapFromElement.js +12 -0
- package/dist/cjs/tools/displayTools/Labelmap/removeLabelmapFromElement.js.map +1 -0
- package/dist/cjs/tools/displayTools/Labelmap/validateRepresentationData.d.ts +3 -0
- package/dist/cjs/tools/displayTools/Labelmap/validateRepresentationData.js +18 -0
- package/dist/cjs/tools/displayTools/Labelmap/validateRepresentationData.js.map +1 -0
- package/dist/cjs/tools/displayTools/SegmentationDisplayTool.d.ts +2 -2
- package/dist/cjs/tools/displayTools/SegmentationDisplayTool.js +20 -19
- package/dist/cjs/tools/displayTools/SegmentationDisplayTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/CircleScissorsTool.d.ts +1 -1
- package/dist/cjs/tools/segmentation/CircleScissorsTool.js +11 -9
- package/dist/cjs/tools/segmentation/CircleScissorsTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleRoiThresholdTool.d.ts +1 -1
- package/dist/cjs/tools/segmentation/RectangleRoiThresholdTool.js +1 -1
- package/dist/cjs/tools/segmentation/RectangleRoiThresholdTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.d.ts +1 -1
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js +11 -9
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/SphereScissorsTool.d.ts +1 -1
- package/dist/cjs/tools/segmentation/SphereScissorsTool.js +11 -9
- package/dist/cjs/tools/segmentation/SphereScissorsTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/eraseRectangle.d.ts +1 -2
- package/dist/cjs/tools/segmentation/strategies/eraseRectangle.js +2 -2
- package/dist/cjs/tools/segmentation/strategies/eraseRectangle.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/fillCircle.d.ts +1 -2
- package/dist/cjs/tools/segmentation/strategies/fillCircle.js +2 -2
- package/dist/cjs/tools/segmentation/strategies/fillCircle.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/fillRectangle.d.ts +1 -2
- package/dist/cjs/tools/segmentation/strategies/fillRectangle.js +2 -2
- package/dist/cjs/tools/segmentation/strategies/fillRectangle.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/fillSphere.d.ts +1 -2
- package/dist/cjs/tools/segmentation/strategies/fillSphere.js +2 -2
- package/dist/cjs/tools/segmentation/strategies/fillSphere.js.map +1 -1
- package/dist/cjs/types/EventTypes.d.ts +13 -8
- package/dist/cjs/types/LabelmapTypes.d.ts +19 -0
- package/dist/cjs/types/{SegmentationRepresentationTypes.js → LabelmapTypes.js} +1 -1
- package/dist/cjs/types/LabelmapTypes.js.map +1 -0
- package/dist/cjs/types/SegmentationStateTypes.d.ts +41 -32
- package/dist/cjs/types/index.d.ts +2 -3
- package/dist/cjs/utilities/segmentation/getDefaultRepresentationConfig.d.ts +2 -1
- package/dist/cjs/utilities/segmentation/getDefaultRepresentationConfig.js +4 -3
- package/dist/cjs/utilities/segmentation/getDefaultRepresentationConfig.js.map +1 -1
- package/dist/cjs/utilities/segmentation/index.d.ts +1 -2
- package/dist/cjs/utilities/segmentation/index.js +1 -3
- package/dist/cjs/utilities/segmentation/index.js.map +1 -1
- package/dist/cjs/utilities/segmentation/isValidRepresentationConfig.js +2 -2
- package/dist/cjs/utilities/segmentation/thresholdVolumeByRange.d.ts +2 -2
- package/dist/cjs/utilities/segmentation/thresholdVolumeByRange.js +10 -9
- package/dist/cjs/utilities/segmentation/thresholdVolumeByRange.js.map +1 -1
- package/dist/cjs/utilities/triggerSegmentationRender.js +1 -1
- package/dist/cjs/utilities/triggerSegmentationRender.js.map +1 -1
- package/dist/esm/{stateManagement/segmentation/helpers → constants}/COLOR_LUT.d.ts +0 -0
- package/dist/esm/{stateManagement/segmentation/helpers → constants}/COLOR_LUT.js +0 -0
- package/dist/esm/constants/COLOR_LUT.js.map +1 -0
- package/dist/esm/constants/index.d.ts +2 -0
- package/dist/esm/constants/index.js +3 -0
- package/dist/esm/constants/index.js.map +1 -0
- package/dist/esm/enums/Events.d.ts +3 -2
- package/dist/esm/enums/Events.js +3 -2
- package/dist/esm/enums/Events.js.map +1 -1
- package/dist/esm/eventListeners/index.d.ts +2 -2
- package/dist/esm/eventListeners/index.js +2 -2
- package/dist/esm/eventListeners/index.js.map +1 -1
- package/dist/esm/eventListeners/segmentation/index.d.ts +4 -2
- package/dist/esm/eventListeners/segmentation/index.js +4 -2
- package/dist/esm/eventListeners/segmentation/index.js.map +1 -1
- package/dist/esm/eventListeners/segmentation/segmentationDataModifiedEventListener.js +7 -12
- package/dist/esm/eventListeners/segmentation/segmentationDataModifiedEventListener.js.map +1 -1
- package/dist/esm/eventListeners/segmentation/segmentationModifiedEventListener.d.ts +3 -0
- package/dist/esm/eventListeners/segmentation/segmentationModifiedEventListener.js +16 -0
- package/dist/esm/eventListeners/segmentation/segmentationModifiedEventListener.js.map +1 -0
- package/dist/esm/eventListeners/segmentation/segmentationRepresentationModifiedEventListener.d.ts +3 -0
- package/dist/esm/eventListeners/segmentation/segmentationRepresentationModifiedEventListener.js +7 -0
- package/dist/esm/eventListeners/segmentation/segmentationRepresentationModifiedEventListener.js.map +1 -0
- package/dist/esm/eventListeners/segmentation/segmentationRepresentationRemovedEventListener.d.ts +3 -0
- package/dist/esm/eventListeners/segmentation/segmentationRepresentationRemovedEventListener.js +7 -0
- package/dist/esm/eventListeners/segmentation/segmentationRepresentationRemovedEventListener.js.map +1 -0
- package/dist/esm/index.d.ts +2 -1
- package/dist/esm/index.js +2 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/init.js +15 -19
- package/dist/esm/init.js.map +1 -1
- package/dist/esm/stateManagement/index.d.ts +2 -2
- package/dist/esm/stateManagement/index.js +2 -2
- package/dist/esm/stateManagement/index.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/SegmentationStateManager.d.ts +15 -18
- package/dist/esm/stateManagement/segmentation/SegmentationStateManager.js +87 -122
- package/dist/esm/stateManagement/segmentation/SegmentationStateManager.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/activeSegmentation.d.ts +4 -7
- package/dist/esm/stateManagement/segmentation/activeSegmentation.js +14 -14
- package/dist/esm/stateManagement/segmentation/activeSegmentation.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/addSegmentationRepresentations.d.ts +3 -0
- package/dist/esm/stateManagement/segmentation/addSegmentationRepresentations.js +23 -0
- package/dist/esm/stateManagement/segmentation/addSegmentationRepresentations.js.map +1 -0
- package/dist/esm/stateManagement/segmentation/addSegmentations.d.ts +3 -0
- package/dist/esm/stateManagement/segmentation/addSegmentations.js +12 -0
- package/dist/esm/stateManagement/segmentation/addSegmentations.js.map +1 -0
- package/dist/esm/stateManagement/segmentation/createNewSegmentationForToolGroup.js +6 -6
- package/dist/esm/stateManagement/segmentation/createNewSegmentationForToolGroup.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/helpers/index.d.ts +2 -4
- package/dist/esm/stateManagement/segmentation/helpers/index.js +2 -4
- package/dist/esm/stateManagement/segmentation/helpers/index.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/helpers/normalizeSegmentationInput.d.ts +3 -0
- package/dist/esm/stateManagement/segmentation/helpers/normalizeSegmentationInput.js +18 -0
- package/dist/esm/stateManagement/segmentation/helpers/normalizeSegmentationInput.js.map +1 -0
- package/dist/esm/stateManagement/segmentation/helpers/validateSegmentationInput.d.ts +3 -0
- package/dist/esm/stateManagement/segmentation/helpers/validateSegmentationInput.js +21 -0
- package/dist/esm/stateManagement/segmentation/helpers/validateSegmentationInput.js.map +1 -0
- package/dist/esm/stateManagement/segmentation/index.d.ts +3 -2
- package/dist/esm/stateManagement/segmentation/index.js +3 -2
- package/dist/esm/stateManagement/segmentation/index.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/removeSegmentationsFromToolGroup.d.ts +1 -1
- package/dist/esm/stateManagement/segmentation/removeSegmentationsFromToolGroup.js +23 -18
- package/dist/esm/stateManagement/segmentation/removeSegmentationsFromToolGroup.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/segmentIndex.d.ts +2 -2
- package/dist/esm/stateManagement/segmentation/segmentIndex.js +25 -25
- package/dist/esm/stateManagement/segmentation/segmentIndex.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/segmentLocking.d.ts +3 -3
- package/dist/esm/stateManagement/segmentation/segmentLocking.js +29 -29
- package/dist/esm/stateManagement/segmentation/segmentLocking.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/segmentationColor.d.ts +3 -3
- package/dist/esm/stateManagement/segmentation/segmentationColor.js +5 -5
- package/dist/esm/stateManagement/segmentation/segmentationColor.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/segmentationConfig.d.ts +8 -12
- package/dist/esm/stateManagement/segmentation/segmentationConfig.js +12 -46
- package/dist/esm/stateManagement/segmentation/segmentationConfig.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/segmentationState.d.ts +16 -19
- package/dist/esm/stateManagement/segmentation/segmentationState.js +68 -91
- package/dist/esm/stateManagement/segmentation/segmentationState.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/segmentationVisibility.d.ts +2 -2
- package/dist/esm/stateManagement/segmentation/segmentationVisibility.js +14 -12
- package/dist/esm/stateManagement/segmentation/segmentationVisibility.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/triggerSegmentationEvents.d.ts +5 -4
- package/dist/esm/stateManagement/segmentation/triggerSegmentationEvents.js +34 -20
- package/dist/esm/stateManagement/segmentation/triggerSegmentationEvents.js.map +1 -1
- package/dist/esm/store/ToolGroupManager/destroy.js +2 -2
- package/dist/esm/store/ToolGroupManager/destroy.js.map +1 -1
- package/dist/esm/store/ToolGroupManager/destroyToolGroupById.d.ts +2 -0
- package/dist/esm/store/ToolGroupManager/{destroyToolGroupByToolGroupId.js → destroyToolGroupById.js} +3 -3
- package/dist/esm/store/ToolGroupManager/destroyToolGroupById.js.map +1 -0
- package/dist/esm/store/ToolGroupManager/getToolGroupById.d.ts +3 -0
- package/dist/esm/store/ToolGroupManager/getToolGroupById.js +6 -0
- package/dist/esm/store/ToolGroupManager/getToolGroupById.js.map +1 -0
- package/dist/esm/store/ToolGroupManager/index.d.ts +3 -3
- package/dist/esm/store/ToolGroupManager/index.js +3 -3
- package/dist/esm/store/ToolGroupManager/index.js.map +1 -1
- package/dist/esm/tools/displayTools/Labelmap/addLabelmapToElement.d.ts +2 -0
- package/dist/esm/tools/displayTools/Labelmap/addLabelmapToElement.js +16 -0
- package/dist/esm/tools/displayTools/Labelmap/addLabelmapToElement.js.map +1 -0
- package/dist/esm/tools/displayTools/Labelmap/index.d.ts +3 -3
- package/dist/esm/tools/displayTools/Labelmap/index.js +3 -3
- package/dist/esm/tools/displayTools/Labelmap/labelmapConfig.d.ts +5 -0
- package/dist/esm/tools/displayTools/Labelmap/{LabelmapConfig.js → labelmapConfig.js} +1 -1
- package/dist/esm/tools/displayTools/Labelmap/labelmapConfig.js.map +1 -0
- package/dist/esm/tools/displayTools/Labelmap/labelmapDisplay.d.ts +11 -0
- package/dist/esm/tools/displayTools/Labelmap/{LabelmapDisplay.js → labelmapDisplay.js} +70 -61
- package/dist/esm/tools/displayTools/Labelmap/labelmapDisplay.js.map +1 -0
- package/dist/esm/tools/displayTools/Labelmap/removeLabelmapFromElement.d.ts +2 -0
- package/dist/esm/tools/displayTools/Labelmap/removeLabelmapFromElement.js +10 -0
- package/dist/esm/tools/displayTools/Labelmap/removeLabelmapFromElement.js.map +1 -0
- package/dist/esm/tools/displayTools/Labelmap/validateRepresentationData.d.ts +3 -0
- package/dist/esm/tools/displayTools/Labelmap/validateRepresentationData.js +16 -0
- package/dist/esm/tools/displayTools/Labelmap/validateRepresentationData.js.map +1 -0
- package/dist/esm/tools/displayTools/SegmentationDisplayTool.d.ts +2 -2
- package/dist/esm/tools/displayTools/SegmentationDisplayTool.js +24 -23
- package/dist/esm/tools/displayTools/SegmentationDisplayTool.js.map +1 -1
- package/dist/esm/tools/segmentation/CircleScissorsTool.d.ts +1 -1
- package/dist/esm/tools/segmentation/CircleScissorsTool.js +11 -9
- package/dist/esm/tools/segmentation/CircleScissorsTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleRoiThresholdTool.d.ts +1 -1
- package/dist/esm/tools/segmentation/RectangleRoiThresholdTool.js +1 -1
- package/dist/esm/tools/segmentation/RectangleRoiThresholdTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleScissorsTool.d.ts +1 -1
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js +11 -9
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/esm/tools/segmentation/SphereScissorsTool.d.ts +1 -1
- package/dist/esm/tools/segmentation/SphereScissorsTool.js +11 -9
- package/dist/esm/tools/segmentation/SphereScissorsTool.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/eraseRectangle.d.ts +1 -2
- package/dist/esm/tools/segmentation/strategies/eraseRectangle.js +2 -2
- package/dist/esm/tools/segmentation/strategies/eraseRectangle.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/fillCircle.d.ts +1 -2
- package/dist/esm/tools/segmentation/strategies/fillCircle.js +2 -2
- package/dist/esm/tools/segmentation/strategies/fillCircle.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/fillRectangle.d.ts +1 -2
- package/dist/esm/tools/segmentation/strategies/fillRectangle.js +2 -2
- package/dist/esm/tools/segmentation/strategies/fillRectangle.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/fillSphere.d.ts +1 -2
- package/dist/esm/tools/segmentation/strategies/fillSphere.js +2 -2
- package/dist/esm/tools/segmentation/strategies/fillSphere.js.map +1 -1
- package/dist/esm/types/EventTypes.d.ts +13 -8
- package/dist/esm/types/LabelmapTypes.d.ts +19 -0
- package/dist/esm/types/LabelmapTypes.js +2 -0
- package/dist/esm/types/LabelmapTypes.js.map +1 -0
- package/dist/esm/types/SegmentationStateTypes.d.ts +41 -32
- package/dist/esm/types/index.d.ts +2 -3
- package/dist/esm/utilities/segmentation/getDefaultRepresentationConfig.d.ts +2 -1
- package/dist/esm/utilities/segmentation/getDefaultRepresentationConfig.js +3 -2
- package/dist/esm/utilities/segmentation/getDefaultRepresentationConfig.js.map +1 -1
- package/dist/esm/utilities/segmentation/index.d.ts +1 -2
- package/dist/esm/utilities/segmentation/index.js +1 -2
- package/dist/esm/utilities/segmentation/index.js.map +1 -1
- package/dist/esm/utilities/segmentation/isValidRepresentationConfig.js +1 -1
- package/dist/esm/utilities/segmentation/thresholdVolumeByRange.d.ts +2 -2
- package/dist/esm/utilities/segmentation/thresholdVolumeByRange.js +10 -9
- package/dist/esm/utilities/segmentation/thresholdVolumeByRange.js.map +1 -1
- package/dist/esm/utilities/triggerSegmentationRender.js +2 -2
- package/dist/esm/utilities/triggerSegmentationRender.js.map +1 -1
- package/dist/tools.d.ts +221 -216
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +4 -4
- package/dist/cjs/eventListeners/segmentation/segmentationStateModifiedEventListener.d.ts +0 -3
- package/dist/cjs/eventListeners/segmentation/segmentationStateModifiedEventListener.js.map +0 -1
- package/dist/cjs/stateManagement/segmentation/addSegmentationsForToolGroup.d.ts +0 -3
- package/dist/cjs/stateManagement/segmentation/addSegmentationsForToolGroup.js +0 -59
- package/dist/cjs/stateManagement/segmentation/addSegmentationsForToolGroup.js.map +0 -1
- package/dist/cjs/stateManagement/segmentation/helpers/COLOR_LUT.js.map +0 -1
- package/dist/cjs/stateManagement/segmentation/helpers/checkSegmentationDataIsValid.d.ts +0 -3
- package/dist/cjs/stateManagement/segmentation/helpers/checkSegmentationDataIsValid.js +0 -14
- package/dist/cjs/stateManagement/segmentation/helpers/checkSegmentationDataIsValid.js.map +0 -1
- package/dist/cjs/stateManagement/segmentation/helpers/internalAddSegmentationToElement.d.ts +0 -3
- package/dist/cjs/stateManagement/segmentation/helpers/internalAddSegmentationToElement.js +0 -43
- package/dist/cjs/stateManagement/segmentation/helpers/internalAddSegmentationToElement.js.map +0 -1
- package/dist/cjs/stateManagement/segmentation/helpers/internalRemoveSegmentationFromElement.d.ts +0 -3
- package/dist/cjs/stateManagement/segmentation/helpers/internalRemoveSegmentationFromElement.js +0 -23
- package/dist/cjs/stateManagement/segmentation/helpers/internalRemoveSegmentationFromElement.js.map +0 -1
- package/dist/cjs/store/ToolGroupManager/destroyToolGroupByToolGroupId.d.ts +0 -2
- package/dist/cjs/store/ToolGroupManager/destroyToolGroupByToolGroupId.js.map +0 -1
- package/dist/cjs/store/ToolGroupManager/getToolGroupByToolGroupId.d.ts +0 -3
- package/dist/cjs/store/ToolGroupManager/getToolGroupByToolGroupId.js.map +0 -1
- package/dist/cjs/tools/displayTools/Labelmap/LabelmapConfig.d.ts +0 -13
- package/dist/cjs/tools/displayTools/Labelmap/LabelmapConfig.js.map +0 -1
- package/dist/cjs/tools/displayTools/Labelmap/LabelmapDisplay.d.ts +0 -11
- package/dist/cjs/tools/displayTools/Labelmap/LabelmapDisplay.js.map +0 -1
- package/dist/cjs/types/SegmentationRepresentationTypes.d.ts +0 -11
- package/dist/cjs/types/SegmentationRepresentationTypes.js.map +0 -1
- package/dist/cjs/utilities/segmentation/thresholdVolumeByRoiStats.d.ts +0 -11
- package/dist/cjs/utilities/segmentation/thresholdVolumeByRoiStats.js +0 -111
- package/dist/cjs/utilities/segmentation/thresholdVolumeByRoiStats.js.map +0 -1
- package/dist/esm/eventListeners/segmentation/segmentationStateModifiedEventListener.d.ts +0 -3
- package/dist/esm/eventListeners/segmentation/segmentationStateModifiedEventListener.js +0 -7
- package/dist/esm/eventListeners/segmentation/segmentationStateModifiedEventListener.js.map +0 -1
- package/dist/esm/stateManagement/segmentation/addSegmentationsForToolGroup.d.ts +0 -3
- package/dist/esm/stateManagement/segmentation/addSegmentationsForToolGroup.js +0 -40
- package/dist/esm/stateManagement/segmentation/addSegmentationsForToolGroup.js.map +0 -1
- package/dist/esm/stateManagement/segmentation/helpers/checkSegmentationDataIsValid.d.ts +0 -3
- package/dist/esm/stateManagement/segmentation/helpers/checkSegmentationDataIsValid.js +0 -12
- package/dist/esm/stateManagement/segmentation/helpers/checkSegmentationDataIsValid.js.map +0 -1
- package/dist/esm/stateManagement/segmentation/helpers/internalAddSegmentationToElement.d.ts +0 -3
- package/dist/esm/stateManagement/segmentation/helpers/internalAddSegmentationToElement.js +0 -27
- package/dist/esm/stateManagement/segmentation/helpers/internalAddSegmentationToElement.js.map +0 -1
- package/dist/esm/stateManagement/segmentation/helpers/internalRemoveSegmentationFromElement.d.ts +0 -3
- package/dist/esm/stateManagement/segmentation/helpers/internalRemoveSegmentationFromElement.js +0 -18
- package/dist/esm/stateManagement/segmentation/helpers/internalRemoveSegmentationFromElement.js.map +0 -1
- package/dist/esm/store/ToolGroupManager/destroyToolGroupByToolGroupId.d.ts +0 -2
- package/dist/esm/store/ToolGroupManager/destroyToolGroupByToolGroupId.js.map +0 -1
- package/dist/esm/store/ToolGroupManager/getToolGroupByToolGroupId.d.ts +0 -3
- package/dist/esm/store/ToolGroupManager/getToolGroupByToolGroupId.js +0 -6
- package/dist/esm/store/ToolGroupManager/getToolGroupByToolGroupId.js.map +0 -1
- package/dist/esm/tools/displayTools/Labelmap/LabelmapConfig.d.ts +0 -13
- package/dist/esm/tools/displayTools/Labelmap/LabelmapConfig.js.map +0 -1
- package/dist/esm/tools/displayTools/Labelmap/LabelmapDisplay.d.ts +0 -11
- package/dist/esm/tools/displayTools/Labelmap/LabelmapDisplay.js.map +0 -1
- package/dist/esm/types/SegmentationRepresentationTypes.d.ts +0 -11
- package/dist/esm/types/SegmentationRepresentationTypes.js +0 -2
- package/dist/esm/types/SegmentationRepresentationTypes.js.map +0 -1
- package/dist/esm/utilities/segmentation/thresholdVolumeByRoiStats.d.ts +0 -11
- package/dist/esm/utilities/segmentation/thresholdVolumeByRoiStats.js +0 -86
- package/dist/esm/utilities/segmentation/thresholdVolumeByRoiStats.js.map +0 -1
|
@@ -1,75 +1,73 @@
|
|
|
1
1
|
import vtkColorTransferFunction from 'vtk.js/Sources/Rendering/Core/ColorTransferFunction';
|
|
2
2
|
import vtkPiecewiseFunction from 'vtk.js/Sources/Common/DataModel/PiecewiseFunction';
|
|
3
|
-
import { cache, getEnabledElementByIds } from '@cornerstonejs/core';
|
|
3
|
+
import { cache, getEnabledElementByIds, utilities, } from '@cornerstonejs/core';
|
|
4
4
|
import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
|
|
5
5
|
import Representations from '../../../enums/SegmentationRepresentations';
|
|
6
|
-
import {
|
|
7
|
-
import
|
|
6
|
+
import { getToolGroupById } from '../../../store/ToolGroupManager';
|
|
7
|
+
import addLabelmapToElement from './addLabelmapToElement';
|
|
8
8
|
import { deepMerge } from '../../../utilities';
|
|
9
|
+
import removeLabelmapFromElement from './removeLabelmapFromElement';
|
|
9
10
|
const MAX_NUMBER_COLORS = 255;
|
|
10
11
|
const labelMapConfigCache = new Map();
|
|
11
|
-
async function
|
|
12
|
-
const {
|
|
13
|
-
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
volumeId,
|
|
28
|
-
segmentationDataUID,
|
|
12
|
+
async function addSegmentationRepresentation(toolGroupId, representationInput, toolGroupSpecificConfig) {
|
|
13
|
+
const { segmentationId } = representationInput;
|
|
14
|
+
const segmentation = SegmentationState.getSegmentation(segmentationId);
|
|
15
|
+
const { volumeId } = segmentation.representations[Representations.Labelmap];
|
|
16
|
+
const segmentationRepresentationUID = utilities.uuidv4();
|
|
17
|
+
await _addLabelmapToToolGroupViewports(toolGroupId, volumeId, segmentationRepresentationUID);
|
|
18
|
+
const segmentsHidden = new Set();
|
|
19
|
+
const visibility = true;
|
|
20
|
+
const colorLUTIndex = 0;
|
|
21
|
+
const active = true;
|
|
22
|
+
const cfun = vtkColorTransferFunction.newInstance();
|
|
23
|
+
const ofun = vtkPiecewiseFunction.newInstance();
|
|
24
|
+
const toolGroupSpecificRepresentation = {
|
|
25
|
+
segmentationId,
|
|
26
|
+
segmentationRepresentationUID,
|
|
27
|
+
type: Representations.Labelmap,
|
|
29
28
|
segmentsHidden,
|
|
30
29
|
visibility,
|
|
31
30
|
colorLUTIndex,
|
|
32
31
|
active,
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
cfun,
|
|
37
|
-
ofun,
|
|
38
|
-
},
|
|
32
|
+
config: {
|
|
33
|
+
cfun,
|
|
34
|
+
ofun,
|
|
39
35
|
},
|
|
40
36
|
};
|
|
41
37
|
if (toolGroupSpecificConfig) {
|
|
42
38
|
const suppressEvents = true;
|
|
43
|
-
const currentToolGroupConfig = SegmentationState.
|
|
39
|
+
const currentToolGroupConfig = SegmentationState.getToolGroupSpecificConfig(toolGroupId);
|
|
44
40
|
const mergedConfig = deepMerge(currentToolGroupConfig, toolGroupSpecificConfig);
|
|
45
|
-
SegmentationState.
|
|
41
|
+
SegmentationState.setToolGroupSpecificConfig(toolGroupId, {
|
|
46
42
|
renderInactiveSegmentations: mergedConfig.renderInactiveSegmentations || true,
|
|
47
43
|
representations: {
|
|
48
44
|
...mergedConfig.representations,
|
|
49
45
|
},
|
|
50
46
|
}, suppressEvents);
|
|
51
47
|
}
|
|
52
|
-
SegmentationState.
|
|
48
|
+
SegmentationState.addSegmentationRepresentation(toolGroupId, toolGroupSpecificRepresentation);
|
|
53
49
|
}
|
|
54
|
-
function
|
|
55
|
-
_removeLabelmapFromToolGroupViewports(toolGroupId,
|
|
56
|
-
SegmentationState.
|
|
50
|
+
function removeSegmentationRepresentation(toolGroupId, segmentationRepresentationUID) {
|
|
51
|
+
_removeLabelmapFromToolGroupViewports(toolGroupId, segmentationRepresentationUID);
|
|
52
|
+
SegmentationState.removeSegmentationRepresentation(toolGroupId, segmentationRepresentationUID);
|
|
57
53
|
}
|
|
58
|
-
function render(viewport,
|
|
59
|
-
const {
|
|
60
|
-
const
|
|
54
|
+
function render(viewport, representation, toolGroupConfig) {
|
|
55
|
+
const { colorLUTIndex, active, segmentationId, segmentationRepresentationUID, visibility, config: renderingConfig, } = representation;
|
|
56
|
+
const segmentation = SegmentationState.getSegmentation(segmentationId);
|
|
57
|
+
const labelmapData = segmentation.representations[Representations.Labelmap];
|
|
58
|
+
const { volumeId: labelmapUID } = labelmapData;
|
|
61
59
|
const labelmap = cache.getVolume(labelmapUID);
|
|
62
60
|
if (!labelmap) {
|
|
63
61
|
throw new Error(`No Labelmap found for volumeId: ${labelmapUID}`);
|
|
64
62
|
}
|
|
65
|
-
const actor = viewport.getActor(
|
|
63
|
+
const actor = viewport.getActor(segmentationRepresentationUID);
|
|
66
64
|
if (!actor) {
|
|
67
|
-
console.warn('No actor found for actorUID: ',
|
|
65
|
+
console.warn('No actor found for actorUID: ', segmentationRepresentationUID);
|
|
68
66
|
return;
|
|
69
67
|
}
|
|
70
|
-
const { cfun, ofun } =
|
|
71
|
-
const labelmapConfig =
|
|
72
|
-
const renderInactiveSegmentations =
|
|
68
|
+
const { cfun, ofun } = renderingConfig;
|
|
69
|
+
const labelmapConfig = toolGroupConfig.representations[Representations.Labelmap];
|
|
70
|
+
const renderInactiveSegmentations = toolGroupConfig.renderInactiveSegmentations;
|
|
73
71
|
_setLabelmapColorAndOpacity(viewport.id, actor, cfun, ofun, colorLUTIndex, labelmapConfig, active, renderInactiveSegmentations, visibility);
|
|
74
72
|
}
|
|
75
73
|
function _setLabelmapColorAndOpacity(viewportId, actor, cfun, ofun, colorLUTIndex, labelmapConfig, isActiveLabelmap, renderInactiveSegmentations, visibility = true) {
|
|
@@ -83,16 +81,21 @@ function _setLabelmapColorAndOpacity(viewportId, actor, cfun, ofun, colorLUTInde
|
|
|
83
81
|
const colorLUT = SegmentationState.getColorLut(colorLUTIndex);
|
|
84
82
|
const numColors = Math.min(256, colorLUT.length);
|
|
85
83
|
const { volumeActor, uid } = actor;
|
|
86
|
-
const
|
|
87
|
-
if (
|
|
84
|
+
const { needColorUpdate, needOpacityUpdate } = _needsTransferFunctionUpdate(viewportId, uid, fillAlpha, colorLUTIndex);
|
|
85
|
+
if (needColorUpdate) {
|
|
88
86
|
for (let i = 0; i < numColors; i++) {
|
|
89
87
|
const color = colorLUT[i];
|
|
90
88
|
cfun.addRGBPoint(i, color[0] / MAX_NUMBER_COLORS, color[1] / MAX_NUMBER_COLORS, color[2] / MAX_NUMBER_COLORS);
|
|
89
|
+
}
|
|
90
|
+
volumeActor.getProperty().setRGBTransferFunction(0, cfun);
|
|
91
|
+
}
|
|
92
|
+
if (needOpacityUpdate) {
|
|
93
|
+
for (let i = 0; i < numColors; i++) {
|
|
94
|
+
const color = colorLUT[i];
|
|
91
95
|
const segmentOpacity = (color[3] / 255) * fillAlpha;
|
|
92
96
|
ofun.addPoint(i, segmentOpacity);
|
|
93
97
|
}
|
|
94
98
|
ofun.setClamping(false);
|
|
95
|
-
volumeActor.getProperty().setRGBTransferFunction(0, cfun);
|
|
96
99
|
volumeActor.getProperty().setScalarOpacity(0, ofun);
|
|
97
100
|
}
|
|
98
101
|
volumeActor.getProperty().setInterpolationTypeToNearest();
|
|
@@ -101,35 +104,41 @@ function _setLabelmapColorAndOpacity(viewportId, actor, cfun, ofun, colorLUTInde
|
|
|
101
104
|
const visible = visibility && (isActiveLabelmap || renderInactiveSegmentations);
|
|
102
105
|
volumeActor.setVisibility(visible);
|
|
103
106
|
}
|
|
104
|
-
function
|
|
107
|
+
function _needsTransferFunctionUpdate(viewportId, actorUID, fillAlpha, colorLUTIndex) {
|
|
105
108
|
const cacheUID = `${viewportId}-${actorUID}`;
|
|
106
109
|
const config = labelMapConfigCache.get(cacheUID);
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
config.colorLUTIndex === colorLUTIndex) {
|
|
110
|
-
return false;
|
|
111
|
-
}
|
|
110
|
+
let needColorUpdate = false;
|
|
111
|
+
let needOpacityUpdate = false;
|
|
112
112
|
labelMapConfigCache.set(cacheUID, {
|
|
113
113
|
fillAlpha,
|
|
114
114
|
colorLUTIndex,
|
|
115
115
|
});
|
|
116
|
-
|
|
116
|
+
if (!config) {
|
|
117
|
+
needColorUpdate = true;
|
|
118
|
+
needOpacityUpdate = true;
|
|
119
|
+
}
|
|
120
|
+
if (config && config.fillAlpha !== fillAlpha) {
|
|
121
|
+
needOpacityUpdate = true;
|
|
122
|
+
}
|
|
123
|
+
if (config && config.colorLUTIndex !== colorLUTIndex) {
|
|
124
|
+
needColorUpdate = true;
|
|
125
|
+
}
|
|
126
|
+
return { needColorUpdate, needOpacityUpdate };
|
|
117
127
|
}
|
|
118
|
-
function _removeLabelmapFromToolGroupViewports(toolGroupId,
|
|
119
|
-
const toolGroup =
|
|
128
|
+
function _removeLabelmapFromToolGroupViewports(toolGroupId, segmentationRepresentationUID) {
|
|
129
|
+
const toolGroup = getToolGroupById(toolGroupId);
|
|
120
130
|
if (toolGroup === undefined) {
|
|
121
131
|
throw new Error(`ToolGroup with ToolGroupId ${toolGroupId} does not exist`);
|
|
122
132
|
}
|
|
123
133
|
const { viewportsInfo } = toolGroup;
|
|
124
|
-
const segmentationData = SegmentationState.getSegmentationDataByUID(toolGroupId, segmentationDataUID);
|
|
125
134
|
for (const viewportInfo of viewportsInfo) {
|
|
126
135
|
const { viewportId, renderingEngineId } = viewportInfo;
|
|
127
136
|
const enabledElement = getEnabledElementByIds(viewportId, renderingEngineId);
|
|
128
|
-
|
|
137
|
+
removeLabelmapFromElement(enabledElement.viewport.element, segmentationRepresentationUID);
|
|
129
138
|
}
|
|
130
139
|
}
|
|
131
|
-
async function _addLabelmapToToolGroupViewports(toolGroupId,
|
|
132
|
-
const toolGroup =
|
|
140
|
+
async function _addLabelmapToToolGroupViewports(toolGroupId, volumeId, segmentationRepresentationUID) {
|
|
141
|
+
const toolGroup = getToolGroupById(toolGroupId);
|
|
133
142
|
const { viewportsInfo } = toolGroup;
|
|
134
143
|
for (const viewportInfo of viewportsInfo) {
|
|
135
144
|
const { viewportId, renderingEngineId } = viewportInfo;
|
|
@@ -138,12 +147,12 @@ async function _addLabelmapToToolGroupViewports(toolGroupId, segmentationData) {
|
|
|
138
147
|
throw new Error(`No enabled element found for rendering engine: ${renderingEngineId} and viewport: ${viewportId}`);
|
|
139
148
|
}
|
|
140
149
|
const { viewport } = enabledElement;
|
|
141
|
-
|
|
150
|
+
addLabelmapToElement(viewport.element, volumeId, segmentationRepresentationUID);
|
|
142
151
|
}
|
|
143
152
|
}
|
|
144
153
|
export default {
|
|
145
154
|
render,
|
|
146
|
-
|
|
147
|
-
|
|
155
|
+
addSegmentationRepresentation,
|
|
156
|
+
removeSegmentationRepresentation,
|
|
148
157
|
};
|
|
149
|
-
//# sourceMappingURL=
|
|
158
|
+
//# sourceMappingURL=labelmapDisplay.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"labelmapDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Labelmap/labelmapDisplay.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { getEnabledElement } from '@cornerstonejs/core';
|
|
2
|
+
function removeLabelmapFromElement(element, segmentationRepresentationUID, removeFromCache = false) {
|
|
3
|
+
const enabledElement = getEnabledElement(element);
|
|
4
|
+
const { viewport } = enabledElement;
|
|
5
|
+
viewport.removeVolumeActors([
|
|
6
|
+
segmentationRepresentationUID,
|
|
7
|
+
]);
|
|
8
|
+
}
|
|
9
|
+
export default removeLabelmapFromElement;
|
|
10
|
+
//# sourceMappingURL=removeLabelmapFromElement.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"removeLabelmapFromElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Labelmap/removeLabelmapFromElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAavD,SAAS,yBAAyB,CAChC,OAAoB,EACpB,6BAAqC,EACrC,eAAe,GAAG,KAAK;IAEvB,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAA;IACjD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAElC;IAAC,QAAkC,CAAC,kBAAkB,CAAC;QACtD,6BAA6B;KAC9B,CAAC,CAAA;AACJ,CAAC;AAED,eAAe,yBAAyB,CAAA"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { cache } from '@cornerstonejs/core';
|
|
2
|
+
function validate(segmentationInput) {
|
|
3
|
+
if (!segmentationInput.representation.data) {
|
|
4
|
+
throw new Error('The segmentationInput.representationData.data is undefined, please provide a valid representationData.data');
|
|
5
|
+
}
|
|
6
|
+
const representationData = segmentationInput.representation.data;
|
|
7
|
+
if (!representationData.volumeId) {
|
|
8
|
+
throw new Error('The segmentationInput.representationData.volumeId is undefined, please provide a valid representationData.volumeId');
|
|
9
|
+
}
|
|
10
|
+
const cachedVolume = cache.getVolume(representationData.volumeId);
|
|
11
|
+
if (!cachedVolume) {
|
|
12
|
+
throw new Error(`volumeId of ${representationData.volumeId} not found in cache, you should load and cache volume before adding segmentation`);
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
export default validate;
|
|
16
|
+
//# sourceMappingURL=validateRepresentationData.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validateRepresentationData.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Labelmap/validateRepresentationData.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAE3C,SAAS,QAAQ,CAAC,iBAA0C;IAC1D,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,4GAA4G,CAC7G,CAAA;KACF;IAED,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAA;IAEhE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE;QAChC,MAAM,IAAI,KAAK,CACb,oHAAoH,CACrH,CAAA;KACF;IAED,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAA;IAEjE,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CACb,eAAe,kBAAkB,CAAC,QAAQ,kFAAkF,CAC7H,CAAA;KACF;AACH,CAAC;AAED,eAAe,QAAQ,CAAA"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { BaseTool } from '../base';
|
|
2
|
-
import { SegmentationConfig } from '../../types/SegmentationStateTypes';
|
|
3
2
|
import { PublicToolProps, ToolProps } from '../../types';
|
|
3
|
+
import { SegmentationRepresentationConfig } from '../../types/SegmentationStateTypes';
|
|
4
4
|
export default class SegmentationDisplayTool extends BaseTool {
|
|
5
5
|
static toolName: string;
|
|
6
6
|
constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
|
|
7
7
|
enableCallback(): void;
|
|
8
8
|
disableCallback(): void;
|
|
9
9
|
renderSegmentation: (toolGroupId: string) => void;
|
|
10
|
-
|
|
10
|
+
_getMergedRepresentationsConfig(toolGroupId: string): SegmentationRepresentationConfig;
|
|
11
11
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { BaseTool } from '../base';
|
|
2
2
|
import { getEnabledElementByIds } from '@cornerstonejs/core';
|
|
3
3
|
import Representations from '../../enums/SegmentationRepresentations';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
4
|
+
import { getSegmentationRepresentations } from '../../stateManagement/segmentation/segmentationState';
|
|
5
|
+
import { labelmapDisplay } from './Labelmap';
|
|
6
6
|
import { segmentationConfig } from '../../stateManagement/segmentation';
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
7
|
+
import { triggerSegmentationRepresentationModified } from '../../stateManagement/segmentation/triggerSegmentationEvents';
|
|
8
|
+
import { getToolGroupById } from '../../store/ToolGroupManager';
|
|
9
9
|
import { deepMerge } from '../../utilities';
|
|
10
10
|
export default class SegmentationDisplayTool extends BaseTool {
|
|
11
11
|
constructor(toolProps = {}, defaultToolProps = {
|
|
@@ -13,23 +13,22 @@ export default class SegmentationDisplayTool extends BaseTool {
|
|
|
13
13
|
}) {
|
|
14
14
|
super(toolProps, defaultToolProps);
|
|
15
15
|
this.renderSegmentation = (toolGroupId) => {
|
|
16
|
-
const toolGroup =
|
|
16
|
+
const toolGroup = getToolGroupById(toolGroupId);
|
|
17
17
|
if (!toolGroup) {
|
|
18
18
|
return;
|
|
19
19
|
}
|
|
20
|
-
const
|
|
20
|
+
const toolGroupSegmentationRepresentations = getSegmentationRepresentations(toolGroupId);
|
|
21
21
|
const toolGroupViewports = toolGroup.viewportsInfo.map(({ renderingEngineId, viewportId }) => {
|
|
22
22
|
const enabledElement = getEnabledElementByIds(viewportId, renderingEngineId);
|
|
23
23
|
if (enabledElement) {
|
|
24
24
|
return enabledElement.viewport;
|
|
25
25
|
}
|
|
26
26
|
});
|
|
27
|
-
|
|
28
|
-
const config = this.
|
|
29
|
-
const { representation } = segmentationData;
|
|
27
|
+
toolGroupSegmentationRepresentations.forEach((representation) => {
|
|
28
|
+
const config = this._getMergedRepresentationsConfig(toolGroupId);
|
|
30
29
|
toolGroupViewports.forEach((viewport) => {
|
|
31
30
|
if (representation.type == Representations.Labelmap) {
|
|
32
|
-
|
|
31
|
+
labelmapDisplay.render(viewport, representation, config);
|
|
33
32
|
}
|
|
34
33
|
else {
|
|
35
34
|
throw new Error(`Render for ${representation.type} is not supported yet`);
|
|
@@ -43,29 +42,31 @@ export default class SegmentationDisplayTool extends BaseTool {
|
|
|
43
42
|
}
|
|
44
43
|
enableCallback() {
|
|
45
44
|
const toolGroupId = this.toolGroupId;
|
|
46
|
-
const
|
|
47
|
-
if (
|
|
45
|
+
const toolGroupSegmentationRepresentations = getSegmentationRepresentations(toolGroupId);
|
|
46
|
+
if (!toolGroupSegmentationRepresentations ||
|
|
47
|
+
toolGroupSegmentationRepresentations.length === 0) {
|
|
48
48
|
return;
|
|
49
49
|
}
|
|
50
|
-
for (const
|
|
51
|
-
|
|
50
|
+
for (const segmentationRepresentation of toolGroupSegmentationRepresentations) {
|
|
51
|
+
segmentationRepresentation.visibility = true;
|
|
52
|
+
triggerSegmentationRepresentationModified(toolGroupId, segmentationRepresentation.segmentationRepresentationUID);
|
|
52
53
|
}
|
|
53
|
-
triggerSegmentationStateModified(toolGroupId);
|
|
54
54
|
}
|
|
55
55
|
disableCallback() {
|
|
56
56
|
const toolGroupId = this.toolGroupId;
|
|
57
|
-
const
|
|
58
|
-
if (
|
|
57
|
+
const toolGroupSegmentationRepresentations = getSegmentationRepresentations(toolGroupId);
|
|
58
|
+
if (!toolGroupSegmentationRepresentations ||
|
|
59
|
+
toolGroupSegmentationRepresentations.length === 0) {
|
|
59
60
|
return;
|
|
60
61
|
}
|
|
61
|
-
for (const
|
|
62
|
-
|
|
62
|
+
for (const segmentationRepresentation of toolGroupSegmentationRepresentations) {
|
|
63
|
+
segmentationRepresentation.visibility = false;
|
|
64
|
+
triggerSegmentationRepresentationModified(toolGroupId, segmentationRepresentation.segmentationRepresentationUID);
|
|
63
65
|
}
|
|
64
|
-
triggerSegmentationStateModified(toolGroupId);
|
|
65
66
|
}
|
|
66
|
-
|
|
67
|
-
const toolGroupConfig = segmentationConfig.
|
|
68
|
-
const globalConfig = segmentationConfig.
|
|
67
|
+
_getMergedRepresentationsConfig(toolGroupId) {
|
|
68
|
+
const toolGroupConfig = segmentationConfig.getToolGroupSpecificConfig(toolGroupId);
|
|
69
|
+
const globalConfig = segmentationConfig.getGlobalConfig();
|
|
69
70
|
const mergedConfig = deepMerge(globalConfig, toolGroupConfig);
|
|
70
71
|
return mergedConfig;
|
|
71
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SegmentationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/displayTools/SegmentationDisplayTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAA;AAC5D,OAAO,eAAe,MAAM,yCAAyC,CAAA;AACrE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"SegmentationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/displayTools/SegmentationDisplayTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export default class CircleScissorsTool extends BaseTool {
|
|
|
7
7
|
annotation: any;
|
|
8
8
|
segmentation: any;
|
|
9
9
|
segmentIndex: number;
|
|
10
|
-
|
|
10
|
+
segmentationId: string;
|
|
11
11
|
segmentsLocked: number[];
|
|
12
12
|
segmentColor: [number, number, number, number];
|
|
13
13
|
viewportIdsToRender: string[];
|
|
@@ -6,6 +6,7 @@ import { drawCircle as drawCircleSvg } from '../../drawingSvg';
|
|
|
6
6
|
import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
|
|
7
7
|
import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
|
|
8
8
|
import { segmentLocking, activeSegmentation, segmentIndex as segmentIndexController, segmentationColor, } from '../../stateManagement/segmentation';
|
|
9
|
+
import { getSegmentation } from '../../stateManagement/segmentation/segmentationState';
|
|
9
10
|
export default class CircleScissorsTool extends BaseTool {
|
|
10
11
|
constructor(toolProps = {}, defaultToolProps = {
|
|
11
12
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
@@ -29,14 +30,16 @@ export default class CircleScissorsTool extends BaseTool {
|
|
|
29
30
|
const camera = viewport.getCamera();
|
|
30
31
|
const { viewPlaneNormal, viewUp } = camera;
|
|
31
32
|
const toolGroupId = this.toolGroupId;
|
|
32
|
-
const
|
|
33
|
-
if (!
|
|
33
|
+
const activeSegmentationRepresentation = activeSegmentation.getActiveSegmentationRepresentation(toolGroupId);
|
|
34
|
+
if (!activeSegmentationRepresentation) {
|
|
34
35
|
throw new Error('No active segmentation detected, create one before using scissors tool');
|
|
35
36
|
}
|
|
36
|
-
const {
|
|
37
|
+
const { segmentationRepresentationUID, segmentationId, type } = activeSegmentationRepresentation;
|
|
37
38
|
const segmentIndex = segmentIndexController.getActiveSegmentIndex(toolGroupId);
|
|
38
|
-
const segmentsLocked = segmentLocking.getSegmentsLockedForSegmentation(
|
|
39
|
-
const segmentColor = segmentationColor.getColorForSegmentIndex(toolGroupId,
|
|
39
|
+
const segmentsLocked = segmentLocking.getSegmentsLockedForSegmentation(segmentationId);
|
|
40
|
+
const segmentColor = segmentationColor.getColorForSegmentIndex(toolGroupId, segmentationRepresentationUID, segmentIndex);
|
|
41
|
+
const { representations } = getSegmentation(segmentationId);
|
|
42
|
+
const { volumeId } = representations[type];
|
|
40
43
|
const segmentation = cache.getVolume(volumeId);
|
|
41
44
|
const annotation = {
|
|
42
45
|
invalidated: true,
|
|
@@ -64,7 +67,7 @@ export default class CircleScissorsTool extends BaseTool {
|
|
|
64
67
|
segmentation,
|
|
65
68
|
centerCanvas: canvasPos,
|
|
66
69
|
segmentIndex,
|
|
67
|
-
|
|
70
|
+
segmentationId,
|
|
68
71
|
segmentsLocked,
|
|
69
72
|
segmentColor,
|
|
70
73
|
viewportIdsToRender,
|
|
@@ -115,7 +118,7 @@ export default class CircleScissorsTool extends BaseTool {
|
|
|
115
118
|
this._mouseUpCallback = (evt) => {
|
|
116
119
|
const eventDetail = evt.detail;
|
|
117
120
|
const { element } = eventDetail;
|
|
118
|
-
const { annotation, newAnnotation, hasMoved, segmentation, segmentIndex, segmentsLocked,
|
|
121
|
+
const { annotation, newAnnotation, hasMoved, segmentation, segmentIndex, segmentsLocked, segmentationId, } = this.editData;
|
|
119
122
|
const { data } = annotation;
|
|
120
123
|
const { viewPlaneNormal, viewUp } = annotation.metadata;
|
|
121
124
|
if (newAnnotation && !hasMoved) {
|
|
@@ -138,8 +141,7 @@ export default class CircleScissorsTool extends BaseTool {
|
|
|
138
141
|
segmentIndex,
|
|
139
142
|
segmentsLocked,
|
|
140
143
|
viewPlaneNormal,
|
|
141
|
-
|
|
142
|
-
segmentationDataUID,
|
|
144
|
+
segmentationId,
|
|
143
145
|
viewUp,
|
|
144
146
|
};
|
|
145
147
|
this.applyActiveStrategy(enabledElement, operationData);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CircleScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/CircleScissorsTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAG7E,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAGlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,UAAU,IAAI,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAC9D,OAAO,EACL,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,6BAA6B,CAAA;AAEpC,OAAO,qCAAqC,MAAM,uDAAuD,CAAA;AACzG,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,YAAY,IAAI,sBAAsB,EACtC,iBAAiB,GAClB,MAAM,oCAAoC,CAAA;
|
|
1
|
+
{"version":3,"file":"CircleScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/CircleScissorsTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,7 +58,7 @@ export default class RectangleRoiThresholdTool extends RectangleRoiTool {
|
|
|
58
58
|
points: Types.Point3[];
|
|
59
59
|
activeHandleIndex: any;
|
|
60
60
|
};
|
|
61
|
-
|
|
61
|
+
segmentationId: any;
|
|
62
62
|
};
|
|
63
63
|
};
|
|
64
64
|
renderAnnotation: (enabledElement: Types.IEnabledElement, svgDrawingHelper: any) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RectangleRoiThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleRoiThresholdTool.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"RectangleRoiThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleRoiThresholdTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ export default class RectangleScissorsTool extends BaseTool {
|
|
|
6
6
|
_throttledCalculateCachedStats: any;
|
|
7
7
|
editData: {
|
|
8
8
|
annotation: any;
|
|
9
|
-
|
|
9
|
+
segmentationId: string;
|
|
10
10
|
segmentation: any;
|
|
11
11
|
segmentIndex: number;
|
|
12
12
|
segmentsLocked: number[];
|
|
@@ -9,6 +9,7 @@ import { drawRect as drawRectSvg } from '../../drawingSvg';
|
|
|
9
9
|
import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
|
|
10
10
|
import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
|
|
11
11
|
import { segmentationColor, segmentLocking, segmentIndex as segmentIndexController, activeSegmentation, } from '../../stateManagement/segmentation';
|
|
12
|
+
import { getSegmentation } from '../../stateManagement/segmentation/segmentationState';
|
|
12
13
|
export default class RectangleScissorsTool extends BaseTool {
|
|
13
14
|
constructor(toolProps = {}, defaultToolProps = {
|
|
14
15
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
@@ -32,14 +33,16 @@ export default class RectangleScissorsTool extends BaseTool {
|
|
|
32
33
|
const camera = viewport.getCamera();
|
|
33
34
|
const { viewPlaneNormal, viewUp } = camera;
|
|
34
35
|
const toolGroupId = this.toolGroupId;
|
|
35
|
-
const
|
|
36
|
-
if (!
|
|
36
|
+
const activeSegmentationRepresentation = activeSegmentation.getActiveSegmentationRepresentation(toolGroupId);
|
|
37
|
+
if (!activeSegmentationRepresentation) {
|
|
37
38
|
throw new Error('No active segmentation detected, create one before using scissors tool');
|
|
38
39
|
}
|
|
39
|
-
const {
|
|
40
|
+
const { segmentationRepresentationUID, segmentationId, type } = activeSegmentationRepresentation;
|
|
40
41
|
const segmentIndex = segmentIndexController.getActiveSegmentIndex(toolGroupId);
|
|
41
|
-
const segmentsLocked = segmentLocking.getSegmentsLockedForSegmentation(
|
|
42
|
-
const segmentColor = segmentationColor.getColorForSegmentIndex(toolGroupId,
|
|
42
|
+
const segmentsLocked = segmentLocking.getSegmentsLockedForSegmentation(segmentationId);
|
|
43
|
+
const segmentColor = segmentationColor.getColorForSegmentIndex(toolGroupId, segmentationRepresentationUID, segmentIndex);
|
|
44
|
+
const { representations } = getSegmentation(segmentationId);
|
|
45
|
+
const { volumeId } = representations[type];
|
|
43
46
|
const segmentation = cache.getVolume(volumeId);
|
|
44
47
|
const annotation = {
|
|
45
48
|
highlighted: true,
|
|
@@ -72,7 +75,7 @@ export default class RectangleScissorsTool extends BaseTool {
|
|
|
72
75
|
segmentIndex,
|
|
73
76
|
segmentsLocked,
|
|
74
77
|
segmentColor,
|
|
75
|
-
|
|
78
|
+
segmentationId,
|
|
76
79
|
viewportIdsToRender,
|
|
77
80
|
handleIndex: 3,
|
|
78
81
|
movingTextBox: false,
|
|
@@ -139,7 +142,7 @@ export default class RectangleScissorsTool extends BaseTool {
|
|
|
139
142
|
this._mouseUpCallback = (evt) => {
|
|
140
143
|
const eventDetail = evt.detail;
|
|
141
144
|
const { element } = eventDetail;
|
|
142
|
-
const { annotation, newAnnotation, hasMoved, segmentation,
|
|
145
|
+
const { annotation, newAnnotation, hasMoved, segmentation, segmentationId, segmentIndex, segmentsLocked, } = this.editData;
|
|
143
146
|
const { data } = annotation;
|
|
144
147
|
if (newAnnotation && !hasMoved) {
|
|
145
148
|
return;
|
|
@@ -158,10 +161,9 @@ export default class RectangleScissorsTool extends BaseTool {
|
|
|
158
161
|
const operationData = {
|
|
159
162
|
points: data.handles.points,
|
|
160
163
|
volume: segmentation,
|
|
161
|
-
|
|
164
|
+
segmentationId,
|
|
162
165
|
segmentIndex,
|
|
163
166
|
segmentsLocked,
|
|
164
|
-
toolGroupId: this.toolGroupId,
|
|
165
167
|
};
|
|
166
168
|
this.applyActiveStrategy(enabledElement, operationData);
|
|
167
169
|
};
|