@cornerstonejs/core 0.33.1 → 0.33.2

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.
Files changed (9) hide show
  1. package/dist/cjs/utilities/getTargetVolumeAndSpacingInNormalDir.d.ts +1 -0
  2. package/dist/cjs/utilities/getTargetVolumeAndSpacingInNormalDir.js +22 -7
  3. package/dist/cjs/utilities/getTargetVolumeAndSpacingInNormalDir.js.map +1 -1
  4. package/dist/esm/utilities/getTargetVolumeAndSpacingInNormalDir.d.ts +1 -0
  5. package/dist/esm/utilities/getTargetVolumeAndSpacingInNormalDir.js +22 -7
  6. package/dist/esm/utilities/getTargetVolumeAndSpacingInNormalDir.js.map +1 -1
  7. package/dist/umd/index.js +1 -1
  8. package/dist/umd/index.js.map +1 -1
  9. package/package.json +2 -2
package/dist/cjs/utilities/getTargetVolumeAndSpacingInNormalDir.d.ts CHANGED
@@ -2,4 +2,5 @@ import { ICamera, IImageVolume, IVolumeViewport } from '../types';
2
2
  export default function getTargetVolumeAndSpacingInNormalDir(viewport: IVolumeViewport, camera: ICamera, targetVolumeId?: string): {
3
3
  imageVolume: IImageVolume;
4
4
  spacingInNormalDirection: number;
5
+ actorUID: string;
5
6
  };
package/dist/cjs/utilities/getTargetVolumeAndSpacingInNormalDir.js CHANGED
@@ -4,38 +4,53 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const cache_1 = __importDefault(require("../cache/cache"));
7
+ const constants_1 = require("../constants");
7
8
  const getSpacingInNormalDirection_1 = __importDefault(require("./getSpacingInNormalDirection"));
9
+ const EPSILON_PART = 1 + constants_1.EPSILON;
8
10
  function getTargetVolumeAndSpacingInNormalDir(viewport, camera, targetVolumeId) {
9
11
  const { viewPlaneNormal } = camera;
10
12
  const volumeActors = viewport.getActors();
11
13
  if (!volumeActors || !volumeActors.length) {
12
- return { spacingInNormalDirection: null, imageVolume: null };
14
+ return {
15
+ spacingInNormalDirection: null,
16
+ imageVolume: null,
17
+ actorUID: null,
18
+ };
13
19
  }
14
20
  const imageVolumes = volumeActors
15
21
  .map((va) => {
16
22
  var _a;
17
- const uid = (_a = va.referenceId) !== null && _a !== void 0 ? _a : va.uid;
18
- return cache_1.default.getVolume(uid);
23
+ const actorUID = (_a = va.referenceId) !== null && _a !== void 0 ? _a : va.uid;
24
+ return cache_1.default.getVolume(actorUID);
19
25
  })
20
26
  .filter((iv) => !!iv);
21
27
  if (targetVolumeId) {
22
- const imageVolume = imageVolumes.find((iv) => iv.volumeId === targetVolumeId);
28
+ const imageVolumeIndex = imageVolumes.findIndex((iv) => iv.volumeId === targetVolumeId);
29
+ const imageVolume = imageVolumes[imageVolumeIndex];
30
+ const { uid: actorUID } = volumeActors[imageVolumeIndex];
23
31
  const spacingInNormalDirection = (0, getSpacingInNormalDirection_1.default)(imageVolume, viewPlaneNormal);
24
- return { imageVolume, spacingInNormalDirection };
32
+ return { imageVolume, spacingInNormalDirection, actorUID };
25
33
  }
26
34
  if (!imageVolumes.length) {
27
- return { spacingInNormalDirection: null, imageVolume: null };
35
+ return {
36
+ spacingInNormalDirection: null,
37
+ imageVolume: null,
38
+ actorUID: null,
39
+ };
28
40
  }
29
41
  const smallest = {
30
42
  spacingInNormalDirection: Infinity,
31
43
  imageVolume: null,
44
+ actorUID: null,
32
45
  };
33
46
  for (let i = 0; i < imageVolumes.length; i++) {
34
47
  const imageVolume = imageVolumes[i];
35
48
  const spacingInNormalDirection = (0, getSpacingInNormalDirection_1.default)(imageVolume, viewPlaneNormal);
36
- if (spacingInNormalDirection < smallest.spacingInNormalDirection) {
49
+ if (spacingInNormalDirection * EPSILON_PART <
50
+ smallest.spacingInNormalDirection) {
37
51
  smallest.spacingInNormalDirection = spacingInNormalDirection;
38
52
  smallest.imageVolume = imageVolume;
53
+ smallest.actorUID = volumeActors[i].uid;
39
54
  }
40
55
  }
41
56
  return smallest;
package/dist/cjs/utilities/getTargetVolumeAndSpacingInNormalDir.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getTargetVolumeAndSpacingInNormalDir.js","sourceRoot":"","sources":["../../../src/utilities/getTargetVolumeAndSpacingInNormalDir.ts"],"names":[],"mappings":";;;;;AAAA,2DAAmC;AAGnC,gGAAwE;AAiBxE,SAAwB,oCAAoC,CAC1D,QAAyB,EACzB,MAAe,EACf,cAAuB;IAKvB,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;IACnC,MAAM,YAAY,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IAE1C,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;QACzC,OAAO,EAAE,wBAAwB,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;KAC9D;IAED,MAAM,YAAY,GAAG,YAAY;SAC9B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;;QAGV,MAAM,GAAG,GAAG,MAAA,EAAE,CAAC,WAAW,mCAAI,EAAE,CAAC,GAAG,CAAC;QACrC,OAAO,eAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAGxB,IAAI,cAAc,EAAE;QAClB,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CACnC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,KAAK,cAAc,CACvC,CAAC;QAEF,MAAM,wBAAwB,GAAG,IAAA,qCAA2B,EAC1D,WAAW,EACX,eAAe,CAChB,CAAC;QAEF,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,CAAC;KAClD;IAED,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;QACxB,OAAO,EAAE,wBAAwB,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;KAC9D;IAGD,MAAM,QAAQ,GAAG;QACf,wBAAwB,EAAE,QAAQ;QAClC,WAAW,EAAE,IAAI;KAClB,CAAC;IAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC5C,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAEpC,MAAM,wBAAwB,GAAG,IAAA,qCAA2B,EAC1D,WAAW,EACX,eAAe,CAChB,CAAC;QAEF,IAAI,wBAAwB,GAAG,QAAQ,CAAC,wBAAwB,EAAE;YAChE,QAAQ,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;YAC7D,QAAQ,CAAC,WAAW,GAAG,WAAW,CAAC;SACpC;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AA/DD,uDA+DC"}
1
+ {"version":3,"file":"getTargetVolumeAndSpacingInNormalDir.js","sourceRoot":"","sources":["../../../src/utilities/getTargetVolumeAndSpacingInNormalDir.ts"],"names":[],"mappings":";;;;;AAAA,2DAAmC;AACnC,4CAAuC;AAGvC,gGAAwE;AAGxE,MAAM,YAAY,GAAG,CAAC,GAAG,mBAAO,CAAC;AAiBjC,SAAwB,oCAAoC,CAC1D,QAAyB,EACzB,MAAe,EACf,cAAuB;IAMvB,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;IACnC,MAAM,YAAY,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IAE1C,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;QACzC,OAAO;YACL,wBAAwB,EAAE,IAAI;YAC9B,WAAW,EAAE,IAAI;YACjB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IAED,MAAM,YAAY,GAAG,YAAY;SAC9B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;;QAGV,MAAM,QAAQ,GAAG,MAAA,EAAE,CAAC,WAAW,mCAAI,EAAE,CAAC,GAAG,CAAC;QAC1C,OAAO,eAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAGxB,IAAI,cAAc,EAAE;QAClB,MAAM,gBAAgB,GAAG,YAAY,CAAC,SAAS,CAC7C,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,KAAK,cAAc,CACvC,CAAC;QAEF,MAAM,WAAW,GAAG,YAAY,CAAC,gBAAgB,CAAC,CAAC;QACnD,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC,gBAAgB,CAAC,CAAC;QACzD,MAAM,wBAAwB,GAAG,IAAA,qCAA2B,EAC1D,WAAW,EACX,eAAe,CAChB,CAAC;QAEF,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,CAAC;KAC5D;IAED,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;QACxB,OAAO;YACL,wBAAwB,EAAE,IAAI;YAC9B,WAAW,EAAE,IAAI;YACjB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IAGD,MAAM,QAAQ,GAAG;QACf,wBAAwB,EAAE,QAAQ;QAClC,WAAW,EAAE,IAAI;QACjB,QAAQ,EAAE,IAAI;KACf,CAAC;IAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC5C,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAEpC,MAAM,wBAAwB,GAAG,IAAA,qCAA2B,EAC1D,WAAW,EACX,eAAe,CAChB,CAAC;QAKF,IACE,wBAAwB,GAAG,YAAY;YACvC,QAAQ,CAAC,wBAAwB,EACjC;YACA,QAAQ,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;YAC7D,QAAQ,CAAC,WAAW,GAAG,WAAW,CAAC;YACnC,QAAQ,CAAC,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SACzC;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAlFD,uDAkFC"}
package/dist/esm/utilities/getTargetVolumeAndSpacingInNormalDir.d.ts CHANGED
@@ -2,4 +2,5 @@ import { ICamera, IImageVolume, IVolumeViewport } from '../types';
2
2
  export default function getTargetVolumeAndSpacingInNormalDir(viewport: IVolumeViewport, camera: ICamera, targetVolumeId?: string): {
3
3
  imageVolume: IImageVolume;
4
4
  spacingInNormalDirection: number;
5
+ actorUID: string;
5
6
  };
package/dist/esm/utilities/getTargetVolumeAndSpacingInNormalDir.js CHANGED
@@ -1,35 +1,50 @@
1
1
  import cache from '../cache/cache';
2
+ import { EPSILON } from '../constants';
2
3
  import getSpacingInNormalDirection from './getSpacingInNormalDirection';
4
+ const EPSILON_PART = 1 + EPSILON;
3
5
  export default function getTargetVolumeAndSpacingInNormalDir(viewport, camera, targetVolumeId) {
4
6
  const { viewPlaneNormal } = camera;
5
7
  const volumeActors = viewport.getActors();
6
8
  if (!volumeActors || !volumeActors.length) {
7
- return { spacingInNormalDirection: null, imageVolume: null };
9
+ return {
10
+ spacingInNormalDirection: null,
11
+ imageVolume: null,
12
+ actorUID: null,
13
+ };
8
14
  }
9
15
  const imageVolumes = volumeActors
10
16
  .map((va) => {
11
- const uid = va.referenceId ?? va.uid;
12
- return cache.getVolume(uid);
17
+ const actorUID = va.referenceId ?? va.uid;
18
+ return cache.getVolume(actorUID);
13
19
  })
14
20
  .filter((iv) => !!iv);
15
21
  if (targetVolumeId) {
16
- const imageVolume = imageVolumes.find((iv) => iv.volumeId === targetVolumeId);
22
+ const imageVolumeIndex = imageVolumes.findIndex((iv) => iv.volumeId === targetVolumeId);
23
+ const imageVolume = imageVolumes[imageVolumeIndex];
24
+ const { uid: actorUID } = volumeActors[imageVolumeIndex];
17
25
  const spacingInNormalDirection = getSpacingInNormalDirection(imageVolume, viewPlaneNormal);
18
- return { imageVolume, spacingInNormalDirection };
26
+ return { imageVolume, spacingInNormalDirection, actorUID };
19
27
  }
20
28
  if (!imageVolumes.length) {
21
- return { spacingInNormalDirection: null, imageVolume: null };
29
+ return {
30
+ spacingInNormalDirection: null,
31
+ imageVolume: null,
32
+ actorUID: null,
33
+ };
22
34
  }
23
35
  const smallest = {
24
36
  spacingInNormalDirection: Infinity,
25
37
  imageVolume: null,
38
+ actorUID: null,
26
39
  };
27
40
  for (let i = 0; i < imageVolumes.length; i++) {
28
41
  const imageVolume = imageVolumes[i];
29
42
  const spacingInNormalDirection = getSpacingInNormalDirection(imageVolume, viewPlaneNormal);
30
- if (spacingInNormalDirection < smallest.spacingInNormalDirection) {
43
+ if (spacingInNormalDirection * EPSILON_PART <
44
+ smallest.spacingInNormalDirection) {
31
45
  smallest.spacingInNormalDirection = spacingInNormalDirection;
32
46
  smallest.imageVolume = imageVolume;
47
+ smallest.actorUID = volumeActors[i].uid;
33
48
  }
34
49
  }
35
50
  return smallest;
package/dist/esm/utilities/getTargetVolumeAndSpacingInNormalDir.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getTargetVolumeAndSpacingInNormalDir.js","sourceRoot":"","sources":["../../../src/utilities/getTargetVolumeAndSpacingInNormalDir.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,gBAAgB,CAAC;AAGnC,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AAiBxE,MAAM,CAAC,OAAO,UAAU,oCAAoC,CAC1D,QAAyB,EACzB,MAAe,EACf,cAAuB;IAKvB,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;IACnC,MAAM,YAAY,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IAE1C,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;QACzC,OAAO,EAAE,wBAAwB,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;KAC9D;IAED,MAAM,YAAY,GAAG,YAAY;SAC9B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;QAGV,MAAM,GAAG,GAAG,EAAE,CAAC,WAAW,IAAI,EAAE,CAAC,GAAG,CAAC;QACrC,OAAO,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAGxB,IAAI,cAAc,EAAE;QAClB,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CACnC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,KAAK,cAAc,CACvC,CAAC;QAEF,MAAM,wBAAwB,GAAG,2BAA2B,CAC1D,WAAW,EACX,eAAe,CAChB,CAAC;QAEF,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,CAAC;KAClD;IAED,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;QACxB,OAAO,EAAE,wBAAwB,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;KAC9D;IAGD,MAAM,QAAQ,GAAG;QACf,wBAAwB,EAAE,QAAQ;QAClC,WAAW,EAAE,IAAI;KAClB,CAAC;IAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC5C,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAEpC,MAAM,wBAAwB,GAAG,2BAA2B,CAC1D,WAAW,EACX,eAAe,CAChB,CAAC;QAEF,IAAI,wBAAwB,GAAG,QAAQ,CAAC,wBAAwB,EAAE;YAChE,QAAQ,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;YAC7D,QAAQ,CAAC,WAAW,GAAG,WAAW,CAAC;SACpC;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
1
+ {"version":3,"file":"getTargetVolumeAndSpacingInNormalDir.js","sourceRoot":"","sources":["../../../src/utilities/getTargetVolumeAndSpacingInNormalDir.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,gBAAgB,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AAGxE,MAAM,YAAY,GAAG,CAAC,GAAG,OAAO,CAAC;AAiBjC,MAAM,CAAC,OAAO,UAAU,oCAAoC,CAC1D,QAAyB,EACzB,MAAe,EACf,cAAuB;IAMvB,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;IACnC,MAAM,YAAY,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IAE1C,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;QACzC,OAAO;YACL,wBAAwB,EAAE,IAAI;YAC9B,WAAW,EAAE,IAAI;YACjB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IAED,MAAM,YAAY,GAAG,YAAY;SAC9B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;QAGV,MAAM,QAAQ,GAAG,EAAE,CAAC,WAAW,IAAI,EAAE,CAAC,GAAG,CAAC;QAC1C,OAAO,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAGxB,IAAI,cAAc,EAAE;QAClB,MAAM,gBAAgB,GAAG,YAAY,CAAC,SAAS,CAC7C,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,KAAK,cAAc,CACvC,CAAC;QAEF,MAAM,WAAW,GAAG,YAAY,CAAC,gBAAgB,CAAC,CAAC;QACnD,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC,gBAAgB,CAAC,CAAC;QACzD,MAAM,wBAAwB,GAAG,2BAA2B,CAC1D,WAAW,EACX,eAAe,CAChB,CAAC;QAEF,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,CAAC;KAC5D;IAED,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;QACxB,OAAO;YACL,wBAAwB,EAAE,IAAI;YAC9B,WAAW,EAAE,IAAI;YACjB,QAAQ,EAAE,IAAI;SACf,CAAC;KACH;IAGD,MAAM,QAAQ,GAAG;QACf,wBAAwB,EAAE,QAAQ;QAClC,WAAW,EAAE,IAAI;QACjB,QAAQ,EAAE,IAAI;KACf,CAAC;IAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC5C,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAEpC,MAAM,wBAAwB,GAAG,2BAA2B,CAC1D,WAAW,EACX,eAAe,CAChB,CAAC;QAKF,IACE,wBAAwB,GAAG,YAAY;YACvC,QAAQ,CAAC,wBAAwB,EACjC;YACA,QAAQ,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;YAC7D,QAAQ,CAAC,WAAW,GAAG,WAAW,CAAC;YACnC,QAAQ,CAAC,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SACzC;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}