@cornerstonejs/tools 1.65.2 → 1.65.4
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/enums/StrategyCallbacks.d.ts +2 -1
- package/dist/cjs/enums/StrategyCallbacks.js +1 -0
- package/dist/cjs/enums/StrategyCallbacks.js.map +1 -1
- package/dist/cjs/stateManagement/annotation/annotationSelection.js +2 -1
- package/dist/cjs/stateManagement/annotation/annotationSelection.js.map +1 -1
- package/dist/cjs/tools/MIPJumpToClickTool.js +2 -1
- package/dist/cjs/tools/MIPJumpToClickTool.js.map +1 -1
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.js +2 -1
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.js.map +1 -1
- package/dist/cjs/tools/base/AnnotationDisplayTool.js +2 -1
- package/dist/cjs/tools/base/AnnotationDisplayTool.js.map +1 -1
- package/dist/cjs/tools/base/AnnotationTool.js +2 -1
- package/dist/cjs/tools/base/AnnotationTool.js.map +1 -1
- package/dist/cjs/tools/base/BaseTool.js +2 -1
- package/dist/cjs/tools/base/BaseTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/BrushTool.js +16 -4
- package/dist/cjs/tools/segmentation/BrushTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/BrushStrategy.d.ts +3 -0
- package/dist/cjs/tools/segmentation/strategies/BrushStrategy.js +1 -0
- package/dist/cjs/tools/segmentation/strategies/BrushStrategy.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/compositions/dynamicThreshold.d.ts +1 -0
- package/dist/cjs/tools/segmentation/strategies/compositions/dynamicThreshold.js +20 -0
- package/dist/cjs/tools/segmentation/strategies/compositions/dynamicThreshold.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/compositions/index.d.ts +1 -0
- package/dist/cjs/utilities/getVolumeId.d.ts +1 -0
- package/dist/cjs/utilities/getVolumeId.js +16 -0
- package/dist/cjs/utilities/getVolumeId.js.map +1 -0
- package/dist/esm/enums/StrategyCallbacks.js +1 -0
- package/dist/esm/enums/StrategyCallbacks.js.map +1 -1
- package/dist/esm/stateManagement/annotation/annotationSelection.js +1 -1
- package/dist/esm/stateManagement/annotation/annotationSelection.js.map +1 -1
- package/dist/esm/tools/MIPJumpToClickTool.js +2 -1
- package/dist/esm/tools/MIPJumpToClickTool.js.map +1 -1
- package/dist/esm/tools/StackScrollToolMouseWheelTool.js +2 -1
- package/dist/esm/tools/StackScrollToolMouseWheelTool.js.map +1 -1
- package/dist/esm/tools/base/AnnotationDisplayTool.js +2 -1
- package/dist/esm/tools/base/AnnotationDisplayTool.js.map +1 -1
- package/dist/esm/tools/base/AnnotationTool.js +2 -1
- package/dist/esm/tools/base/AnnotationTool.js.map +1 -1
- package/dist/esm/tools/base/BaseTool.js +2 -1
- package/dist/esm/tools/base/BaseTool.js.map +1 -1
- package/dist/esm/tools/segmentation/BrushTool.js +16 -4
- package/dist/esm/tools/segmentation/BrushTool.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/BrushStrategy.js +1 -0
- package/dist/esm/tools/segmentation/strategies/BrushStrategy.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/compositions/dynamicThreshold.js +20 -0
- package/dist/esm/tools/segmentation/strategies/compositions/dynamicThreshold.js.map +1 -1
- package/dist/esm/utilities/getVolumeId.js +12 -0
- package/dist/esm/utilities/getVolumeId.js.map +1 -0
- package/dist/types/enums/StrategyCallbacks.d.ts +2 -1
- package/dist/types/enums/StrategyCallbacks.d.ts.map +1 -1
- package/dist/types/tools/MIPJumpToClickTool.d.ts.map +1 -1
- package/dist/types/tools/StackScrollToolMouseWheelTool.d.ts.map +1 -1
- package/dist/types/tools/base/AnnotationDisplayTool.d.ts.map +1 -1
- package/dist/types/tools/base/AnnotationTool.d.ts.map +1 -1
- package/dist/types/tools/base/BaseTool.d.ts.map +1 -1
- package/dist/types/tools/segmentation/BrushTool.d.ts.map +1 -1
- package/dist/types/tools/segmentation/strategies/BrushStrategy.d.ts +3 -0
- package/dist/types/tools/segmentation/strategies/BrushStrategy.d.ts.map +1 -1
- package/dist/types/tools/segmentation/strategies/compositions/dynamicThreshold.d.ts +1 -0
- package/dist/types/tools/segmentation/strategies/compositions/dynamicThreshold.d.ts.map +1 -1
- package/dist/types/tools/segmentation/strategies/compositions/index.d.ts +1 -0
- package/dist/types/tools/segmentation/strategies/compositions/index.d.ts.map +1 -1
- package/dist/types/utilities/getVolumeId.d.ts +2 -0
- package/dist/types/utilities/getVolumeId.d.ts.map +1 -0
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +3 -3
- package/src/enums/StrategyCallbacks.ts +3 -0
- package/src/stateManagement/annotation/annotationSelection.ts +1 -1
- package/src/tools/MIPJumpToClickTool.ts +2 -1
- package/src/tools/StackScrollToolMouseWheelTool.ts +2 -1
- package/src/tools/base/AnnotationDisplayTool.ts +2 -1
- package/src/tools/base/AnnotationTool.ts +2 -1
- package/src/tools/base/BaseTool.ts +2 -1
- package/src/tools/segmentation/BrushTool.ts +21 -5
- package/src/tools/segmentation/strategies/BrushStrategy.ts +4 -0
- package/src/tools/segmentation/strategies/compositions/dynamicThreshold.ts +43 -0
- package/src/utilities/getVolumeId.ts +13 -0
|
@@ -8,6 +8,7 @@ declare enum StrategyCallbacks {
|
|
|
8
8
|
StrategyFunction = "strategyFunction",
|
|
9
9
|
CreateIsInThreshold = "createIsInThreshold",
|
|
10
10
|
Initialize = "initialize",
|
|
11
|
-
INTERNAL_setValue = "setValue"
|
|
11
|
+
INTERNAL_setValue = "setValue",
|
|
12
|
+
ComputeInnerCircleRadius = "computeInnerCircleRadius"
|
|
12
13
|
}
|
|
13
14
|
export default StrategyCallbacks;
|
|
@@ -12,6 +12,7 @@ var StrategyCallbacks;
|
|
|
12
12
|
StrategyCallbacks["CreateIsInThreshold"] = "createIsInThreshold";
|
|
13
13
|
StrategyCallbacks["Initialize"] = "initialize";
|
|
14
14
|
StrategyCallbacks["INTERNAL_setValue"] = "setValue";
|
|
15
|
+
StrategyCallbacks["ComputeInnerCircleRadius"] = "computeInnerCircleRadius";
|
|
15
16
|
})(StrategyCallbacks || (StrategyCallbacks = {}));
|
|
16
17
|
exports.default = StrategyCallbacks;
|
|
17
18
|
//# sourceMappingURL=StrategyCallbacks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StrategyCallbacks.js","sourceRoot":"","sources":["../../../src/enums/StrategyCallbacks.ts"],"names":[],"mappings":";;AAIA,IAAK,
|
|
1
|
+
{"version":3,"file":"StrategyCallbacks.js","sourceRoot":"","sources":["../../../src/enums/StrategyCallbacks.ts"],"names":[],"mappings":";;AAIA,IAAK,iBAgDJ;AAhDD,WAAK,iBAAiB;IAMpB,8DAAyC,CAAA;IAKzC,0DAAqC,CAAA;IAMrC,wCAAmB,CAAA;IACnB,oDAA+B,CAAA;IAC/B,oDAA+B,CAAA;IAK/B,kCAAa,CAAA;IAKb,0DAAqC,CAAA;IAMrC,gEAA2C,CAAA;IAM3C,8CAAyB,CAAA;IAGzB,mDAA8B,CAAA;IAG9B,0EAAqD,CAAA;AACvD,CAAC,EAhDI,iBAAiB,KAAjB,iBAAiB,QAgDrB;AAED,kBAAe,iBAAiB,CAAC"}
|
|
@@ -44,8 +44,9 @@ function getAnnotationsSelected() {
|
|
|
44
44
|
exports.getAnnotationsSelected = getAnnotationsSelected;
|
|
45
45
|
function getAnnotationsSelectedByToolName(toolName) {
|
|
46
46
|
return getAnnotationsSelected().filter((annotationUID) => {
|
|
47
|
+
var _a;
|
|
47
48
|
const annotation = (0, annotationState_1.getAnnotation)(annotationUID);
|
|
48
|
-
return annotation.metadata.toolName === toolName;
|
|
49
|
+
return ((_a = annotation === null || annotation === void 0 ? void 0 : annotation.metadata) === null || _a === void 0 ? void 0 : _a.toolName) === toolName;
|
|
49
50
|
});
|
|
50
51
|
}
|
|
51
52
|
exports.getAnnotationsSelectedByToolName = getAnnotationsSelectedByToolName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotationSelection.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationSelection.ts"],"names":[],"mappings":";;;AAAA,8CAAgE;AAChE,uCAAqC;AAErC,uDAAkD;AAMlD,MAAM,sBAAsB,GAAgB,IAAI,GAAG,EAAE,CAAC;AAiBtD,SAAS,qBAAqB,CAC5B,aAAqB,EACrB,QAAQ,GAAG,IAAI,EACf,gBAAgB,GAAG,KAAK;IAExB,IAAI,QAAQ,EAAE;QACZ,gBAAgB,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;KACnD;SAAM;QACL,kBAAkB,CAAC,aAAa,CAAC,CAAC;KACnC;AACH,CAAC;AAwHC,sDAAqB;AA7GvB,SAAS,gBAAgB,CACvB,aAAqB,EACrB,gBAAgB,GAAG,KAAK;IAExB,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,IAAI,CAAC,gBAAgB,EAAE;QACrB,iBAAiB,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;KACnD;IACD,IAAI,aAAa,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;QAC/D,sBAAsB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;KAClC;IACD,OAAO,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;AAC1C,CAAC;AAQD,SAAS,kBAAkB,CAAC,aAAsB;IAChD,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,IAAI,aAAa,EAAE;QACjB,IAAI,sBAAsB,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;YAChD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACpC;KACF;SAAM;QACL,iBAAiB,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;KACnD;IACD,OAAO,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;AAC1C,CAAC;AAkFC,gDAAkB;AA5EpB,SAAS,sBAAsB;IAC7B,OAAO,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;AAC5C,CAAC;AAuEC,wDAAsB;AAhExB,SAAS,gCAAgC,CAAC,QAAgB;IACxD,OAAO,sBAAsB,EAAE,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"annotationSelection.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationSelection.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ const core_1 = require("@cornerstonejs/core");
|
|
|
8
8
|
const planar_1 = require("../utilities/planar");
|
|
9
9
|
const jumpToWorld_1 = __importDefault(require("../utilities/viewport/jumpToWorld"));
|
|
10
10
|
const ToolGroupManager_1 = require("../store/ToolGroupManager");
|
|
11
|
+
const getVolumeId_1 = require("../utilities/getVolumeId");
|
|
11
12
|
class MIPJumpToClickTool extends base_1.BaseTool {
|
|
12
13
|
constructor(toolProps = {}, defaultToolProps = {
|
|
13
14
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
@@ -25,7 +26,7 @@ class MIPJumpToClickTool extends base_1.BaseTool {
|
|
|
25
26
|
if (!targetId.startsWith('volumeId')) {
|
|
26
27
|
throw new Error(`MIPJumpToClickTool: targetId is not a volumeId, you should only use MIPJumpToClickTool with a volumeId as the targetId`);
|
|
27
28
|
}
|
|
28
|
-
const volumeId =
|
|
29
|
+
const volumeId = (0, getVolumeId_1.getVolumeId)(targetId);
|
|
29
30
|
let maxIntensity = -Infinity;
|
|
30
31
|
const maxFn = (intensity, point) => {
|
|
31
32
|
if (intensity > maxIntensity) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MIPJumpToClickTool.js","sourceRoot":"","sources":["../../../src/tools/MIPJumpToClickTool.ts"],"names":[],"mappings":";;;;;AAAA,iCAAkC;AAClC,8CAAwE;AAExE,gDAAwE;AACxE,oFAA4D;AAE5D,gEAAoE;
|
|
1
|
+
{"version":3,"file":"MIPJumpToClickTool.js","sourceRoot":"","sources":["../../../src/tools/MIPJumpToClickTool.ts"],"names":[],"mappings":";;;;;AAAA,iCAAkC;AAClC,8CAAwE;AAExE,gDAAwE;AACxE,oFAA4D;AAE5D,gEAAoE;AACpE,0DAAuD;AAQvD,MAAM,kBAAmB,SAAQ,eAAQ;IAKvC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,iBAAiB,EAAE,EAAE;SACtB;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACrC,CAAC;IAWD,kBAAkB,CAAC,GAAG;QACpB,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAG9C,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC;QAGrD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAiC,CAAC,CAAC;QAErE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CACb,wHAAwH,CACzH,CAAC;SACH;QAED,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,QAAQ,CAAC,CAAC;QAGvC,IAAI,YAAY,GAAG,CAAC,QAAQ,CAAC;QAC7B,MAAM,KAAK,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;YACjC,IAAI,SAAS,GAAG,YAAY,EAAE;gBAC5B,YAAY,GAAG,SAAS,CAAC;gBACzB,OAAO,KAAK,CAAC;aACd;QACH,CAAC,CAAC;QAGF,MAAM,cAAc,GAAG,IAAA,0CAAiC,EACtD,QAAiC,EACjC,aAAa,CAAC,KAAK,EACnB,QAAQ,EACR,KAAK,CACN,CAAC;QAEF,IAAI,CAAC,cAAc,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE;YAC7C,OAAO;SACR;QAED,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QAE9D,MAAM,SAAS,GAAG,eAAe,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;YAC7D,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,KAAI,CAAC,EAAE;gBAC1C,OAAO,IAAI,CAAC;aACb;YACD,MAAM,cAAc,GAAG,IAAA,0CAAuB,EAAC,EAAE,CAAC,EAAE,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC;YAC1E,IAAI,WAAW,IAAI,WAAW,MAAK,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,EAAE,CAAA,EAAE;gBACrD,OAAO,IAAI,CAAC;aACb;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QAGH,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAG7B,IAAI,QAAQ,YAAY,qBAAc,EAAE;gBACtC,IAAA,qBAAW,EAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;aACvC;iBAAM;gBACL,OAAO,CAAC,IAAI,CACV,wFAAwF,CACzF,CAAC;aACH;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,kBAAkB,CAAC,QAAQ,GAAG,oBAAoB,CAAC;AACnD,kBAAe,kBAAkB,CAAC"}
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const core_1 = require("@cornerstonejs/core");
|
|
7
7
|
const base_1 = require("./base");
|
|
8
8
|
const scroll_1 = __importDefault(require("../utilities/scroll"));
|
|
9
|
+
const getVolumeId_1 = require("../utilities/getVolumeId");
|
|
9
10
|
class StackScrollMouseWheelTool extends base_1.BaseTool {
|
|
10
11
|
constructor(toolProps = {}, defaultToolProps = {
|
|
11
12
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
@@ -25,7 +26,7 @@ class StackScrollMouseWheelTool extends base_1.BaseTool {
|
|
|
25
26
|
const { viewport } = (0, core_1.getEnabledElement)(element);
|
|
26
27
|
const delta = direction * (invert ? -1 : 1);
|
|
27
28
|
const targetId = this.getTargetId(viewport);
|
|
28
|
-
const volumeId =
|
|
29
|
+
const volumeId = (0, getVolumeId_1.getVolumeId)(targetId);
|
|
29
30
|
(0, scroll_1.default)(viewport, {
|
|
30
31
|
delta,
|
|
31
32
|
debounceLoading: this.configuration.debounceIfNotLoaded,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackScrollToolMouseWheelTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAAwD;AACxD,iCAAkC;AAElC,iEAAyC;
|
|
1
|
+
{"version":3,"file":"StackScrollToolMouseWheelTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAAwD;AACxD,iCAAkC;AAElC,iEAAyC;AACzC,0DAAuD;AAMvD,MAAM,yBAA0B,SAAQ,eAAQ;IAK9C,YACE,SAAS,GAAG,EAAE,EACd,gBAAgB,GAAG;QACjB,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,MAAM,EAAE,KAAK;YACb,mBAAmB,EAAE,IAAI;YACzB,IAAI,EAAE,KAAK;YACX,WAAW,EAAE,KAAK;SACnB;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACrC,CAAC;IAED,kBAAkB,CAAC,GAAwB;QACzC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QACtC,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;QAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QACtC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,QAAQ,CAAC,CAAC;QAEvC,IAAA,gBAAM,EAAC,QAAQ,EAAE;YACf,KAAK;YACL,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,mBAAmB;YACvD,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI;YAC7B,QAAQ;YACR,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,WAAW;SAC5C,CAAC,CAAC;IACL,CAAC;CACF;AAED,yBAAyB,CAAC,QAAQ,GAAG,uBAAuB,CAAC;AAC7D,kBAAe,yBAAyB,CAAC"}
|
|
@@ -10,6 +10,7 @@ const triggerAnnotationRender_1 = __importDefault(require("../../utilities/trigg
|
|
|
10
10
|
const filterAnnotationsForDisplay_1 = __importDefault(require("../../utilities/planar/filterAnnotationsForDisplay"));
|
|
11
11
|
const helpers_1 = require("../../stateManagement/annotation/config/helpers");
|
|
12
12
|
const config_1 = require("../../stateManagement/annotation/config");
|
|
13
|
+
const getVolumeId_1 = require("../../utilities/getVolumeId");
|
|
13
14
|
class AnnotationDisplayTool extends BaseTool_1.default {
|
|
14
15
|
constructor() {
|
|
15
16
|
super(...arguments);
|
|
@@ -57,7 +58,7 @@ class AnnotationDisplayTool extends BaseTool_1.default {
|
|
|
57
58
|
referencedImageId = targetId.split('videoId:')[1];
|
|
58
59
|
}
|
|
59
60
|
else {
|
|
60
|
-
const volumeId =
|
|
61
|
+
const volumeId = (0, getVolumeId_1.getVolumeId)(targetId);
|
|
61
62
|
const imageVolume = core_1.cache.getVolume(volumeId);
|
|
62
63
|
referencedImageId = core_1.utilities.getClosestImageId(imageVolume, worldPos, viewPlaneNormal);
|
|
63
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationDisplayTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAM6B;AAG7B,0DAAkC;AAClC,sFAAwF;AAExF,sGAA8E;AAC9E,qHAA6F;AAC7F,6EAAmF;AACnF,oEAAmE;
|
|
1
|
+
{"version":3,"file":"AnnotationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationDisplayTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const annotationLocking_1 = require("../../stateManagement/annotation/annotation
|
|
|
10
10
|
const annotationVisibility_1 = require("../../stateManagement/annotation/annotationVisibility");
|
|
11
11
|
const annotationState_1 = require("../../stateManagement/annotation/annotationState");
|
|
12
12
|
const state_1 = require("../../stateManagement/annotation/helpers/state");
|
|
13
|
+
const getVolumeId_1 = require("../../utilities/getVolumeId");
|
|
13
14
|
class AnnotationTool extends AnnotationDisplayTool_1.default {
|
|
14
15
|
constructor(toolProps, defaultToolProps) {
|
|
15
16
|
var _a, _b;
|
|
@@ -140,7 +141,7 @@ class AnnotationTool extends AnnotationDisplayTool_1.default {
|
|
|
140
141
|
isSuvScaled(viewport, targetId, imageId) {
|
|
141
142
|
var _a;
|
|
142
143
|
if (viewport instanceof core_1.BaseVolumeViewport) {
|
|
143
|
-
const volumeId =
|
|
144
|
+
const volumeId = (0, getVolumeId_1.getVolumeId)(targetId);
|
|
144
145
|
const volume = core_1.cache.getVolume(volumeId);
|
|
145
146
|
return ((_a = volume.scaling) === null || _a === void 0 ? void 0 : _a.PT) !== undefined;
|
|
146
147
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAM6B;AAG7B,yCAAiC;AAEjC,oFAA4D;AAC5D,0FAAwF;AACxF,gGAA4F;AAU5F,sFAAiF;AAEjF,0EAA2F;
|
|
1
|
+
{"version":3,"file":"AnnotationTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const core_1 = require("@cornerstonejs/core");
|
|
7
7
|
const ToolModes_1 = __importDefault(require("../../enums/ToolModes"));
|
|
8
|
+
const getVolumeId_1 = require("../../utilities/getVolumeId");
|
|
8
9
|
class BaseTool {
|
|
9
10
|
constructor(toolProps, defaultToolProps) {
|
|
10
11
|
const initialProps = core_1.utilities.deepMerge(defaultToolProps, toolProps);
|
|
@@ -70,7 +71,7 @@ class BaseTool {
|
|
|
70
71
|
return viewports[0].getImageData();
|
|
71
72
|
}
|
|
72
73
|
else if (targetId.startsWith('volumeId:')) {
|
|
73
|
-
const volumeId =
|
|
74
|
+
const volumeId = (0, getVolumeId_1.getVolumeId)(targetId);
|
|
74
75
|
const viewports = core_1.utilities.getViewportsWithVolumeId(volumeId, renderingEngine.id);
|
|
75
76
|
if (!viewports || !viewports.length) {
|
|
76
77
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAAoE;AAEpE,sEAA8C;
|
|
1
|
+
{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,7 @@ class BrushTool extends base_1.BaseTool {
|
|
|
31
31
|
strategySpecificConfiguration: {
|
|
32
32
|
THRESHOLD: {
|
|
33
33
|
threshold: [-150, -70],
|
|
34
|
+
dynamicRadius: 0,
|
|
34
35
|
},
|
|
35
36
|
},
|
|
36
37
|
defaultStrategy: 'FILL_INSIDE_CIRCLE',
|
|
@@ -44,7 +45,6 @@ class BrushTool extends base_1.BaseTool {
|
|
|
44
45
|
dragMoveDistance: 4,
|
|
45
46
|
dragTimeMs: 500,
|
|
46
47
|
},
|
|
47
|
-
centerRadius: 2,
|
|
48
48
|
actions: {
|
|
49
49
|
[enums_1.StrategyCallbacks.AcceptPreview]: {
|
|
50
50
|
method: enums_1.StrategyCallbacks.AcceptPreview,
|
|
@@ -343,6 +343,14 @@ class BrushTool extends base_1.BaseTool {
|
|
|
343
343
|
leftCursorInWorld,
|
|
344
344
|
rightCursorInWorld,
|
|
345
345
|
];
|
|
346
|
+
const activeStrategy = this.configuration.activeStrategy;
|
|
347
|
+
const strategy = this.configuration.strategies[activeStrategy];
|
|
348
|
+
if (typeof strategy.computeInnerCircleRadius === 'function') {
|
|
349
|
+
strategy.computeInnerCircleRadius({
|
|
350
|
+
configuration: this.configuration,
|
|
351
|
+
viewport,
|
|
352
|
+
});
|
|
353
|
+
}
|
|
346
354
|
data.invalidated = false;
|
|
347
355
|
}
|
|
348
356
|
rejectPreview(element = this._previewData.element) {
|
|
@@ -412,10 +420,14 @@ class BrushTool extends base_1.BaseTool {
|
|
|
412
420
|
(0, drawingSvg_1.drawCircle)(svgDrawingHelper, annotationUID, circleUID, center, radius, {
|
|
413
421
|
color,
|
|
414
422
|
});
|
|
415
|
-
const
|
|
416
|
-
|
|
423
|
+
const activeStrategy = this.configuration.activeStrategy;
|
|
424
|
+
const { dynamicRadiusInCanvas } = this.configuration
|
|
425
|
+
.strategySpecificConfiguration[activeStrategy] || {
|
|
426
|
+
dynamicRadiusInCanvas: 0,
|
|
427
|
+
};
|
|
428
|
+
if (dynamicRadiusInCanvas) {
|
|
417
429
|
const circleUID1 = '1';
|
|
418
|
-
(0, drawingSvg_1.drawCircle)(svgDrawingHelper, annotationUID, circleUID1, center,
|
|
430
|
+
(0, drawingSvg_1.drawCircle)(svgDrawingHelper, annotationUID, circleUID1, center, dynamicRadiusInCanvas, {
|
|
419
431
|
color,
|
|
420
432
|
});
|
|
421
433
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrushTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/BrushTool.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"BrushTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/BrushTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ export declare type InitializedOperationData = LabelmapToolOperationDataAny & {
|
|
|
15
15
|
previewVoxelManager: csUtils.VoxelManager<number>;
|
|
16
16
|
previewSegmentIndex?: number;
|
|
17
17
|
brushStrategy: BrushStrategy;
|
|
18
|
+
configuration?: Record<string, any>;
|
|
18
19
|
};
|
|
19
20
|
export declare type StrategyFunction = (operationData: InitializedOperationData, ...args: any[]) => unknown;
|
|
20
21
|
export declare type CompositionInstance = {
|
|
@@ -31,6 +32,7 @@ export default class BrushStrategy {
|
|
|
31
32
|
dynamicThreshold: {
|
|
32
33
|
initialize: (operationData: InitializedOperationData) => void;
|
|
33
34
|
onInteractionStart: (operationData: InitializedOperationData) => void;
|
|
35
|
+
computeInnerCircleRadius: (operationData: InitializedOperationData) => void;
|
|
34
36
|
};
|
|
35
37
|
erase: {
|
|
36
38
|
initialize: (operationData: InitializedOperationData) => void;
|
|
@@ -67,6 +69,7 @@ export default class BrushStrategy {
|
|
|
67
69
|
rejectPreview: (brushStrategy: any, func: any) => void;
|
|
68
70
|
setValue: (brushStrategy: any, func: any) => void;
|
|
69
71
|
preview: (brushStrategy: any, func: any) => void;
|
|
72
|
+
computeInnerCircleRadius: (brushStrategy: any, func: any) => void;
|
|
70
73
|
compositions: any;
|
|
71
74
|
};
|
|
72
75
|
compositions: Composition[];
|
|
@@ -113,6 +113,7 @@ BrushStrategy.childFunctions = {
|
|
|
113
113
|
[enums_1.StrategyCallbacks.RejectPreview]: addListMethod(enums_1.StrategyCallbacks.RejectPreview, enums_1.StrategyCallbacks.Initialize),
|
|
114
114
|
[enums_1.StrategyCallbacks.INTERNAL_setValue]: addSingletonMethod(enums_1.StrategyCallbacks.INTERNAL_setValue),
|
|
115
115
|
[enums_1.StrategyCallbacks.Preview]: addSingletonMethod(enums_1.StrategyCallbacks.Preview, false),
|
|
116
|
+
[enums_1.StrategyCallbacks.ComputeInnerCircleRadius]: addListMethod(enums_1.StrategyCallbacks.ComputeInnerCircleRadius),
|
|
116
117
|
compositions: null,
|
|
117
118
|
};
|
|
118
119
|
function addListMethod(name, createInitialized) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrushStrategy.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/BrushStrategy.ts"],"names":[],"mappings":";;;;;AACA,8CAAkE;AAElE,+GAAkH;AAClH,kEAA0C;AAC1C,6DAA0D;AAC1D,+DAAgE;AAChE,0CAAmD;AAOnD,MAAM,EAAE,YAAY,EAAE,GAAG,gBAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"BrushStrategy.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/BrushStrategy.ts"],"names":[],"mappings":";;;;;AACA,8CAAkE;AAElE,+GAAkH;AAClH,kEAA0C;AAC1C,6DAA0D;AAC1D,+DAAgE;AAChE,0CAAmD;AAOnD,MAAM,EAAE,YAAY,EAAE,GAAG,gBAAO,CAAC;AA+DjC,MAAqB,aAAa;IAqDhC,YAAY,IAAI,EAAE,GAAG,YAA2B;QALtC,gBAAW,GAAG,EAAE,CAAC;QACjB,UAAK,GAAG,EAAE,CAAC;QAEX,wBAAmB,GAAG,EAAE,CAAC;QA+B5B,SAAI,GAAG,CACZ,cAAqC,EACrC,aAA2C,EAC3C,EAAE;YACF,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CACrC,cAAc,EACd,aAAa,EACb,yBAAiB,CAAC,IAAI,CACvB,CAAC;YAEF,IAAI,CAAC,eAAe,EAAE;gBAEpB,OAAO;aACR;YAED,MAAM,EAAE,6BAA6B,GAAG,EAAE,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC;YAG1E,IAAI,gBAAO,CAAC,OAAO,CAAC,SAAS,EAAE,6BAA6B,CAAC,SAAS,CAAC,EAAE;gBACvE,OAAO,aAAa,CAAC,OAAO,CAAC;aAC9B;iBAAM;gBACL,6BAA6B,CAAC,SAAS,GAAG,SAAS,CAAC;aACrD;YAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;YAEpD,MAAM,EACJ,wBAAwB,EACxB,mBAAmB,EACnB,mBAAmB,GACpB,GAAG,eAAe,CAAC;YAEpB,IAAA,2DAA+B,EAC7B,eAAe,CAAC,cAAc,EAC9B,wBAAwB,CAAC,gBAAgB,EAAE,CAC5C,CAAC;YAGF,IAAI,CAAC,mBAAmB,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,IAAI,EAAE;gBACpE,OAAO,IAAI,CAAC;aACb;YAED,OAAO,eAAe,CAAC,OAAO,IAAI,eAAe,CAAC;QACpD,CAAC,CAAC;QAuEK,uBAAkB,GAAG,CAC1B,cAAqC,EACrC,aAA2C,EAC3C,EAAE;YACF,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;YAGlC,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,EAAE;gBAC/B,OAAO,CAAC,kBAAkB,GAAG,KAAK,CAAC;gBACnC,OAAO;aACR;YACD,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;YACvE,IAAI,CAAC,eAAe,EAAE;gBAEpB,OAAO;aACR;YACD,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACxC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,CACjC,CAAC;QACJ,CAAC,CAAC;QAjKA,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC9B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YACnC,MAAM,MAAM,GACV,OAAO,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;YAClE,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO;aACR;YACD,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;gBACxB,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;oBACtC,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,sBAAsB,CAAC,CAAC;iBAC3D;gBACD,aAAa,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;aACtD;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,gBAAgB,GAAG,CAAC,cAAc,EAAE,aAAa,EAAE,EAAE,CACxD,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;QAE3C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE;YAC3D,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;SACxC;IACH,CAAC;IAoDS,UAAU,CAClB,cAAqC,EACrC,aAA2C,EAC3C,aAAsB;;QAEtB,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QACpC,MAAM,IAAI,GAAG,IAAA,iCAAe,EAAC,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;YAChD,OAAO,aAAa,CAAC,OAAO,CAAC;SAC9B;QAED,IAAI,IAAA,uCAAoB,EAAC,aAAa,EAAE,QAAQ,CAAC,EAAE;YACjD,MAAM,EAAE,kBAAkB,EAAE,QAAQ,EAAE,GACpC,aAAgD,CAAC;YAEnD,MAAM,YAAY,GAAG,YAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAE/C,IAAI,kBAAkB,EAAE;gBACtB,MAAM,WAAW,GAAG,YAAK,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;gBAExD,IACE,CAAC,gBAAO,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC;oBACjE,CAAC,gBAAO,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,EAAE,WAAW,CAAC,SAAS,CAAC,EAC/D;oBACA,MAAM,IAAI,KAAK,CACb,gGAAgG,CACjG,CAAC;iBACH;aACF;SACF;QAED,MAAM,EACJ,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,GACtB,GAAG,IAAI,CAAC;QACT,MAAM,mBAAmB,GACvB,CAAA,MAAA,aAAa,CAAC,OAAO,0CAAE,mBAAmB;YAC1C,YAAY,CAAC,yBAAyB,CAAC,wBAAwB,CAAC,CAAC;QACnE,MAAM,cAAc,GAAG,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC;QACrD,MAAM,mBAAmB,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;QAE7D,MAAM,eAAe,iCACnB,aAAa;YACb,mBAAmB,IAChB,aAAa,KAChB,cAAc;YACd,iBAAiB;YACjB,wBAAwB;YACxB,qBAAqB;YACrB,mBAAmB;YACnB,QAAQ,EAER,WAAW,EAAE,IAAI,EACjB,aAAa,EAAE,IAAI,GACpB,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;QAE1D,OAAO,eAAe,CAAC;IACzB,CAAC;;AA7LH,gCA6QC;AAxQe,0BAAY,GAAG,sBAAY,CAAC;AAEzB,4BAAc,GAAG;IAChC,CAAC,yBAAiB,CAAC,kBAAkB,CAAC,EAAE,aAAa,CACnD,yBAAiB,CAAC,kBAAkB,EACpC,yBAAiB,CAAC,UAAU,CAC7B;IACD,CAAC,yBAAiB,CAAC,gBAAgB,CAAC,EAAE,aAAa,CACjD,yBAAiB,CAAC,gBAAgB,EAClC,yBAAiB,CAAC,UAAU,CAC7B;IACD,CAAC,yBAAiB,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,yBAAiB,CAAC,IAAI,CAAC;IAC/D,CAAC,yBAAiB,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,yBAAiB,CAAC,UAAU,CAAC;IAC3E,CAAC,yBAAiB,CAAC,mBAAmB,CAAC,EAAE,kBAAkB,CACzD,yBAAiB,CAAC,mBAAmB,CACtC;IACD,CAAC,yBAAiB,CAAC,aAAa,CAAC,EAAE,aAAa,CAC9C,yBAAiB,CAAC,aAAa,EAC/B,yBAAiB,CAAC,UAAU,CAC7B;IACD,CAAC,yBAAiB,CAAC,aAAa,CAAC,EAAE,aAAa,CAC9C,yBAAiB,CAAC,aAAa,EAC/B,yBAAiB,CAAC,UAAU,CAC7B;IACD,CAAC,yBAAiB,CAAC,iBAAiB,CAAC,EAAE,kBAAkB,CACvD,yBAAiB,CAAC,iBAAiB,CACpC;IACD,CAAC,yBAAiB,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAC7C,yBAAiB,CAAC,OAAO,EACzB,KAAK,CACN;IACD,CAAC,yBAAiB,CAAC,wBAAwB,CAAC,EAAE,aAAa,CACzD,yBAAiB,CAAC,wBAAwB,CAC3C;IAGD,YAAY,EAAE,IAAI;CACnB,CAAC;AAwOJ,SAAS,aAAa,CAAC,IAAY,EAAE,iBAA0B;IAC7D,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC;IAC5B,OAAO,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE;QAC7B,aAAa,CAAC,QAAQ,MAAtB,aAAa,CAAC,QAAQ,IAAM,EAAE,EAAC;QAC/B,aAAa,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,aAAa,CAAC,IAAI,MAAlB,aAAa,CAAC,IAAI,IAAM,iBAAiB;YACvC,CAAC,CAAC,CAAC,cAAc,EAAE,aAAa,EAAE,EAAE;gBAChC,MAAM,eAAe,GAAG,aAAa,CAAC,iBAAiB,CAAC,CACtD,cAAc,EACd,aAAa,EACb,IAAI,CACL,CAAC;gBACF,aAAa,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACvC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,CAC1C,CAAC;YACJ,CAAC;YACH,CAAC,CAAC,CAAC,aAAa,EAAE,EAAE;gBAChB,aAAa,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACvC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,aAAa,CAAC,CACxC,CAAC;YACJ,CAAC,EAAC;IACR,CAAC,CAAC;AACJ,CAAC;AAKD,SAAS,kBAAkB,CAAC,IAAY,EAAE,aAAa,GAAG,IAAI;IAC5D,OAAO,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE;QAC7B,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,iBAAiB,CAAC,CAAC;SAChE;QACD,aAAa,CAAC,IAAI,CAAC,GAAG,aAAa;YACjC,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,CAAC,cAAc,EAAE,aAAa,EAAE,EAAE;gBAGhC,aAAa,CAAC,cAAc,GAAG,cAAc,CAAC;gBAC9C,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;YACjD,CAAC,CAAC;IACR,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -2,5 +2,6 @@ import type { InitializedOperationData } from '../BrushStrategy';
|
|
|
2
2
|
declare const _default: {
|
|
3
3
|
initialize: (operationData: InitializedOperationData) => void;
|
|
4
4
|
onInteractionStart: (operationData: InitializedOperationData) => void;
|
|
5
|
+
computeInnerCircleRadius: (operationData: InitializedOperationData) => void;
|
|
5
6
|
};
|
|
6
7
|
export default _default;
|
|
@@ -43,5 +43,25 @@ exports.default = {
|
|
|
43
43
|
}
|
|
44
44
|
strategySpecificConfiguration.THRESHOLD.threshold = null;
|
|
45
45
|
},
|
|
46
|
+
[StrategyCallbacks_1.default.ComputeInnerCircleRadius]: (operationData) => {
|
|
47
|
+
const { configuration, viewport } = operationData;
|
|
48
|
+
const { THRESHOLD: { dynamicRadius = 0 } = {} } = configuration.strategySpecificConfiguration || {};
|
|
49
|
+
const { spacing } = viewport.getImageData();
|
|
50
|
+
const centerCanvas = [
|
|
51
|
+
viewport.element.clientWidth / 2,
|
|
52
|
+
viewport.element.clientHeight / 2,
|
|
53
|
+
];
|
|
54
|
+
const radiusInWorld = dynamicRadius * spacing[0];
|
|
55
|
+
const centerCursorInWorld = viewport.canvasToWorld(centerCanvas);
|
|
56
|
+
const offSetCenterInWorld = centerCursorInWorld.map((coord) => coord + radiusInWorld);
|
|
57
|
+
const offSetCenterCanvas = viewport.worldToCanvas(offSetCenterInWorld);
|
|
58
|
+
const dynamicRadiusInCanvas = Math.abs(centerCanvas[0] - offSetCenterCanvas[0]);
|
|
59
|
+
const { strategySpecificConfiguration, activeStrategy } = configuration;
|
|
60
|
+
if (!strategySpecificConfiguration[activeStrategy]) {
|
|
61
|
+
strategySpecificConfiguration[activeStrategy] = {};
|
|
62
|
+
}
|
|
63
|
+
strategySpecificConfiguration[activeStrategy].dynamicRadiusInCanvas =
|
|
64
|
+
dynamicRadiusInCanvas;
|
|
65
|
+
},
|
|
46
66
|
};
|
|
47
67
|
//# sourceMappingURL=dynamicThreshold.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamicThreshold.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/compositions/dynamicThreshold.ts"],"names":[],"mappings":";;;;;AAAA,yCAAiC;
|
|
1
|
+
{"version":3,"file":"dynamicThreshold.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/compositions/dynamicThreshold.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ declare const _default: {
|
|
|
6
6
|
dynamicThreshold: {
|
|
7
7
|
initialize: (operationData: import("../BrushStrategy").InitializedOperationData) => void;
|
|
8
8
|
onInteractionStart: (operationData: import("../BrushStrategy").InitializedOperationData) => void;
|
|
9
|
+
computeInnerCircleRadius: (operationData: import("../BrushStrategy").InitializedOperationData) => void;
|
|
9
10
|
};
|
|
10
11
|
erase: {
|
|
11
12
|
initialize: (operationData: import("../BrushStrategy").InitializedOperationData) => void;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const getVolumeId: (targetId: string) => string;
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getVolumeId = void 0;
|
|
4
|
+
const getVolumeId = (targetId) => {
|
|
5
|
+
const prefix = 'volumeId:';
|
|
6
|
+
const str = targetId.includes(prefix)
|
|
7
|
+
? targetId.substring(prefix.length)
|
|
8
|
+
: targetId;
|
|
9
|
+
if (str.startsWith('nifti:')) {
|
|
10
|
+
return str;
|
|
11
|
+
}
|
|
12
|
+
const index = str.indexOf('?');
|
|
13
|
+
return index === -1 ? str : str.substring(0, index);
|
|
14
|
+
};
|
|
15
|
+
exports.getVolumeId = getVolumeId;
|
|
16
|
+
//# sourceMappingURL=getVolumeId.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getVolumeId.js","sourceRoot":"","sources":["../../../src/utilities/getVolumeId.ts"],"names":[],"mappings":";;;AAAO,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,EAAE;IAC9C,MAAM,MAAM,GAAG,WAAW,CAAC;IAC3B,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;QACnC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC;QACnC,CAAC,CAAC,QAAQ,CAAC;IAEb,IAAI,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC5B,OAAO,GAAG,CAAC;KACZ;IAED,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/B,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AACtD,CAAC,CAAC;AAZW,QAAA,WAAW,eAYtB"}
|
|
@@ -10,6 +10,7 @@ var StrategyCallbacks;
|
|
|
10
10
|
StrategyCallbacks["CreateIsInThreshold"] = "createIsInThreshold";
|
|
11
11
|
StrategyCallbacks["Initialize"] = "initialize";
|
|
12
12
|
StrategyCallbacks["INTERNAL_setValue"] = "setValue";
|
|
13
|
+
StrategyCallbacks["ComputeInnerCircleRadius"] = "computeInnerCircleRadius";
|
|
13
14
|
})(StrategyCallbacks || (StrategyCallbacks = {}));
|
|
14
15
|
export default StrategyCallbacks;
|
|
15
16
|
//# sourceMappingURL=StrategyCallbacks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StrategyCallbacks.js","sourceRoot":"","sources":["../../../src/enums/StrategyCallbacks.ts"],"names":[],"mappings":"AAIA,IAAK,
|
|
1
|
+
{"version":3,"file":"StrategyCallbacks.js","sourceRoot":"","sources":["../../../src/enums/StrategyCallbacks.ts"],"names":[],"mappings":"AAIA,IAAK,iBAgDJ;AAhDD,WAAK,iBAAiB;IAMpB,8DAAyC,CAAA;IAKzC,0DAAqC,CAAA;IAMrC,wCAAmB,CAAA;IACnB,oDAA+B,CAAA;IAC/B,oDAA+B,CAAA;IAK/B,kCAAa,CAAA;IAKb,0DAAqC,CAAA;IAMrC,gEAA2C,CAAA;IAM3C,8CAAyB,CAAA;IAGzB,mDAA8B,CAAA;IAG9B,0EAAqD,CAAA;AACvD,CAAC,EAhDI,iBAAiB,KAAjB,iBAAiB,QAgDrB;AAED,eAAe,iBAAiB,CAAC"}
|
|
@@ -39,7 +39,7 @@ function getAnnotationsSelected() {
|
|
|
39
39
|
function getAnnotationsSelectedByToolName(toolName) {
|
|
40
40
|
return getAnnotationsSelected().filter((annotationUID) => {
|
|
41
41
|
const annotation = getAnnotation(annotationUID);
|
|
42
|
-
return annotation
|
|
42
|
+
return annotation?.metadata?.toolName === toolName;
|
|
43
43
|
});
|
|
44
44
|
}
|
|
45
45
|
function isAnnotationSelected(annotationUID) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotationSelection.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationSelection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAMlD,MAAM,sBAAsB,GAAgB,IAAI,GAAG,EAAE,CAAC;AAiBtD,SAAS,qBAAqB,CAC5B,aAAqB,EACrB,QAAQ,GAAG,IAAI,EACf,gBAAgB,GAAG,KAAK;IAExB,IAAI,QAAQ,EAAE;QACZ,gBAAgB,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;KACnD;SAAM;QACL,kBAAkB,CAAC,aAAa,CAAC,CAAC;KACnC;AACH,CAAC;AAWD,SAAS,gBAAgB,CACvB,aAAqB,EACrB,gBAAgB,GAAG,KAAK;IAExB,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,IAAI,CAAC,gBAAgB,EAAE;QACrB,iBAAiB,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;KACnD;IACD,IAAI,aAAa,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;QAC/D,sBAAsB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;KAClC;IACD,OAAO,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;AAC1C,CAAC;AAQD,SAAS,kBAAkB,CAAC,aAAsB;IAChD,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,IAAI,aAAa,EAAE;QACjB,IAAI,sBAAsB,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;YAChD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACpC;KACF;SAAM;QACL,iBAAiB,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;KACnD;IACD,OAAO,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;AAC1C,CAAC;AAMD,SAAS,sBAAsB;IAC7B,OAAO,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;AAC5C,CAAC;AAOD,SAAS,gCAAgC,CAAC,QAAgB;IACxD,OAAO,sBAAsB,EAAE,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,EAAE;QACvD,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;QAChD,OAAO,UAAU,
|
|
1
|
+
{"version":3,"file":"annotationSelection.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationSelection.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { getEnabledElement, VolumeViewport } from '@cornerstonejs/core';
|
|
|
3
3
|
import { getPointInLineOfSightWithCriteria } from '../utilities/planar';
|
|
4
4
|
import jumpToWorld from '../utilities/viewport/jumpToWorld';
|
|
5
5
|
import { getToolGroupForViewport } from '../store/ToolGroupManager';
|
|
6
|
+
import { getVolumeId } from '../utilities/getVolumeId';
|
|
6
7
|
class MIPJumpToClickTool extends BaseTool {
|
|
7
8
|
constructor(toolProps = {}, defaultToolProps = {
|
|
8
9
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
@@ -20,7 +21,7 @@ class MIPJumpToClickTool extends BaseTool {
|
|
|
20
21
|
if (!targetId.startsWith('volumeId')) {
|
|
21
22
|
throw new Error(`MIPJumpToClickTool: targetId is not a volumeId, you should only use MIPJumpToClickTool with a volumeId as the targetId`);
|
|
22
23
|
}
|
|
23
|
-
const volumeId = targetId
|
|
24
|
+
const volumeId = getVolumeId(targetId);
|
|
24
25
|
let maxIntensity = -Infinity;
|
|
25
26
|
const maxFn = (intensity, point) => {
|
|
26
27
|
if (intensity > maxIntensity) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MIPJumpToClickTool.js","sourceRoot":"","sources":["../../../src/tools/MIPJumpToClickTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAExE,OAAO,EAAE,iCAAiC,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,WAAW,MAAM,mCAAmC,CAAC;AAE5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"MIPJumpToClickTool.js","sourceRoot":"","sources":["../../../src/tools/MIPJumpToClickTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAExE,OAAO,EAAE,iCAAiC,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,WAAW,MAAM,mCAAmC,CAAC;AAE5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAQvD,MAAM,kBAAmB,SAAQ,QAAQ;IAKvC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,iBAAiB,EAAE,EAAE;SACtB;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACrC,CAAC;IAWD,kBAAkB,CAAC,GAAG;QACpB,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAG9C,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC;QAGrD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAiC,CAAC,CAAC;QAErE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CACb,wHAAwH,CACzH,CAAC;SACH;QAED,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;QAGvC,IAAI,YAAY,GAAG,CAAC,QAAQ,CAAC;QAC7B,MAAM,KAAK,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;YACjC,IAAI,SAAS,GAAG,YAAY,EAAE;gBAC5B,YAAY,GAAG,SAAS,CAAC;gBACzB,OAAO,KAAK,CAAC;aACd;QACH,CAAC,CAAC;QAGF,MAAM,cAAc,GAAG,iCAAiC,CACtD,QAAiC,EACjC,aAAa,CAAC,KAAK,EACnB,QAAQ,EACR,KAAK,CACN,CAAC;QAEF,IAAI,CAAC,cAAc,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE;YAC7C,OAAO;SACR;QAED,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QAE9D,MAAM,SAAS,GAAG,eAAe,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;YAC7D,IAAI,iBAAiB,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;gBAC1C,OAAO,IAAI,CAAC;aACb;YACD,MAAM,cAAc,GAAG,uBAAuB,CAAC,EAAE,CAAC,EAAE,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC;YAC1E,IAAI,WAAW,IAAI,WAAW,KAAK,cAAc,EAAE,EAAE,EAAE;gBACrD,OAAO,IAAI,CAAC;aACb;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QAGH,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAG7B,IAAI,QAAQ,YAAY,cAAc,EAAE;gBACtC,WAAW,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;aACvC;iBAAM;gBACL,OAAO,CAAC,IAAI,CACV,wFAAwF,CACzF,CAAC;aACH;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,kBAAkB,CAAC,QAAQ,GAAG,oBAAoB,CAAC;AACnD,eAAe,kBAAkB,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { getEnabledElement } from '@cornerstonejs/core';
|
|
2
2
|
import { BaseTool } from './base';
|
|
3
3
|
import scroll from '../utilities/scroll';
|
|
4
|
+
import { getVolumeId } from '../utilities/getVolumeId';
|
|
4
5
|
class StackScrollMouseWheelTool extends BaseTool {
|
|
5
6
|
constructor(toolProps = {}, defaultToolProps = {
|
|
6
7
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
@@ -20,7 +21,7 @@ class StackScrollMouseWheelTool extends BaseTool {
|
|
|
20
21
|
const { viewport } = getEnabledElement(element);
|
|
21
22
|
const delta = direction * (invert ? -1 : 1);
|
|
22
23
|
const targetId = this.getTargetId(viewport);
|
|
23
|
-
const volumeId = targetId
|
|
24
|
+
const volumeId = getVolumeId(targetId);
|
|
24
25
|
scroll(viewport, {
|
|
25
26
|
delta,
|
|
26
27
|
debounceLoading: this.configuration.debounceIfNotLoaded,
|