@cornerstonejs/tools 0.63.3 → 0.65.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/tools/ZoomTool.js +6 -3
- package/dist/cjs/tools/ZoomTool.js.map +1 -1
- package/dist/cjs/tools/base/BaseTool.js +1 -1
- package/dist/cjs/tools/base/BaseTool.js.map +1 -1
- package/dist/cjs/tools/displayTools/Contour/addContourSetsToElement.js +4 -1
- package/dist/cjs/tools/displayTools/Contour/addContourSetsToElement.js.map +1 -1
- package/dist/cjs/tools/displayTools/Contour/updateContourSets.js +3 -1
- package/dist/cjs/tools/displayTools/Contour/updateContourSets.js.map +1 -1
- package/dist/esm/tools/ZoomTool.js +6 -3
- package/dist/esm/tools/ZoomTool.js.map +1 -1
- package/dist/esm/tools/base/BaseTool.js +2 -2
- package/dist/esm/tools/base/BaseTool.js.map +1 -1
- package/dist/esm/tools/displayTools/Contour/addContourSetsToElement.js +4 -1
- package/dist/esm/tools/displayTools/Contour/addContourSetsToElement.js.map +1 -1
- package/dist/esm/tools/displayTools/Contour/updateContourSets.js +3 -1
- package/dist/esm/tools/displayTools/Contour/updateContourSets.js.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +5 -5
- package/src/tools/ZoomTool.ts +6 -4
- package/src/tools/base/BaseTool.ts +6 -2
- package/src/tools/displayTools/Contour/addContourSetsToElement.ts +4 -1
- package/src/tools/displayTools/Contour/updateContourSets.ts +4 -2
|
@@ -16,6 +16,7 @@ class ZoomTool extends base_1.BaseTool {
|
|
|
16
16
|
maxZoomScale: 30,
|
|
17
17
|
pinchToZoom: true,
|
|
18
18
|
pan: true,
|
|
19
|
+
invert: false,
|
|
19
20
|
},
|
|
20
21
|
}) {
|
|
21
22
|
super(toolProps, defaultToolProps);
|
|
@@ -45,14 +46,14 @@ class ZoomTool extends base_1.BaseTool {
|
|
|
45
46
|
const size = [element.clientWidth, element.clientHeight];
|
|
46
47
|
const { parallelScale, focalPoint, position } = camera;
|
|
47
48
|
const zoomScale = 1.5 / size[1];
|
|
48
|
-
const k = deltaY * zoomScale;
|
|
49
|
+
const k = deltaY * zoomScale * (this.configuration.invert ? -1 : 1);
|
|
49
50
|
let parallelScaleToSet = (1.0 - k) * parallelScale;
|
|
50
51
|
let focalPointToSet = focalPoint;
|
|
51
52
|
let positionToSet = position;
|
|
52
53
|
if (!this.configuration.zoomToCenter) {
|
|
53
54
|
const distanceToCanvasCenter = gl_matrix_1.vec3.distance(focalPoint, this.initialMousePosWorld);
|
|
54
55
|
const zoomScale = 5 / size[1];
|
|
55
|
-
const k = deltaY * zoomScale;
|
|
56
|
+
const k = deltaY * zoomScale * (this.configuration.invert ? -1 : 1);
|
|
56
57
|
parallelScaleToSet = (1.0 - k) * parallelScale;
|
|
57
58
|
positionToSet = gl_matrix_1.vec3.scaleAndAdd(gl_matrix_1.vec3.create(), position, this.dirVec, -distanceToCanvasCenter * k);
|
|
58
59
|
focalPointToSet = gl_matrix_1.vec3.scaleAndAdd(gl_matrix_1.vec3.create(), focalPoint, this.dirVec, -distanceToCanvasCenter * k);
|
|
@@ -97,7 +98,9 @@ class ZoomTool extends base_1.BaseTool {
|
|
|
97
98
|
-viewPlaneNormal[1],
|
|
98
99
|
-viewPlaneNormal[2],
|
|
99
100
|
];
|
|
100
|
-
const k =
|
|
101
|
+
const k = this.configuration.invert
|
|
102
|
+
? deltaY / zoomScale
|
|
103
|
+
: deltaY * zoomScale;
|
|
101
104
|
let tmp = k * directionOfProjection[0];
|
|
102
105
|
position[0] += tmp;
|
|
103
106
|
focalPoint[0] += tmp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ZoomTool.js","sourceRoot":"","sources":["../../../src/tools/ZoomTool.ts"],"names":[],"mappings":";;;;;AAAA,yCAAiC;AACjC,4EAAuD;AACvD,8CAA+D;AAC/D,iCAAkC;AAQlC,MAAM,QAAS,SAAQ,eAAQ;
|
|
1
|
+
{"version":3,"file":"ZoomTool.js","sourceRoot":"","sources":["../../../src/tools/ZoomTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,7 +73,7 @@ class BaseTool {
|
|
|
73
73
|
if (viewport instanceof core_1.StackViewport) {
|
|
74
74
|
return `imageId:${viewport.getCurrentImageId()}`;
|
|
75
75
|
}
|
|
76
|
-
else if (viewport instanceof core_1.
|
|
76
|
+
else if (viewport instanceof core_1.BaseVolumeViewport) {
|
|
77
77
|
return `volumeId:${this.getTargetVolumeId(viewport)}`;
|
|
78
78
|
}
|
|
79
79
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":";;AAAA,8CAI6B;AAE7B,uCAAwC;AAyBxC,MAAe,QAAQ;IAUrB,YAAY,SAA0B,EAAE,gBAA2B;QACjE,MAAM,YAAY,GAAG,gBAAS,CAAC,SAAS,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;QAEtE,MAAM,EACJ,aAAa,GAAG,EAAE,EAClB,yBAAyB,EACzB,WAAW,GACZ,GAAG,YAAY,CAAC;QAGjB,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE;YAC7B,aAAa,CAAC,UAAU,GAAG,EAAE,CAAC;YAC9B,aAAa,CAAC,eAAe,GAAG,SAAS,CAAC;YAC1C,aAAa,CAAC,cAAc,GAAG,SAAS,CAAC;YACzC,aAAa,CAAC,eAAe,GAAG,EAAE,CAAC;SACpC;QAED,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,yBAAyB,GAAG,yBAAyB,IAAI,EAAE,CAAC;QACjE,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;QACtD,IAAI,CAAC,IAAI,GAAG,iBAAS,CAAC,QAAQ,CAAC;IACjC,CAAC;IAMM,WAAW;QAEhB,OAAyB,IAAI,CAAC,WAAY,CAAC,QAAQ,CAAC;IACtD,CAAC;IAQM,mBAAmB,CACxB,cAAqC,EACrC,aAAsB;QAEtB,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QAC1D,OAAO,UAAU,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;IAC9E,CAAC;IAMM,gBAAgB,CAAC,gBAAqC;QAC3D,IAAI,CAAC,aAAa,GAAG,gBAAS,CAAC,SAAS,CACtC,IAAI,CAAC,aAAa,EAClB,gBAAgB,CACjB,CAAC;IACJ,CAAC;IASM,iBAAiB,CAAC,YAAoB;QAC3C,IAAI,CAAC,gBAAgB,CAAC,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC,CAAC;IAC1D,CAAC;IAcO,iBAAiB,CAAC,QAAyB;;QACjD,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE;YAC/B,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;SACpC;QAID,MAAM,YAAY,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QAE1C,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO;SACR;QAGD,OAAO,MAAA,YAAY,CAAC,IAAI,CACtB,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,WAAW,CAChE,0CAAE,GAAG,CAAC;IACT,CAAC;IAUS,gBAAgB,CACxB,QAAgB,EAChB,eAAuC;QAEvC,IAAI,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,MAAM,QAAQ,GAAG,gBAAS,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI,SAAS,GAAG,gBAAS,CAAC,wBAAwB,CAChD,QAAQ,EACR,eAAe,CAAC,EAAE,CACnB,CAAC;YAEF,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;gBACnC,OAAO;aACR;YAED,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACxC,OAAO,QAAQ,CAAC,iBAAiB,EAAE,KAAK,OAAO,CAAC;YAClD,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;gBACnC,OAAO;aACR;YAED,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC;SACpC;aAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YAC3C,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAChD,MAAM,SAAS,GAAG,gBAAS,CAAC,wBAAwB,CAClD,QAAQ,EACR,eAAe,CAAC,EAAE,CACnB,CAAC;YAEF,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;gBACnC,OAAO;aACR;YAED,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC;SACpC;aAAM;YACL,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAC;SACH;IACH,CAAC;IAYS,WAAW,CAAC,QAAyB;QAC7C,IAAI,QAAQ,YAAY,oBAAa,EAAE;YACrC,OAAO,WAAW,QAAQ,CAAC,iBAAiB,EAAE,EAAE,CAAC;SAClD;aAAM,IAAI,QAAQ,YAAY,yBAAkB,EAAE;YACjD,OAAO,YAAY,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;SACvD;aAAM;YACL,MAAM,IAAI,KAAK,CACb,iEAAiE,CAClE,CAAC;SACH;IACH,CAAC;CACF;AAID,QAAQ,CAAC,QAAQ,GAAG,UAAU,CAAC;AAC/B,kBAAe,QAAQ,CAAC"}
|
|
@@ -62,7 +62,10 @@ function addContourSetsToElement(viewport, geometryIds, contourRepresentation, c
|
|
|
62
62
|
outlineWidthActive,
|
|
63
63
|
}));
|
|
64
64
|
actor.setForceOpaque(true);
|
|
65
|
-
viewport.addActor({
|
|
65
|
+
viewport.addActor({
|
|
66
|
+
uid: contourActorUID,
|
|
67
|
+
actor: actor,
|
|
68
|
+
});
|
|
66
69
|
viewport.resetCamera();
|
|
67
70
|
viewport.render();
|
|
68
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addContourSetsToElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/addContourSetsToElement.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"addContourSetsToElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/addContourSetsToElement.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAmD;AACnD,sFAAiE;AACjE,oGAA+E;AAC/E,iFAA4D;AAC5D,mFAA8D;AAE9D,mCAIiB;AAMjB,6DAAsE;AAEtE,SAAgB,uBAAuB,CACrC,QAA+B,EAC/B,WAAqB,EACrB,qBAA6D,EAC7D,2BAA6D,EAC7D,eAAuB;IAEvB,MAAM,EAAE,6BAA6B,EAAE,cAAc,EAAE,GACrD,qBAAqB,CAAC;IACxB,MAAM,cAAc,GAAG,wBAAiB,CAAC,WAAW,EAAE,CAAC;IAEvD,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;IACnC,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAE,CAAC;IAErC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QACjC,MAAM,QAAQ,GAAG,YAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAE/C,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,CAAC,IAAI,CACV,oCAAoC,UAAU,oBAAoB,CACnE,CAAC;YACF,OAAO;SACR;QAED,MAAM,YAAY,GAAI,QAAQ,CAAC,IAA0B,CAAC,eAAe,EAAE,CAAC;QAE5E,IAAA,wBAAgB,EAAC,QAAQ,CAAC,CAAC;QAE3B,MAAM,qBAAqB,GAAG,IAAA,gCAAwB,EACpD,qBAAqB,EACrB,UAAU,EACV,YAAY,CACb,CAAC;QAEF,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC;QACjC,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC,UAAU,CAAC,CAAC;QACzC,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC;QAEpC,MAAM,IAAI,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC,iBAAiB,EAAE,CAAC;QAEtD,MAAM,OAAO,GAAG,mBAAY,CAAC,WAAW,CAAC;YACvC,IAAI,EAAE,IAAI,GAAG,CAAC;YACd,kBAAkB,EAAE,CAAC;YACrB,QAAQ,EAAE,YAAY;SACvB,CAAC,CAAC;QACH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;YAC7B,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;SACtC;QACD,QAAQ,CAAC,YAAY,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAE5C,IAAI,qBAAqB,EAAE;YACzB,kBAAkB,CAAC,GAAG,CAAC,YAAY,EAAE,qBAAqB,CAAC,CAAC;SAC7D;QAED,gBAAgB,CAAC,GAAG,CAAC,YAAY,EAAE;YACjC,GAAG,KAAK;YACR,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;SAC3C,CAAC,CAAC;QAEH,YAAY,KAAK,CAAC;YAChB,CAAC,CAAC,cAAc,CAAC,YAAY,CAAC,QAAQ,CAAC;YACvC,CAAC,CAAC,cAAc,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,cAAc,CAAC,aAAa,EAAE,CAAC;IAEtD,MAAM,kBAAkB,GACtB,2BAA2B,CAAC,eAAe,CAAC,OAAO,CAAC,kBAAkB,CAAC;IAEzE,MAAM,MAAM,GAAG,gBAAS,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAEpC,MAAM,KAAK,GAAG,eAAQ,CAAC,WAAW,EAAE,CAAC;IACrC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACxB,KAAK,CAAC,WAAW,EAAE,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;IAGrD,IAAA,mCAAc,EACZ,6BAA6B,EAC7B,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAA,mCAAc,EAAC,6BAA6B,CAAC,EAAE;QAC/D,cAAc,EAAE,IAAI,GAAG,CAAC,cAAc,CAAC;QACvC,kBAAkB;QAClB,kBAAkB;KACnB,CAAC,CACH,CAAC;IAEF,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAE3B,QAAQ,CAAC,QAAQ,CAAC;QAChB,GAAG,EAAE,eAAe;QACpB,KAAK,EAAE,KAA+B;KACvC,CAAC,CAAC;IACH,QAAQ,CAAC,WAAW,EAAE,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,CAAC;AACpB,CAAC;AA9FD,0DA8FC"}
|
|
@@ -16,7 +16,9 @@ function updateContourSets(viewport, geometryIds, contourRepresentation, contour
|
|
|
16
16
|
const { actor } = contourSetsActor;
|
|
17
17
|
const newOutlineWithActive = newContourConfig.outlineWidthActive;
|
|
18
18
|
if ((cachedConfig === null || cachedConfig === void 0 ? void 0 : cachedConfig.outlineWidthActive) !== newOutlineWithActive) {
|
|
19
|
-
actor
|
|
19
|
+
actor
|
|
20
|
+
.getProperty()
|
|
21
|
+
.setLineWidth(newOutlineWithActive);
|
|
20
22
|
(0, contourConfigCache_1.setConfigCache)(segmentationRepresentationUID, Object.assign({}, cachedConfig, {
|
|
21
23
|
outlineWidthActive: newOutlineWithActive,
|
|
22
24
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateContourSets.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/updateContourSets.ts"],"names":[],"mappings":";;;AAAA,8CAAmD;AAOnD,6DAAsE;AACtE,mCAAmD;AAEnD,SAAgB,iBAAiB,CAC/B,QAA+B,EAC/B,WAAqB,EACrB,qBAA6D,EAC7D,2BAA6D,EAC7D,eAAuB;IAEvB,MAAM,EAAE,6BAA6B,EAAE,cAAc,EAAE,GACrD,qBAAqB,CAAC;IACxB,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,eAAe,CAAC,OAAO,CAAC;IAC7E,MAAM,YAAY,GAAG,IAAA,mCAAc,EAAC,6BAA6B,CAAC,CAAC;IAEnE,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAE5D,IAAI,CAAC,gBAAgB,EAAE;QACrB,OAAO,CAAC,IAAI,CACV,uCAAuC,eAAe,oBAAoB,CAC3E,CAAC;QACF,OAAO;KACR;IAED,MAAM,EAAE,KAAK,EAAE,GAAG,gBAAgB,CAAC;IAEnC,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,kBAAkB,CAAC;IAEjE,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,kBAAkB,MAAK,oBAAoB,EAAE;QAC5D,
|
|
1
|
+
{"version":3,"file":"updateContourSets.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/updateContourSets.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ class ZoomTool extends BaseTool {
|
|
|
11
11
|
maxZoomScale: 30,
|
|
12
12
|
pinchToZoom: true,
|
|
13
13
|
pan: true,
|
|
14
|
+
invert: false,
|
|
14
15
|
},
|
|
15
16
|
}) {
|
|
16
17
|
super(toolProps, defaultToolProps);
|
|
@@ -40,14 +41,14 @@ class ZoomTool extends BaseTool {
|
|
|
40
41
|
const size = [element.clientWidth, element.clientHeight];
|
|
41
42
|
const { parallelScale, focalPoint, position } = camera;
|
|
42
43
|
const zoomScale = 1.5 / size[1];
|
|
43
|
-
const k = deltaY * zoomScale;
|
|
44
|
+
const k = deltaY * zoomScale * (this.configuration.invert ? -1 : 1);
|
|
44
45
|
let parallelScaleToSet = (1.0 - k) * parallelScale;
|
|
45
46
|
let focalPointToSet = focalPoint;
|
|
46
47
|
let positionToSet = position;
|
|
47
48
|
if (!this.configuration.zoomToCenter) {
|
|
48
49
|
const distanceToCanvasCenter = vec3.distance(focalPoint, this.initialMousePosWorld);
|
|
49
50
|
const zoomScale = 5 / size[1];
|
|
50
|
-
const k = deltaY * zoomScale;
|
|
51
|
+
const k = deltaY * zoomScale * (this.configuration.invert ? -1 : 1);
|
|
51
52
|
parallelScaleToSet = (1.0 - k) * parallelScale;
|
|
52
53
|
positionToSet = vec3.scaleAndAdd(vec3.create(), position, this.dirVec, -distanceToCanvasCenter * k);
|
|
53
54
|
focalPointToSet = vec3.scaleAndAdd(vec3.create(), focalPoint, this.dirVec, -distanceToCanvasCenter * k);
|
|
@@ -92,7 +93,9 @@ class ZoomTool extends BaseTool {
|
|
|
92
93
|
-viewPlaneNormal[1],
|
|
93
94
|
-viewPlaneNormal[2],
|
|
94
95
|
];
|
|
95
|
-
const k =
|
|
96
|
+
const k = this.configuration.invert
|
|
97
|
+
? deltaY / zoomScale
|
|
98
|
+
: deltaY * zoomScale;
|
|
96
99
|
let tmp = k * directionOfProjection[0];
|
|
97
100
|
position[0] += tmp;
|
|
98
101
|
focalPoint[0] += tmp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ZoomTool.js","sourceRoot":"","sources":["../../../src/tools/ZoomTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,OAAO,MAAM,kCAAkC,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAS,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAQlC,MAAM,QAAS,SAAQ,QAAQ;
|
|
1
|
+
{"version":3,"file":"ZoomTool.js","sourceRoot":"","sources":["../../../src/tools/ZoomTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { StackViewport,
|
|
1
|
+
import { StackViewport, utilities, BaseVolumeViewport, } from '@cornerstonejs/core';
|
|
2
2
|
import { ToolModes } from '../../enums';
|
|
3
3
|
class BaseTool {
|
|
4
4
|
constructor(toolProps, defaultToolProps) {
|
|
@@ -70,7 +70,7 @@ class BaseTool {
|
|
|
70
70
|
if (viewport instanceof StackViewport) {
|
|
71
71
|
return `imageId:${viewport.getCurrentImageId()}`;
|
|
72
72
|
}
|
|
73
|
-
else if (viewport instanceof
|
|
73
|
+
else if (viewport instanceof BaseVolumeViewport) {
|
|
74
74
|
return `volumeId:${this.getTargetVolumeId(viewport)}`;
|
|
75
75
|
}
|
|
76
76
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,7 +56,10 @@ export function addContourSetsToElement(viewport, geometryIds, contourRepresenta
|
|
|
56
56
|
outlineWidthActive,
|
|
57
57
|
}));
|
|
58
58
|
actor.setForceOpaque(true);
|
|
59
|
-
viewport.addActor({
|
|
59
|
+
viewport.addActor({
|
|
60
|
+
uid: contourActorUID,
|
|
61
|
+
actor: actor,
|
|
62
|
+
});
|
|
60
63
|
viewport.resetCamera();
|
|
61
64
|
viewport.render();
|
|
62
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addContourSetsToElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/addContourSetsToElement.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"addContourSetsToElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/addContourSetsToElement.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,9 @@ export function updateContourSets(viewport, geometryIds, contourRepresentation,
|
|
|
13
13
|
const { actor } = contourSetsActor;
|
|
14
14
|
const newOutlineWithActive = newContourConfig.outlineWidthActive;
|
|
15
15
|
if (cachedConfig?.outlineWidthActive !== newOutlineWithActive) {
|
|
16
|
-
actor
|
|
16
|
+
actor
|
|
17
|
+
.getProperty()
|
|
18
|
+
.setLineWidth(newOutlineWithActive);
|
|
17
19
|
setConfigCache(segmentationRepresentationUID, Object.assign({}, cachedConfig, {
|
|
18
20
|
outlineWidthActive: newOutlineWithActive,
|
|
19
21
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateContourSets.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/updateContourSets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAS,MAAM,qBAAqB,CAAC;AAOnD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAEnD,MAAM,UAAU,iBAAiB,CAC/B,QAA+B,EAC/B,WAAqB,EACrB,qBAA6D,EAC7D,2BAA6D,EAC7D,eAAuB;IAEvB,MAAM,EAAE,6BAA6B,EAAE,cAAc,EAAE,GACrD,qBAAqB,CAAC;IACxB,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,eAAe,CAAC,OAAO,CAAC;IAC7E,MAAM,YAAY,GAAG,cAAc,CAAC,6BAA6B,CAAC,CAAC;IAEnE,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAE5D,IAAI,CAAC,gBAAgB,EAAE;QACrB,OAAO,CAAC,IAAI,CACV,uCAAuC,eAAe,oBAAoB,CAC3E,CAAC;QACF,OAAO;KACR;IAED,MAAM,EAAE,KAAK,EAAE,GAAG,gBAAgB,CAAC;IAEnC,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,kBAAkB,CAAC;IAEjE,IAAI,YAAY,EAAE,kBAAkB,KAAK,oBAAoB,EAAE;QAC5D,
|
|
1
|
+
{"version":3,"file":"updateContourSets.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/updateContourSets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAS,MAAM,qBAAqB,CAAC;AAOnD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAEnD,MAAM,UAAU,iBAAiB,CAC/B,QAA+B,EAC/B,WAAqB,EACrB,qBAA6D,EAC7D,2BAA6D,EAC7D,eAAuB;IAEvB,MAAM,EAAE,6BAA6B,EAAE,cAAc,EAAE,GACrD,qBAAqB,CAAC;IACxB,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,eAAe,CAAC,OAAO,CAAC;IAC7E,MAAM,YAAY,GAAG,cAAc,CAAC,6BAA6B,CAAC,CAAC;IAEnE,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAE5D,IAAI,CAAC,gBAAgB,EAAE;QACrB,OAAO,CAAC,IAAI,CACV,uCAAuC,eAAe,oBAAoB,CAC3E,CAAC;QACF,OAAO;KACR;IAED,MAAM,EAAE,KAAK,EAAE,GAAG,gBAAgB,CAAC;IAEnC,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,kBAAkB,CAAC;IAEjE,IAAI,YAAY,EAAE,kBAAkB,KAAK,oBAAoB,EAAE;QAC5D,KAA6B;aAC3B,WAAW,EAAE;aACb,YAAY,CAAC,oBAAoB,CAAC,CAAC;QAEtC,cAAc,CACZ,6BAA6B,EAC7B,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE;YAC9B,kBAAkB,EAAE,oBAAoB;SACzC,CAAC,CACH,CAAC;KACH;IAED,MAAM,MAAM,GAAI,KAA6B,CAAC,SAAS,EAAE,CAAC;IAC1D,MAAM,GAAG,GAAG,MAAM,CAAC,cAAc,EAAE,CAAC;IAEpC,MAAM,wBAAwB,GAAG,EAAE,CAAC;IACpC,MAAM,sBAAsB,GAAG,EAAE,CAAC;IAElC,KAAK,MAAM,YAAY,IAAI,cAAc,EAAE;QACzC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YAClD,wBAAwB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAC7C;KACF;IAGD,KAAK,MAAM,YAAY,IAAI,YAAY,CAAC,cAAc,EAAE;QACtD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YACrC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAC3C;KACF;IAED,MAAM,uBAAuB,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC;SACpE,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,sBAAsB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;SACxE,MAAM,CAAC,wBAAwB,CAAC,CAAC;IAEpC,MAAM,EAAE,WAAW,EAAE,sBAAsB,EAAE,GAAG,WAAW,CAAC,MAAM,CAChE,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;QAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC;QACtC,MAAM,YAAY,GAAI,UAAgC,CAAC,eAAe,EAAE,CAAC;QACzE,MAAM,qBAAqB,GAAG,wBAAwB,CACpD,qBAAqB,EACrB,UAAU,EACV,YAAY,CACb,CAAC;QAEF,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjC,GAAG,CAAC,sBAAsB,CAAC,YAAY,CAAC,GAAG,qBAAqB,IAAI,EAAE,CAAC;QAEvE,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,WAAW,EAAE,EAAE,EAAE,sBAAsB,EAAE,EAAE,EAAE,CAChD,CAAC;IAEF,MAAM,gBAAgB,GAAG;QACvB,GAAG,uBAAuB;QAC1B,GAAG,sBAAsB;KAC1B,CAAC;IAEF,MAAM,8BAA8B,GAAG,MAAM,CAAC,MAAM,CAClD,sBAAsB,CACvB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAEnD,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAE7B,IAAI,gBAAgB,CAAC,MAAM,IAAI,8BAA8B,EAAE;QAC7D,MAAM,cAAc,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;QAC7C,MAAM,aAAa,GAAG,cAAc,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;QACjE,MAAM,iBAAiB,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC;QAGlD,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACjC,MAAM,YAAY,GAAI,UAAgC,CAAC,eAAe,EAAE,CAAC;YACzE,MAAM,IAAI,GAAG,UAAU,CAAC,sBAAsB,EAAE,CAAC;YAEjD,IACE,gBAAgB,CAAC,QAAQ,CAAC,YAAY,CAAC;gBACvC,sBAAsB,CAAC,YAAY,CAAC,EAAE,SAAS,EAC/C;gBACA,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC;gBACpC,IAAI,UAAU,GAAG,uBAAuB,CAAC,QAAQ,CAAC,YAAY,CAAC;oBAC7D,CAAC,CAAC,CAAC;oBACH,CAAC,CAAC,GAAG,CAAC;gBAER,MAAM,aAAa,GAAG,sBAAsB,CAAC,YAAY,CAAC,CAAC;gBAC3D,IAAI,aAAa,CAAC,SAAS,KAAK,SAAS,EAAE;oBACzC,UAAU,GAAG,aAAa,CAAC,SAAS,GAAG,GAAG,CAAC;iBAC5C;gBAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;oBAC7B,iBAAiB,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;oBAC7C,iBAAiB,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;oBACjD,iBAAiB,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;oBACjD,iBAAiB,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC;iBACpD;gBAED,gBAAgB,GAAG,IAAI,CAAC;aACzB;YAED,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,IAAI,gBAAgB,EAAE;YACpB,cAAc,CAAC,QAAQ,EAAE,CAAC;SAC3B;QAED,cAAc,CACZ,6BAA6B,EAC7B,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE;YAC9B,cAAc,EAAE,IAAI,GAAG,CAAC,cAAc,CAAC;SACxC,CAAC,CACH,CAAC;QAEF,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;KAC5B;IAED,QAAQ,CAAC,MAAM,EAAE,CAAC;AACpB,CAAC"}
|