@cornerstonejs/tools 0.4.2 → 0.4.3
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/eventListeners/segmentation/segmentationDataModifiedEventListener.js +2 -2
- package/dist/cjs/eventListeners/segmentation/segmentationDataModifiedEventListener.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/SegmentationStateManager.d.ts +2 -2
- package/dist/cjs/stateManagement/segmentation/SegmentationStateManager.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/helpers/normalizeSegmentationInput.js +1 -1
- package/dist/cjs/stateManagement/segmentation/helpers/normalizeSegmentationInput.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/helpers/validateSegmentationInput.js +1 -1
- package/dist/cjs/stateManagement/segmentation/helpers/validateSegmentationInput.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/segmentationState.d.ts +2 -2
- package/dist/cjs/stateManagement/segmentation/segmentationState.js.map +1 -1
- package/dist/cjs/tools/displayTools/Labelmap/labelmapDisplay.js +2 -2
- package/dist/cjs/tools/displayTools/Labelmap/labelmapDisplay.js.map +1 -1
- package/dist/cjs/tools/segmentation/BrushTool.js +2 -2
- package/dist/cjs/tools/segmentation/BrushTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/CircleScissorsTool.js +2 -2
- package/dist/cjs/tools/segmentation/CircleScissorsTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js +2 -2
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/SphereScissorsTool.js +2 -2
- package/dist/cjs/tools/segmentation/SphereScissorsTool.js.map +1 -1
- package/dist/cjs/types/LabelmapTypes.d.ts +1 -1
- package/dist/cjs/types/SegmentationStateTypes.d.ts +6 -5
- package/dist/cjs/utilities/segmentation/thresholdVolumeByRange.js +2 -2
- package/dist/cjs/utilities/segmentation/thresholdVolumeByRange.js.map +1 -1
- package/dist/esm/eventListeners/segmentation/segmentationDataModifiedEventListener.js +2 -2
- package/dist/esm/eventListeners/segmentation/segmentationDataModifiedEventListener.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/SegmentationStateManager.d.ts +2 -2
- package/dist/esm/stateManagement/segmentation/SegmentationStateManager.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/helpers/normalizeSegmentationInput.js +1 -1
- package/dist/esm/stateManagement/segmentation/helpers/normalizeSegmentationInput.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/helpers/validateSegmentationInput.js +1 -1
- package/dist/esm/stateManagement/segmentation/helpers/validateSegmentationInput.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/segmentationState.d.ts +2 -2
- package/dist/esm/stateManagement/segmentation/segmentationState.js +1 -1
- package/dist/esm/stateManagement/segmentation/segmentationState.js.map +1 -1
- package/dist/esm/tools/displayTools/Labelmap/labelmapDisplay.js +2 -2
- package/dist/esm/tools/displayTools/Labelmap/labelmapDisplay.js.map +1 -1
- package/dist/esm/tools/segmentation/BrushTool.js +2 -2
- package/dist/esm/tools/segmentation/BrushTool.js.map +1 -1
- package/dist/esm/tools/segmentation/CircleScissorsTool.js +2 -2
- package/dist/esm/tools/segmentation/CircleScissorsTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js +2 -2
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/esm/tools/segmentation/SphereScissorsTool.js +2 -2
- package/dist/esm/tools/segmentation/SphereScissorsTool.js.map +1 -1
- package/dist/esm/types/LabelmapTypes.d.ts +1 -1
- package/dist/esm/types/SegmentationStateTypes.d.ts +6 -5
- package/dist/esm/utilities/segmentation/thresholdVolumeByRange.js +2 -2
- package/dist/esm/utilities/segmentation/thresholdVolumeByRange.js.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import type { ColorLut, Segmentation, SegmentationPublicInput, SegmentationRepresentationConfig, ToolGroupSpecificRepresentation } from '../../types/SegmentationStateTypes';
|
|
1
|
+
import type { ColorLut, Segmentation, SegmentationPublicInput, SegmentationRepresentationConfig, ToolGroupSpecificRepresentation, ToolGroupSpecificRepresentations } from '../../types/SegmentationStateTypes';
|
|
2
2
|
declare function getDefaultSegmentationStateManager(): import("./SegmentationStateManager").default;
|
|
3
3
|
declare function getSegmentation(segmentationId: string): Segmentation | undefined;
|
|
4
4
|
declare function getSegmentations(): Segmentation[] | [];
|
|
5
5
|
declare function addSegmentation(segmentationInput: SegmentationPublicInput, suppressEvents?: boolean): void;
|
|
6
|
-
declare function getSegmentationRepresentations(toolGroupId: string):
|
|
6
|
+
declare function getSegmentationRepresentations(toolGroupId: string): ToolGroupSpecificRepresentations | [];
|
|
7
7
|
declare function getToolGroupsWithSegmentation(segmentationId: string): string[];
|
|
8
8
|
declare function getToolGroupSpecificConfig(toolGroupId: string): SegmentationRepresentationConfig;
|
|
9
9
|
declare function setToolGroupSpecificConfig(toolGroupId: string, config: SegmentationRepresentationConfig, suppressEvents?: boolean): void;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { defaultSegmentationStateManager } from './SegmentationStateManager';
|
|
2
2
|
import { triggerSegmentationRepresentationModified, triggerSegmentationModified, triggerSegmentationRepresentationRemoved, } from './triggerSegmentationEvents';
|
|
3
|
-
import { getDefaultRepresentationConfig
|
|
3
|
+
import { getDefaultRepresentationConfig } from '../../utilities/segmentation';
|
|
4
4
|
import normalizeSegmentationInput from './helpers/normalizeSegmentationInput';
|
|
5
5
|
function getDefaultSegmentationStateManager() {
|
|
6
6
|
return defaultSegmentationStateManager;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segmentationState.js","sourceRoot":"","sources":["../../../../src/stateManagement/segmentation/segmentationState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,MAAM,4BAA4B,CAAA;AAC5E,OAAO,EACL,yCAAyC,EACzC,2BAA2B,EAC3B,wCAAwC,GACzC,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"segmentationState.js","sourceRoot":"","sources":["../../../../src/stateManagement/segmentation/segmentationState.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ const labelMapConfigCache = new Map();
|
|
|
12
12
|
async function addSegmentationRepresentation(toolGroupId, representationInput, toolGroupSpecificConfig) {
|
|
13
13
|
const { segmentationId } = representationInput;
|
|
14
14
|
const segmentation = SegmentationState.getSegmentation(segmentationId);
|
|
15
|
-
const { volumeId } = segmentation.
|
|
15
|
+
const { volumeId } = segmentation.representationData[Representations.Labelmap];
|
|
16
16
|
const segmentationRepresentationUID = utilities.uuidv4();
|
|
17
17
|
await _addLabelmapToToolGroupViewports(toolGroupId, volumeId, segmentationRepresentationUID);
|
|
18
18
|
const segmentsHidden = new Set();
|
|
@@ -54,7 +54,7 @@ function removeSegmentationRepresentation(toolGroupId, segmentationRepresentatio
|
|
|
54
54
|
function render(viewport, representation, toolGroupConfig) {
|
|
55
55
|
const { colorLUTIndex, active, segmentationId, segmentationRepresentationUID, visibility, config: renderingConfig, } = representation;
|
|
56
56
|
const segmentation = SegmentationState.getSegmentation(segmentationId);
|
|
57
|
-
const labelmapData = segmentation.
|
|
57
|
+
const labelmapData = segmentation.representationData[Representations.Labelmap];
|
|
58
58
|
const { volumeId: labelmapUID } = labelmapData;
|
|
59
59
|
const labelmap = cache.getVolume(labelmapUID);
|
|
60
60
|
if (!labelmap) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"labelmapDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Labelmap/labelmapDisplay.ts"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,MAAM,qDAAqD,CAAA;AAC1F,OAAO,oBAAoB,MAAM,mDAAmD,CAAA;AAEpF,OAAO,EACL,KAAK,EACL,sBAAsB,EAEtB,SAAS,GACV,MAAM,qBAAqB,CAAA;AAE5B,OAAO,KAAK,iBAAiB,MAAM,yDAAyD,CAAA;AAC5F,OAAO,eAAe,MAAM,4CAA4C,CAAA;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAQ9D,OAAO,oBAAoB,MAAM,wBAAwB,CAAA;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAE9C,OAAO,yBAAyB,MAAM,6BAA6B,CAAA;AAEnE,MAAM,iBAAiB,GAAG,GAAG,CAAA;AAC7B,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAE,CAAA;AASrC,KAAK,UAAU,6BAA6B,CAC1C,WAAmB,EACnB,mBAA8C,EAC9C,uBAA0D;IAE1D,MAAM,EAAE,cAAc,EAAE,GAAG,mBAAmB,CAAA;IAC9C,MAAM,YAAY,GAAG,iBAAiB,CAAC,eAAe,CAAC,cAAc,CAAC,CAAA;IACtE,MAAM,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"labelmapDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Labelmap/labelmapDisplay.ts"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,MAAM,qDAAqD,CAAA;AAC1F,OAAO,oBAAoB,MAAM,mDAAmD,CAAA;AAEpF,OAAO,EACL,KAAK,EACL,sBAAsB,EAEtB,SAAS,GACV,MAAM,qBAAqB,CAAA;AAE5B,OAAO,KAAK,iBAAiB,MAAM,yDAAyD,CAAA;AAC5F,OAAO,eAAe,MAAM,4CAA4C,CAAA;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAQ9D,OAAO,oBAAoB,MAAM,wBAAwB,CAAA;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAE9C,OAAO,yBAAyB,MAAM,6BAA6B,CAAA;AAEnE,MAAM,iBAAiB,GAAG,GAAG,CAAA;AAC7B,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAE,CAAA;AASrC,KAAK,UAAU,6BAA6B,CAC1C,WAAmB,EACnB,mBAA8C,EAC9C,uBAA0D;IAE1D,MAAM,EAAE,cAAc,EAAE,GAAG,mBAAmB,CAAA;IAC9C,MAAM,YAAY,GAAG,iBAAiB,CAAC,eAAe,CAAC,cAAc,CAAC,CAAA;IACtE,MAAM,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC,kBAAkB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;IAC9E,MAAM,6BAA6B,GAAG,SAAS,CAAC,MAAM,EAAE,CAAA;IAGxD,MAAM,gCAAgC,CACpC,WAAW,EACX,QAAQ,EACR,6BAA6B,CAC9B,CAAA;IAGD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAiB,CAAA;IAC/C,MAAM,UAAU,GAAG,IAAI,CAAA;IACvB,MAAM,aAAa,GAAG,CAAC,CAAA;IACvB,MAAM,MAAM,GAAG,IAAI,CAAA;IACnB,MAAM,IAAI,GAAG,wBAAwB,CAAC,WAAW,EAAE,CAAA;IACnD,MAAM,IAAI,GAAG,oBAAoB,CAAC,WAAW,EAAE,CAAA;IAE/C,MAAM,+BAA+B,GAAoC;QACvE,cAAc;QACd,6BAA6B;QAC7B,IAAI,EAAE,eAAe,CAAC,QAAQ;QAC9B,cAAc;QACd,UAAU;QACV,aAAa;QACb,MAAM;QACN,MAAM,EAAE;YACN,IAAI;YACJ,IAAI;SACL;KACF,CAAA;IAGD,IAAI,uBAAuB,EAAE;QAI3B,MAAM,cAAc,GAAG,IAAI,CAAA;QAC3B,MAAM,sBAAsB,GAC1B,iBAAiB,CAAC,0BAA0B,CAAC,WAAW,CAAC,CAAA;QAE3D,MAAM,YAAY,GAAG,SAAS,CAC5B,sBAAsB,EACtB,uBAAuB,CACxB,CAAA;QAED,iBAAiB,CAAC,0BAA0B,CAC1C,WAAW,EACX;YACE,2BAA2B,EACzB,YAAY,CAAC,2BAA2B,IAAI,IAAI;YAClD,eAAe,EAAE;gBACf,GAAG,YAAY,CAAC,eAAe;aAChC;SACF,EACD,cAAc,CACf,CAAA;KACF;IAED,iBAAiB,CAAC,6BAA6B,CAC7C,WAAW,EACX,+BAA+B,CAChC,CAAA;AACH,CAAC;AASD,SAAS,gCAAgC,CACvC,WAAmB,EACnB,6BAAqC;IAErC,qCAAqC,CACnC,WAAW,EACX,6BAA6B,CAC9B,CAAA;IACD,iBAAiB,CAAC,gCAAgC,CAChD,WAAW,EACX,6BAA6B,CAC9B,CAAA;AACH,CAAC;AASD,SAAS,MAAM,CACb,QAAyB,EACzB,cAA+C,EAC/C,eAAiD;IAEjD,MAAM,EACJ,aAAa,EACb,MAAM,EACN,cAAc,EACd,6BAA6B,EAC7B,UAAU,EACV,MAAM,EAAE,eAAe,GACxB,GAAG,cAAc,CAAA;IAElB,MAAM,YAAY,GAAG,iBAAiB,CAAC,eAAe,CAAC,cAAc,CAAC,CAAA;IACtE,MAAM,YAAY,GAAG,YAAY,CAAC,kBAAkB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;IAC9E,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,YAAY,CAAA;IAE9C,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IAE7C,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,WAAW,EAAE,CAAC,CAAA;KAClE;IAED,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAA;IAC9D,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,CAAC,IAAI,CAAC,+BAA+B,EAAE,6BAA6B,CAAC,CAAA;QAC5E,OAAM;KACP;IAED,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,eAAe,CAAA;IACtC,MAAM,cAAc,GAClB,eAAe,CAAC,eAAe,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;IAC3D,MAAM,2BAA2B,GAC/B,eAAe,CAAC,2BAA2B,CAAA;IAE7C,2BAA2B,CACzB,QAAQ,CAAC,EAAE,EACX,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,aAAa,EACb,cAAc,EACd,MAAM,EACN,2BAA2B,EAC3B,UAAU,CACX,CAAA;AACH,CAAC;AAED,SAAS,2BAA2B,CAClC,UAAkB,EAClB,KAAuB,EACvB,IAA8B,EAC9B,IAA0B,EAC1B,aAAqB,EACrB,cAA8B,EAC9B,gBAAyB,EACzB,2BAAoC,EACpC,UAAU,GAAG,IAAI;IAEjB,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAEnB,MAAM,SAAS,GAAG,gBAAgB;QAChC,CAAC,CAAC,cAAc,CAAC,SAAS;QAC1B,CAAC,CAAC,cAAc,CAAC,iBAAiB,CAAA;IACpC,MAAM,YAAY,GAAG,gBAAgB;QACnC,CAAC,CAAC,cAAc,CAAC,kBAAkB;QACnC,CAAC,CAAC,cAAc,CAAC,oBAAoB,CAAA;IAKvC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,aAAa,CAAC,CAAA;IAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;IAChD,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,KAAK,CAAA;IAElC,MAAM,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,4BAA4B,CACzE,UAAU,EACV,GAAG,EACH,SAAS,EACT,aAAa,CACd,CAAA;IAED,IAAI,eAAe,EAAE;QACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;YAClC,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;YACzB,IAAI,CAAC,WAAW,CACd,CAAC,EACD,KAAK,CAAC,CAAC,CAAC,GAAG,iBAAiB,EAC5B,KAAK,CAAC,CAAC,CAAC,GAAG,iBAAiB,EAC5B,KAAK,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAC7B,CAAA;SACF;QACD,WAAW,CAAC,WAAW,EAAE,CAAC,sBAAsB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;KAC1D;IAED,IAAI,iBAAiB,EAAE;QACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;YAClC,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;YAGzB,MAAM,cAAc,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,SAAS,CAAA;YACnD,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;SACjC;QACD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;QACvB,WAAW,CAAC,WAAW,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;KACpD;IAED,WAAW,CAAC,WAAW,EAAE,CAAC,6BAA6B,EAAE,CAAA;IAEzD,WAAW,CAAC,WAAW,EAAE,CAAC,kBAAkB,CAAC,cAAc,CAAC,aAAa,CAAC,CAAA;IAC1E,WAAW,CAAC,WAAW,EAAE,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAA;IAKhE,MAAM,OAAO,GACX,UAAU,IAAI,CAAC,gBAAgB,IAAI,2BAA2B,CAAC,CAAA;IACjE,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;AACpC,CAAC;AAED,SAAS,4BAA4B,CACnC,UAAkB,EAClB,QAAgB,EAChB,SAAiB,EACjB,aAAqB;IAErB,MAAM,QAAQ,GAAG,GAAG,UAAU,IAAI,QAAQ,EAAE,CAAA;IAC5C,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAEhD,IAAI,eAAe,GAAG,KAAK,CAAA;IAC3B,IAAI,iBAAiB,GAAG,KAAK,CAAA;IAE7B,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE;QAChC,SAAS;QACT,aAAa;KACd,CAAC,CAAA;IAEF,IAAI,CAAC,MAAM,EAAE;QACX,eAAe,GAAG,IAAI,CAAA;QACtB,iBAAiB,GAAG,IAAI,CAAA;KACzB;IAED,IAAI,MAAM,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE;QAC5C,iBAAiB,GAAG,IAAI,CAAA;KACzB;IAED,IAAI,MAAM,IAAI,MAAM,CAAC,aAAa,KAAK,aAAa,EAAE;QACpD,eAAe,GAAG,IAAI,CAAA;KACvB;IAED,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,CAAA;AAC/C,CAAC;AAED,SAAS,qCAAqC,CAC5C,WAAmB,EACnB,6BAAqC;IAErC,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,CAAC,CAAA;IAE3C,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,8BAA8B,WAAW,iBAAiB,CAAC,CAAA;KAC5E;IAED,MAAM,EAAE,aAAa,EAAE,GAAG,SAAS,CAAA;IAEnC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACxC,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,YAAY,CAAA;QACtD,MAAM,cAAc,GAAG,sBAAsB,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAA;QAC5E,yBAAyB,CACvB,cAAc,CAAC,QAAQ,CAAC,OAAO,EAC/B,6BAA6B,CAC9B,CAAA;KACF;AACH,CAAC;AAED,KAAK,UAAU,gCAAgC,CAC7C,WAAmB,EACnB,QAAgB,EAChB,6BAAqC;IAErC,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,CAAe,CAAA;IACzD,MAAM,EAAE,aAAa,EAAE,GAAG,SAAS,CAAA;IAEnC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACxC,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,YAAY,CAAA;QACtD,MAAM,cAAc,GAAG,sBAAsB,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAA;QAE5E,IAAI,CAAC,cAAc,EAAE;YACnB,MAAM,IAAI,KAAK,CACb,kDAAkD,iBAAiB,kBAAkB,UAAU,EAAE,CAClG,CAAA;SACF;QAED,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAA;QACnC,oBAAoB,CAClB,QAAQ,CAAC,OAAO,EAChB,QAAQ,EACR,6BAA6B,CAC9B,CAAA;KACF;AACH,CAAC;AAED,eAAe;IACb,MAAM;IACN,6BAA6B;IAC7B,gCAAgC;CACjC,CAAA"}
|
|
@@ -38,8 +38,8 @@ export default class BrushTool extends BaseTool {
|
|
|
38
38
|
const segmentIndex = segmentIndexController.getActiveSegmentIndex(toolGroupId);
|
|
39
39
|
const segmentsLocked = segmentLocking.getSegmentsLockedForSegmentation(segmentationId);
|
|
40
40
|
const segmentColor = segmentationColor.getColorForSegmentIndex(toolGroupId, segmentationRepresentationUID, segmentIndex);
|
|
41
|
-
const {
|
|
42
|
-
const { volumeId } =
|
|
41
|
+
const { representationData } = segmentationState.getSegmentation(segmentationId);
|
|
42
|
+
const { volumeId } = representationData[type];
|
|
43
43
|
const segmentation = cache.getVolume(volumeId);
|
|
44
44
|
const brushCursor = {
|
|
45
45
|
metadata: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrushTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/BrushTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAI7E,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAElC,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,sCAAsC,MAAM,uDAAuD,CAAA;AAC1G,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,YAAY,IAAI,sBAAsB,EACtC,KAAK,IAAI,iBAAiB,EAC1B,kBAAkB,GACnB,MAAM,oCAAoC,CAAA;AAK3C,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,QAAQ;IAwB7C,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,UAAU,EAAE;gBACV,WAAW,EAAE,gBAAgB;aAE9B;YACD,eAAe,EAAE,aAAa;YAC9B,cAAc,EAAE,aAAa;YAC7B,SAAS,EAAE,EAAE;SACd;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAA;QAGpC,yBAAoB,GAAG,CACrB,GAA0C,EACjC,EAAE;YACX,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAA;YAC5B,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,SAAS,CAAA;YAC5C,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAA;YACpC,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAA;YAEtC,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAA;YACjD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,cAAc,CAAA;YAEpD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAA;YAEtB,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAA;YACnC,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;YAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;YAEpC,MAAM,gCAAgC,GACpC,kBAAkB,CAAC,mCAAmC,CAAC,WAAW,CAAC,CAAA;YACrE,IAAI,CAAC,gCAAgC,EAAE;gBACrC,MAAM,IAAI,KAAK,CACb,yEAAyE,CAC1E,CAAA;aACF;YAED,MAAM,EAAE,6BAA6B,EAAE,cAAc,EAAE,IAAI,EAAE,GAC3D,gCAAgC,CAAA;YAClC,MAAM,YAAY,GAChB,sBAAsB,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAA;YAC3D,MAAM,cAAc,GAClB,cAAc,CAAC,gCAAgC,CAAC,cAAc,CAAC,CAAA;YACjE,MAAM,YAAY,GAAG,iBAAiB,CAAC,uBAAuB,CAC5D,WAAW,EACX,6BAA6B,EAC7B,YAAY,CACb,CAAA;YAED,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"BrushTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/BrushTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,8 +38,8 @@ export default class CircleScissorsTool extends BaseTool {
|
|
|
38
38
|
const segmentIndex = segmentIndexController.getActiveSegmentIndex(toolGroupId);
|
|
39
39
|
const segmentsLocked = segmentLocking.getSegmentsLockedForSegmentation(segmentationId);
|
|
40
40
|
const segmentColor = segmentationColor.getColorForSegmentIndex(toolGroupId, segmentationRepresentationUID, segmentIndex);
|
|
41
|
-
const {
|
|
42
|
-
const { volumeId } =
|
|
41
|
+
const { representationData } = getSegmentation(segmentationId);
|
|
42
|
+
const { volumeId } = representationData[type];
|
|
43
43
|
const segmentation = cache.getVolume(volumeId);
|
|
44
44
|
const annotation = {
|
|
45
45
|
invalidated: true,
|
|
@@ -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;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,sDAAsD,CAAA;AAQtF,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,QAAQ;IAmBtD,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,UAAU,EAAE;gBACV,WAAW,EAAE,gBAAgB;aAE9B;YACD,eAAe,EAAE,aAAa;YAC9B,cAAc,EAAE,aAAa;SAC9B;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAA;QAWpC,yBAAoB,GAAG,CACrB,GAA0C,EACjC,EAAE;YACX,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAA;YAC9B,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;YAC9C,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAA;YACpC,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAA;YAEtC,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAA;YACjD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,cAAc,CAAA;YAEpD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;YAErB,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAA;YACnC,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;YAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;YAEpC,MAAM,gCAAgC,GACpC,kBAAkB,CAAC,mCAAmC,CAAC,WAAW,CAAC,CAAA;YACrE,IAAI,CAAC,gCAAgC,EAAE;gBACrC,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAA;aACF;YAED,MAAM,EAAE,6BAA6B,EAAE,cAAc,EAAE,IAAI,EAAE,GAC3D,gCAAgC,CAAA;YAClC,MAAM,YAAY,GAChB,sBAAsB,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAA;YAC3D,MAAM,cAAc,GAClB,cAAc,CAAC,gCAAgC,CAAC,cAAc,CAAC,CAAA;YAEjE,MAAM,YAAY,GAAG,iBAAiB,CAAC,uBAAuB,CAC5D,WAAW,EACX,6BAA6B,EAC7B,YAAY,CACb,CAAA;YAED,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"CircleScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/CircleScissorsTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,8 +41,8 @@ export default class RectangleScissorsTool extends BaseTool {
|
|
|
41
41
|
const segmentIndex = segmentIndexController.getActiveSegmentIndex(toolGroupId);
|
|
42
42
|
const segmentsLocked = segmentLocking.getSegmentsLockedForSegmentation(segmentationId);
|
|
43
43
|
const segmentColor = segmentationColor.getColorForSegmentIndex(toolGroupId, segmentationRepresentationUID, segmentIndex);
|
|
44
|
-
const {
|
|
45
|
-
const { volumeId } =
|
|
44
|
+
const { representationData } = getSegmentation(segmentationId);
|
|
45
|
+
const { volumeId } = representationData[type];
|
|
46
46
|
const segmentation = cache.getVolume(volumeId);
|
|
47
47
|
const annotation = {
|
|
48
48
|
highlighted: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RectangleScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleScissorsTool.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,iBAAiB,EACjB,QAAQ,EACR,aAAa,GACd,MAAM,qBAAqB,CAAA;AAG5B,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAA;AAEhF,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,gBAAgB,MAAM,gCAAgC,CAAA;AAC7D,OAAO,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC1D,OAAO,EACL,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,6BAA6B,CAAA;AAEpC,OAAO,qCAAqC,MAAM,uDAAuD,CAAA;AACzG,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,YAAY,IAAI,sBAAsB,EACtC,kBAAkB,GACnB,MAAM,oCAAoC,CAAA;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,sDAAsD,CAAA;AAStF,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,QAAQ;IAmBzD,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,UAAU,EAAE;gBACV,WAAW,EAAE,mBAAmB;gBAChC,YAAY,EAAE,oBAAoB;aACnC;YACD,eAAe,EAAE,aAAa;YAC9B,cAAc,EAAE,aAAa;SAC9B;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAA;QAWpC,yBAAoB,GAAG,CACrB,GAA0C,EACjC,EAAE;YACX,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAA;YAC9B,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;YAC9C,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAA;YAEpC,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAA;YACjD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,cAAc,CAAA;YAEpD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;YAErB,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAA;YACnC,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;YAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;YAEpC,MAAM,gCAAgC,GACpC,kBAAkB,CAAC,mCAAmC,CAAC,WAAW,CAAC,CAAA;YACrE,IAAI,CAAC,gCAAgC,EAAE;gBACrC,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAA;aACF;YAED,MAAM,EAAE,6BAA6B,EAAE,cAAc,EAAE,IAAI,EAAE,GAC3D,gCAAgC,CAAA;YAClC,MAAM,YAAY,GAChB,sBAAsB,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAA;YAC3D,MAAM,cAAc,GAClB,cAAc,CAAC,gCAAgC,CAAC,cAAc,CAAC,CAAA;YAEjE,MAAM,YAAY,GAAG,iBAAiB,CAAC,uBAAuB,CAC5D,WAAW,EACX,6BAA6B,EAC7B,YAAY,CACb,CAAA;YAED,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"RectangleScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleScissorsTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,8 +38,8 @@ export default class SphereScissorsTool extends BaseTool {
|
|
|
38
38
|
const segmentIndex = segmentIndexController.getActiveSegmentIndex(toolGroupId);
|
|
39
39
|
const segmentsLocked = segmentLocking.getSegmentsLockedForSegmentation(segmentationId);
|
|
40
40
|
const segmentColor = segmentationColor.getColorForSegmentIndex(toolGroupId, segmentationRepresentationUID, segmentIndex);
|
|
41
|
-
const {
|
|
42
|
-
const { volumeId } =
|
|
41
|
+
const { representationData } = getSegmentation(segmentationId);
|
|
42
|
+
const { volumeId } = representationData[type];
|
|
43
43
|
const segmentation = cache.getVolume(volumeId);
|
|
44
44
|
this.isDrawing = true;
|
|
45
45
|
const annotation = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SphereScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/SphereScissorsTool.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,iBAAiB,EACjB,cAAc,EACd,YAAY,IAAI,sBAAsB,EACtC,kBAAkB,GACnB,MAAM,oCAAoC,CAAA;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,sDAAsD,CAAA;AAUtF,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,QAAQ;IAoBtD,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,UAAU,EAAE;gBACV,WAAW,EAAE,gBAAgB;aAC9B;YACD,eAAe,EAAE,aAAa;YAC9B,cAAc,EAAE,aAAa;SAC9B;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAA;QAWpC,yBAAoB,GAAG,CAAC,GAA0C,EAAQ,EAAE;YAC1E,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAA;YAC9B,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;YAC9C,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAA;YACpC,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAA;YAEtC,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAA;YACjD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,cAAc,CAAA;YAEpD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;YAErB,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAA;YACnC,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;YAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;YAEpC,MAAM,gCAAgC,GACpC,kBAAkB,CAAC,mCAAmC,CAAC,WAAW,CAAC,CAAA;YACrE,IAAI,CAAC,gCAAgC,EAAE;gBACrC,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAA;aACF;YAED,MAAM,EAAE,6BAA6B,EAAE,cAAc,EAAE,IAAI,EAAE,GAC3D,gCAAgC,CAAA;YAClC,MAAM,YAAY,GAChB,sBAAsB,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAA;YAC3D,MAAM,cAAc,GAClB,cAAc,CAAC,gCAAgC,CAAC,cAAc,CAAC,CAAA;YAEjE,MAAM,YAAY,GAAG,iBAAiB,CAAC,uBAAuB,CAC5D,WAAW,EACX,6BAA6B,EAC7B,YAAY,CACb,CAAA;YAED,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"SphereScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/SphereScissorsTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export declare type LabelmapRenderingConfig = {
|
|
|
13
13
|
cfun?: vtkColorTransferFunction;
|
|
14
14
|
ofun?: vtkPiecewiseFunction;
|
|
15
15
|
};
|
|
16
|
-
export declare type
|
|
16
|
+
export declare type LabelmapSegmentationData = {
|
|
17
17
|
volumeId: string;
|
|
18
18
|
referencedVolumeId?: string;
|
|
19
19
|
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as Enums from '../enums';
|
|
2
|
-
import type { labelmapConfig,
|
|
2
|
+
import type { labelmapConfig, LabelmapSegmentationData, LabelmapRenderingConfig } from './LabelmapTypes';
|
|
3
3
|
export declare type Color = [number, number, number, number];
|
|
4
4
|
export declare type ColorLut = Array<Color>;
|
|
5
5
|
export declare type RepresentationConfig = {
|
|
@@ -10,7 +10,7 @@ export declare type SegmentationRepresentationConfig = {
|
|
|
10
10
|
representations: RepresentationConfig;
|
|
11
11
|
};
|
|
12
12
|
export declare type SegmentationRepresentationData = {
|
|
13
|
-
LABELMAP?:
|
|
13
|
+
LABELMAP?: LabelmapSegmentationData;
|
|
14
14
|
};
|
|
15
15
|
export declare type Segmentation = {
|
|
16
16
|
segmentationId: string;
|
|
@@ -21,7 +21,7 @@ export declare type Segmentation = {
|
|
|
21
21
|
cachedStats: {
|
|
22
22
|
[key: string]: number;
|
|
23
23
|
};
|
|
24
|
-
|
|
24
|
+
representationData: SegmentationRepresentationData;
|
|
25
25
|
};
|
|
26
26
|
export declare type ToolGroupSpecificRepresentationState = {
|
|
27
27
|
segmentationRepresentationUID: string;
|
|
@@ -36,13 +36,14 @@ export declare type ToolGroupSpecificLabelmapRepresentation = ToolGroupSpecificR
|
|
|
36
36
|
config: LabelmapRenderingConfig;
|
|
37
37
|
};
|
|
38
38
|
export declare type ToolGroupSpecificRepresentation = ToolGroupSpecificLabelmapRepresentation;
|
|
39
|
+
export declare type ToolGroupSpecificRepresentations = Array<ToolGroupSpecificRepresentation>;
|
|
39
40
|
export declare type SegmentationState = {
|
|
40
41
|
colorLut: ColorLut[];
|
|
41
42
|
segmentations: Segmentation[];
|
|
42
43
|
globalConfig: SegmentationRepresentationConfig;
|
|
43
44
|
toolGroups: {
|
|
44
45
|
[key: string]: {
|
|
45
|
-
segmentationRepresentations:
|
|
46
|
+
segmentationRepresentations: ToolGroupSpecificRepresentations;
|
|
46
47
|
config: SegmentationRepresentationConfig;
|
|
47
48
|
};
|
|
48
49
|
};
|
|
@@ -51,7 +52,7 @@ export declare type SegmentationPublicInput = {
|
|
|
51
52
|
segmentationId: string;
|
|
52
53
|
representation: {
|
|
53
54
|
type: Enums.SegmentationRepresentations;
|
|
54
|
-
data:
|
|
55
|
+
data: LabelmapSegmentationData;
|
|
55
56
|
};
|
|
56
57
|
};
|
|
57
58
|
export declare type RepresentationPublicInput = {
|
|
@@ -13,8 +13,8 @@ function thresholdVolumeByRange(annotations, referenceVolumes, segmentationRepre
|
|
|
13
13
|
if (!segmentation) {
|
|
14
14
|
throw new Error('No Segmentation Found');
|
|
15
15
|
}
|
|
16
|
-
const { type,
|
|
17
|
-
const { volumeId } =
|
|
16
|
+
const { type, representationData } = segmentation;
|
|
17
|
+
const { volumeId } = representationData[type];
|
|
18
18
|
const segmentationVolume = cache.getVolume(volumeId);
|
|
19
19
|
const { scalarData, imageData: segmentationImageData } = segmentationVolume;
|
|
20
20
|
const { lowerThreshold, higherThreshold, numSlicesToProject, overwrite } = options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thresholdVolumeByRange.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/thresholdVolumeByRange.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAG3C,OAAO,EACL,yBAAyB,EACzB,6BAA6B,GAC9B,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AACtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,8DAA8D,CAAA;AAE9G,OAAO,wBAAwB,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,iBAAiB,MAAM,sDAAsD,CAAA;AAiCzF,SAAS,sBAAsB,CAC7B,WAAwC,EACxC,gBAAsC,EACtC,0BAA2D,EAC3D,OAA8B;IAE9B,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAA;KAC3E;IAED,MAAM,YAAY,GAAG,iBAAiB,CAAC,eAAe,CACpD,0BAA0B,CAAC,cAAc,CAC1C,CAAA;IACD,MAAM,EAAE,cAAc,EAAE,GAAG,0BAA0B,CAAA;IAErD,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;KACzC;IAED,MAAM,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"thresholdVolumeByRange.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/thresholdVolumeByRange.ts"],"names":[],"mappings":"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"}
|