@ohif/app 3.9.0-beta.33 → 3.9.0-beta.35

package/dist/{501.bundle.f6641d4f50c6f8c54b6a.js → 501.bundle.de519580f8ba42802378.js}

@@ -18,7 +18,7 @@
 /* harmony import */ var _eventTarget__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(51884);
 /* harmony import */ var _init__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(71702);
 /* harmony import */ var _loaders_volumeLoader__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(82041);
-/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(20228);
+/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(35678);
 /* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(90601);
 /* harmony import */ var _helpers_volumeNewImageEventDispatcher__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(46820);
 /* harmony import */ var _Viewport__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(11512);
@@ -505,7 +505,7 @@ class BaseVolumeViewport extends _Viewport__WEBPACK_IMPORTED_MODULE_14__/* ["def
             return target;
         }
         const { viewPlaneNormal } = target;
-        const delta = viewRefSpecifier.sliceIndex - this.getCurrentImageIdIndex();
+        const delta = viewRefSpecifier.sliceIndex - this.getSliceIndex();
         const { sliceRangeInfo } = (0,_utilities__WEBPACK_IMPORTED_MODULE_11__.getVolumeViewportScrollInfo)(this, volumeId, true);
         const { sliceRange, spacingInNormalDirection, camera } = sliceRangeInfo;
         const { focalPoint, position } = camera;
@@ -523,7 +523,7 @@ class BaseVolumeViewport extends _Viewport__WEBPACK_IMPORTED_MODULE_14__/* ["def
         if (options?.withNavigation) {
             return true;
         }
-        const currentSliceIndex = this.getCurrentImageIdIndex();
+        const currentSliceIndex = this.getSliceIndex();
         const { sliceIndex } = viewRef;
         if (Array.isArray(sliceIndex)) {
             return (sliceIndex[0] <= currentSliceIndex && currentSliceIndex <= sliceIndex[1]);
@@ -900,7 +900,7 @@ class BaseVolumeViewport extends _Viewport__WEBPACK_IMPORTED_MODULE_14__/* ["def
             }
             volumeId = actorEntries.find((actorEntry) => actorEntry.actor.getClassName() === 'vtkVolume')?.uid;
         }
-        const currentIndex = this.getCurrentImageIdIndex();
+        const currentIndex = this.getSliceIndex();
         sliceIndex ??= currentIndex;
         const { viewPlaneNormal, focalPoint } = this.getCamera();
         const querySeparator = volumeId.indexOf('?') > -1 ? '&' : '?';
@@ -1829,8 +1829,8 @@ var metaData = __webpack_require__(55692);
 // EXTERNAL MODULE: ../../../node_modules/lodash.clonedeep/index.js
 var lodash_clonedeep = __webpack_require__(48463);
 var lodash_clonedeep_default = /*#__PURE__*/__webpack_require__.n(lodash_clonedeep);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 68 modules
-var utilities = __webpack_require__(20228);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 70 modules
+var utilities = __webpack_require__(35678);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/Viewport.js
 var Viewport = __webpack_require__(11512);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/helpers/cpuFallback/colors/index.js + 2 modules
@@ -2204,6 +2204,9 @@ class StackViewport extends Viewport/* default */.A {
         this.getCurrentImageIdIndex = () => {
             return this.currentImageIdIndex;
         };
+        this.getSliceIndex = () => {
+            return this.currentImageIdIndex;
+        };
         this.getTargetImageIdIndex = () => {
             return this.targetImageIdIndex;
         };
@@ -3799,8 +3802,8 @@ var enums = __webpack_require__(98362);
 var metaData = __webpack_require__(55692);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/helpers/cpuFallback/rendering/transform.js
 var rendering_transform = __webpack_require__(18714);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 68 modules
-var utilities = __webpack_require__(20228);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 70 modules
+var utilities = __webpack_require__(35678);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/Viewport.js
 var Viewport = __webpack_require__(11512);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/helpers/index.js + 5 modules
@@ -4571,7 +4574,7 @@ class VideoViewport extends Viewport/* default */.A {
         if (options.withNavigation) {
             return true;
         }
-        const currentIndex = this.getCurrentImageIdIndex();
+        const currentIndex = this.getSliceIndex();
         if (Array.isArray(sliceIndex)) {
             return currentIndex >= sliceIndex[0] && currentIndex <= sliceIndex[1];
         }
@@ -4608,6 +4611,9 @@ class VideoViewport extends Viewport/* default */.A {
     getCurrentImageIdIndex() {
         return Math.round(this.videoElement.currentTime * this.fps);
     }
+    getSliceIndex() {
+        return this.getCurrentImageIdIndex();
+    }
     getCamera() {
         const { parallelScale } = this.videoCamera;
         const canvasCenter = [
@@ -4711,7 +4717,7 @@ class VideoViewport extends Viewport/* default */.A {
 /* harmony import */ var _enums_ViewportStatus__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(17702);
 /* harmony import */ var _enums_ViewportType__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(21432);
 /* harmony import */ var _renderingEngineCache__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(94070);
-/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(20228);
+/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(35678);
 /* harmony import */ var _utilities_hasNaNValues__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(73139);
 /* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(88903);
 /* harmony import */ var _init__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(71702);
@@ -5217,6 +5223,9 @@ class Viewport {
     getCurrentImageIdIndex() {
         throw new Error('Not implemented');
     }
+    getSliceIndex() {
+        throw new Error('Not implemented');
+    }
     getReferenceId(_specifier) {
         return null;
     }
@@ -5502,7 +5511,7 @@ class Viewport {
             cameraFocalPoint,
             viewPlaneNormal,
             viewUp,
-            sliceIndex: viewRefSpecifier.sliceIndex ?? this.getCurrentImageIdIndex(),
+            sliceIndex: viewRefSpecifier.sliceIndex ?? this.getSliceIndex(),
         };
         return target;
     }
@@ -5651,12 +5660,12 @@ class Viewport {
 /* harmony import */ var _cache__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13320);
 /* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(88903);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(98362);
-/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(20228);
+/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(35678);
 /* harmony import */ var _BaseVolumeViewport__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(6203);
 /* harmony import */ var _helpers_setDefaultVolumeVOI__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(83853);
 /* harmony import */ var _utilities_transferFunctionUtils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(22350);
 /* harmony import */ var _utilities_getImageSliceDataForVolumeViewport__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(97508);
-/* harmony import */ var _utilities_getVolumeViewportScrollInfo__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(62255);
+/* harmony import */ var gl_matrix__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(44753);
 
 
 
@@ -5675,14 +5684,23 @@ class VolumeViewport extends _BaseVolumeViewport__WEBPACK_IMPORTED_MODULE_5__/*
             const { numberOfSlices } = (0,_utilities_getImageSliceDataForVolumeViewport__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A)(this);
             return numberOfSlices;
         };
+        this.getCurrentImageIdIndex = (volumeId) => {
+            const { viewPlaneNormal, focalPoint } = this.getCamera();
+            const imageData = this.getImageData(volumeId);
+            if (!imageData) {
+                return;
+            }
+            const { origin, direction, spacing } = imageData;
+            const spacingInNormal = (0,_utilities__WEBPACK_IMPORTED_MODULE_4__.getSpacingInNormalDirection)({ direction, spacing }, viewPlaneNormal);
+            const sub = gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.create */ .eR.create();
+            gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.sub */ .eR.sub(sub, focalPoint, origin);
+            const distance = gl_matrix__WEBPACK_IMPORTED_MODULE_9__/* .vec3.dot */ .eR.dot(sub, viewPlaneNormal);
+            return Math.round(Math.abs(distance) / spacingInNormal);
+        };
         this.getSliceIndex = () => {
             const { imageIndex } = (0,_utilities_getImageSliceDataForVolumeViewport__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .A)(this);
             return imageIndex;
         };
-        this.getCurrentImageIdIndex = (volumeId, useSlabThickness = true) => {
-            const { currentStepIndex } = (0,_utilities_getVolumeViewportScrollInfo__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .A)(this, volumeId || this.getVolumeId(), useSlabThickness);
-            return currentStepIndex;
-        };
         this.getCurrentImageId = () => {
             const actorEntry = this.getDefaultActor();
             if (!actorEntry || !(0,_utilities__WEBPACK_IMPORTED_MODULE_4__.actorIsA)(actorEntry, 'vtkVolume')) {
@@ -7256,8 +7274,8 @@ function storedPixelDataToCanvasImageDataPseudocolorLUTPET(image, lutFunction, c
 }
 /* harmony default export */ const rendering_storedPixelDataToCanvasImageDataPseudocolorLUTPET = (storedPixelDataToCanvasImageDataPseudocolorLUTPET);
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 68 modules
-var utilities = __webpack_require__(20228);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 70 modules
+var utilities = __webpack_require__(35678);
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/helpers/cpuFallback/rendering/renderPseudoColorImage.js
 
 
@@ -8312,8 +8330,8 @@ function createVolumeMapper(imageData, vtkOpenGLTexture) {
     return volumeMapper;
 }
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 68 modules
-var utilities = __webpack_require__(20228);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 70 modules
+var utilities = __webpack_require__(35678);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/enums/index.js + 4 modules
 var enums = __webpack_require__(98362);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/helpers/setDefaultVolumeVOI.js
@@ -8424,7 +8442,7 @@ var addImageSlicesToViewports = __webpack_require__(25271);
 /* harmony export */ });
 /* harmony import */ var _loaders_imageLoader__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(79220);
 /* harmony import */ var _metaData__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(55692);
-/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(20228);
+/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(35678);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(98362);
 /* harmony import */ var _cache__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(13320);
 
@@ -8578,7 +8596,7 @@ function _isCurrentImagePTPrescaled(modality, imageVolume) {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__),
 /* harmony export */   g: () => (/* binding */ resetVolumeNewImageState)
 /* harmony export */ });
-/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(20228);
+/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(35678);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(98362);
 /* harmony import */ var _getRenderingEngine__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(49184);
 /* harmony import */ var _BaseVolumeViewport__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6203);
@@ -8645,8 +8663,8 @@ var Events = __webpack_require__(11731);
 var renderingEngineCache = __webpack_require__(94070);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/eventTarget.js
 var eventTarget = __webpack_require__(51884);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 68 modules
-var utilities = __webpack_require__(20228);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 70 modules
+var utilities = __webpack_require__(35678);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/vtkClasses/index.js + 27 modules
 var vtkClasses = __webpack_require__(69585);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/enums/ViewportType.js
@@ -15436,7 +15454,7 @@ function vtkSlabCamera(publicAPI, model) {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 /* unused harmony export Cache */
-/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(20228);
+/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(35678);
 /* harmony import */ var _eventTarget__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(51884);
 /* harmony import */ var _enums_Events__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(11731);
 /* harmony import */ var _classes_ImageVolume__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(77076);
@@ -15918,8 +15936,8 @@ function isTypedArray(obj) {
         obj instanceof Float64Array);
 }
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 68 modules
-var utilities = __webpack_require__(20228);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 70 modules
+var utilities = __webpack_require__(35678);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/vtkClasses/index.js + 27 modules
 var vtkClasses = __webpack_require__(69585);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/cache/cache.js
@@ -23703,8 +23721,8 @@ async function createAndCacheGeometry(geometryId, options) {
 
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/loaders/ProgressiveRetrieveImages.js + 4 modules
 var ProgressiveRetrieveImages = __webpack_require__(71090);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 68 modules
-var utilities = __webpack_require__(20228);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 70 modules
+var utilities = __webpack_require__(35678);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/triggerEvent.js
 var triggerEvent = __webpack_require__(13292);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/helpers/index.js + 5 modules
@@ -23767,8 +23785,8 @@ function e(e,t,r,n){return new(r||(r=Promise))((function(o,a){function i(e){try{
 var enums = __webpack_require__(98362);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/getRenderingEngine.js
 var getRenderingEngine = __webpack_require__(49184);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 68 modules
-var utilities = __webpack_require__(20228);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 70 modules
+var utilities = __webpack_require__(35678);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/webWorkerManager/webWorkerManager.js
 var webWorkerManager = __webpack_require__(61874);
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/init.js
@@ -24089,8 +24107,8 @@ const interleavedRetrieveConfiguration = [
 
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/loaders/imageLoader.js
 var imageLoader = __webpack_require__(79220);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 68 modules
-var utilities = __webpack_require__(20228);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/index.js + 70 modules
+var utilities = __webpack_require__(35678);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/requestPool/imageLoadPoolManager.js
 var imageLoadPoolManager = __webpack_require__(775);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/cache/index.js
@@ -24851,73 +24869,6 @@ const getVolumeId = (targetId) => {
 };
 
 
-/***/ }),
-
-/***/ 76399:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
-/* harmony export */ });
-/* harmony import */ var _getSliceRange__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(51849);
-/* harmony import */ var _getTargetVolumeAndSpacingInNormalDir__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(94172);
-
-
-function getVolumeSliceRangeInfo(viewport, volumeId, useSlabThickness = false) {
-    const camera = viewport.getCamera();
-    const { focalPoint, viewPlaneNormal } = camera;
-    const { spacingInNormalDirection, actorUID } = (0,_getTargetVolumeAndSpacingInNormalDir__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A)(viewport, camera, volumeId, useSlabThickness);
-    if (!actorUID) {
-        throw new Error(`Could not find image volume with id ${volumeId} in the viewport`);
-    }
-    const actorEntry = viewport.getActor(actorUID);
-    if (!actorEntry) {
-        console.warn('No actor found for with actorUID of', actorUID);
-        return null;
-    }
-    const volumeActor = actorEntry.actor;
-    const sliceRange = (0,_getSliceRange__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A)(volumeActor, viewPlaneNormal, focalPoint);
-    return {
-        sliceRange,
-        spacingInNormalDirection,
-        camera,
-    };
-}
-/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (getVolumeSliceRangeInfo);
-
-
-/***/ }),
-
-/***/ 62255:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
-/* harmony export */ });
-/* harmony import */ var _getVolumeSliceRangeInfo__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(76399);
-
-function getVolumeViewportScrollInfo(viewport, volumeId, useSlabThickness = false) {
-    const { sliceRange, spacingInNormalDirection, camera } = (0,_getVolumeSliceRangeInfo__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A)(viewport, volumeId, useSlabThickness);
-    const { min, max, current } = sliceRange;
-    const numScrollSteps = Math.round((max - min) / spacingInNormalDirection);
-    const fraction = (current - min) / (max - min);
-    const floatingStepNumber = fraction * numScrollSteps;
-    const currentStepIndex = Math.round(floatingStepNumber);
-    return {
-        numScrollSteps,
-        currentStepIndex,
-        sliceRangeInfo: {
-            sliceRange,
-            spacingInNormalDirection,
-            camera,
-        },
-    };
-}
-/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (getVolumeViewportScrollInfo);
-
-
 /***/ }),
 
 /***/ 73139:
@@ -24937,7 +24888,7 @@ function hasNaNValues(input) {
 
 /***/ }),
 
-/***/ 20228:
+/***/ 35678:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -24994,8 +24945,8 @@ __webpack_require__.d(__webpack_exports__, {
   getVoiFromSigmoidRGBTransferFunction: () => (/* reexport */ getVoiFromSigmoidRGBTransferFunction),
   getVolumeActorCorners: () => (/* reexport */ getVolumeActorCorners/* default */.A),
   getVolumeId: () => (/* reexport */ getVolumeId/* getVolumeId */.A),
-  getVolumeSliceRangeInfo: () => (/* reexport */ getVolumeSliceRangeInfo/* default */.A),
-  getVolumeViewportScrollInfo: () => (/* reexport */ getVolumeViewportScrollInfo/* default */.A),
+  getVolumeSliceRangeInfo: () => (/* reexport */ utilities_getVolumeSliceRangeInfo),
+  getVolumeViewportScrollInfo: () => (/* reexport */ utilities_getVolumeViewportScrollInfo),
   getVolumeViewportsContainingSameVolumes: () => (/* reexport */ utilities_getVolumeViewportsContainingSameVolumes),
   hasFloatScalingParameters: () => (/* reexport */ hasFloatScalingParameters),
   hasNaNValues: () => (/* reexport */ hasNaNValues/* default */.A),
@@ -25905,12 +25856,54 @@ function imageToWorldCoords(imageId, imageCoords) {
     return Array.from(imageCoordsInWorld);
 }
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/getVolumeSliceRangeInfo.js
-var getVolumeSliceRangeInfo = __webpack_require__(76399);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/getVolumeViewportScrollInfo.js
-var getVolumeViewportScrollInfo = __webpack_require__(62255);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/getSliceRange.js
 var getSliceRange = __webpack_require__(51849);
+;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/getVolumeSliceRangeInfo.js
+
+
+function getVolumeSliceRangeInfo(viewport, volumeId, useSlabThickness = false) {
+    const camera = viewport.getCamera();
+    const { focalPoint, viewPlaneNormal } = camera;
+    const { spacingInNormalDirection, actorUID } = (0,getTargetVolumeAndSpacingInNormalDir/* default */.A)(viewport, camera, volumeId, useSlabThickness);
+    if (!actorUID) {
+        throw new Error(`Could not find image volume with id ${volumeId} in the viewport`);
+    }
+    const actorEntry = viewport.getActor(actorUID);
+    if (!actorEntry) {
+        console.warn('No actor found for with actorUID of', actorUID);
+        return null;
+    }
+    const volumeActor = actorEntry.actor;
+    const sliceRange = (0,getSliceRange/* default */.A)(volumeActor, viewPlaneNormal, focalPoint);
+    return {
+        sliceRange,
+        spacingInNormalDirection,
+        camera,
+    };
+}
+/* harmony default export */ const utilities_getVolumeSliceRangeInfo = (getVolumeSliceRangeInfo);
+
+;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/getVolumeViewportScrollInfo.js
+
+function getVolumeViewportScrollInfo(viewport, volumeId, useSlabThickness = false) {
+    const { sliceRange, spacingInNormalDirection, camera } = utilities_getVolumeSliceRangeInfo(viewport, volumeId, useSlabThickness);
+    const { min, max, current } = sliceRange;
+    const numScrollSteps = Math.round((max - min) / spacingInNormalDirection);
+    const fraction = (current - min) / (max - min);
+    const floatingStepNumber = fraction * numScrollSteps;
+    const currentStepIndex = Math.round(floatingStepNumber);
+    return {
+        numScrollSteps,
+        currentStepIndex,
+        sliceRangeInfo: {
+            sliceRange,
+            spacingInNormalDirection,
+            camera,
+        },
+    };
+}
+/* harmony default export */ const utilities_getVolumeViewportScrollInfo = (getVolumeViewportScrollInfo);
+
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/snapFocalPointToSlice.js
 
 function snapFocalPointToSlice(focalPoint, position, sliceRange, viewPlaneNormal, spacingInNormalDirection, deltaFrames) {
@@ -30262,7 +30255,7 @@ const cameraResetEventDispatcher_disable = function (element) {
 /* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(74119);
 /* harmony import */ var _utilities_viewportFilters__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(90252);
 /* harmony import */ var _stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(38296);
-/* harmony import */ var _utilities_contours__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(75534);
+/* harmony import */ var _utilities_contours__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(75908);
 /* harmony import */ var _utilities_contourSegmentation__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(7259);
 /* harmony import */ var _store__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(61738);
 /* harmony import */ var _tools__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(81848);
@@ -30365,12 +30358,14 @@ function findIntersectingContour(viewport, sourcePolyline, contourSegmentationAn
 function createPolylineHole(viewport, targetAnnotation, holeAnnotation) {
     const { windingDirection: targetWindingDirection } = targetAnnotation.data.contour;
     const { windingDirection: holeWindingDirection } = holeAnnotation.data.contour;
-    if (targetWindingDirection === holeWindingDirection) {
-        holeAnnotation.data.contour.polyline.reverse();
-        holeAnnotation.data.contour.windingDirection = targetWindingDirection * -1;
-    }
     (0,_stateManagement_annotation_annotationState__WEBPACK_IMPORTED_MODULE_4__.addChildAnnotation)(targetAnnotation, holeAnnotation);
     _utilities_contourSegmentation__WEBPACK_IMPORTED_MODULE_6__.removeContourSegmentationAnnotation(holeAnnotation);
+    const { contour: holeContour } = holeAnnotation.data;
+    const holePolyline = convertContourPolylineToCanvasSpace(holeContour.polyline, viewport);
+    _utilities_contours__WEBPACK_IMPORTED_MODULE_5__.updateContourPolyline(holeAnnotation, {
+        points: holePolyline,
+        closed: holeContour.closed,
+    }, viewport);
     const { element } = viewport;
     const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.getEnabledElement)(element);
     const { renderingEngine } = enabledElement;
@@ -44669,7 +44664,7 @@ class LivewireContourSegmentationTool extends _LivewireContourTool__WEBPACK_IMPO
             }
             this.updateAnnotation(acceptedPath);
             this.scissors = null;
-            this.scissorsRight = null;
+            this.scissorsNext = null;
             this.editData = null;
             annotation.data.handles.interpolationSources = null;
             if (repeatInterpolation) {
@@ -45015,7 +45010,7 @@ class LivewireContourTool extends _base_ContourSegmentationBaseTool__WEBPACK_IMP
             element.removeEventListener(_enums__WEBPACK_IMPORTED_MODULE_5__.Events.TOUCH_TAP, this._mouseDownCallback);
         };
     }
-    setupBaseEditData(worldPos, element, annotation, rightPos, contourHoleProcessingEnabled) {
+    setupBaseEditData(worldPos, element, annotation, nextPos, contourHoleProcessingEnabled) {
         const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_1__.getEnabledElement)(element);
         const { viewport } = enabledElement;
         this.isDrawing = true;
@@ -45058,12 +45053,12 @@ class LivewireContourTool extends _base_ContourSegmentationBaseTool__WEBPACK_IMP
         const { voiRange } = viewport.getProperties();
         const startPos = worldToSlice(worldPos);
         this.scissors = _utilities_livewire_LivewireScissors__WEBPACK_IMPORTED_MODULE_12__/* .LivewireScissors */ .f.createInstanceFromRawPixelData(scalarData, width, height, voiRange);
-        if (rightPos) {
-            this.scissorsRight = _utilities_livewire_LivewireScissors__WEBPACK_IMPORTED_MODULE_12__/* .LivewireScissors */ .f.createInstanceFromRawPixelData(scalarData, width, height, voiRange);
-            this.scissorsRight.startSearch(worldToSlice(rightPos));
+        if (nextPos) {
+            this.scissorsNext = _utilities_livewire_LivewireScissors__WEBPACK_IMPORTED_MODULE_12__/* .LivewireScissors */ .f.createInstanceFromRawPixelData(scalarData, width, height, voiRange);
+            this.scissorsNext.startSearch(worldToSlice(nextPos));
         }
         this.scissors.startSearch(startPos);
-        const newAnnotation = !rightPos;
+        const newAnnotation = !nextPos;
         const confirmedPath = new _utilities_livewire_LiveWirePath__WEBPACK_IMPORTED_MODULE_13__/* .LivewirePath */ .j();
         const currentPath = new _utilities_livewire_LiveWirePath__WEBPACK_IMPORTED_MODULE_13__/* .LivewirePath */ .j();
         const currentPathNext = newAnnotation ? undefined : new _utilities_livewire_LiveWirePath__WEBPACK_IMPORTED_MODULE_13__/* .LivewirePath */ .j();
@@ -45079,7 +45074,7 @@ class LivewireContourTool extends _base_ContourSegmentationBaseTool__WEBPACK_IMP
             lastCanvasPoint,
             confirmedPath,
             currentPath,
-            confirmedPathRight: currentPathNext,
+            confirmedPathNext: currentPathNext,
             closed: false,
             handleIndex: this.editData?.handleIndex ?? annotation.handles?.activeHandleIndex,
             worldToSlice,
@@ -45105,7 +45100,7 @@ class LivewireContourTool extends _base_ContourSegmentationBaseTool__WEBPACK_IMP
     clearEditData() {
         this.editData = null;
         this.scissors = null;
-        this.scissorsRight = null;
+        this.scissorsNext = null;
         this.isDrawing = false;
     }
     editHandle(worldPos, element, annotation, handleIndex) {
@@ -45114,11 +45109,11 @@ class LivewireContourTool extends _base_ContourSegmentationBaseTool__WEBPACK_IMP
         const { length: numHandles } = handlePoints;
         const previousHandle = handlePoints[(handleIndex - 1 + numHandles) % numHandles];
         const nextHandle = handlePoints[(handleIndex + 1) % numHandles];
-        if (!this.editData?.confirmedPathRight) {
+        if (!this.editData?.confirmedPathNext) {
             this.setupBaseEditData(previousHandle, element, annotation, nextHandle);
             const { polyline } = data.contour;
             const confirmedPath = new _utilities_livewire_LiveWirePath__WEBPACK_IMPORTED_MODULE_13__/* .LivewirePath */ .j();
-            const confirmedPathRight = new _utilities_livewire_LiveWirePath__WEBPACK_IMPORTED_MODULE_13__/* .LivewirePath */ .j();
+            const confirmedPathNext = new _utilities_livewire_LiveWirePath__WEBPACK_IMPORTED_MODULE_13__/* .LivewirePath */ .j();
             const { worldToSlice } = this.editData;
             const previousIndex = (0,_utilities_contours_findHandlePolylineIndex__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .A)(annotation, handleIndex - 1);
             const nextIndex = (0,_utilities_contours_findHandlePolylineIndex__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .A)(annotation, handleIndex + 1);
@@ -45126,17 +45121,14 @@ class LivewireContourTool extends _base_ContourSegmentationBaseTool__WEBPACK_IMP
                 throw new Error(`Can't find handle index ${nextIndex === -1 && nextHandle} ${previousIndex === -1 && previousHandle}`);
             }
             if (handleIndex === 0) {
-                confirmedPathRight.addPoints(polyline.slice(nextIndex + 1, previousIndex).map(worldToSlice));
-            }
-            else if (nextIndex < previousIndex) {
-                throw new Error(`Expected right index after left index, but were: ${previousIndex} ${nextIndex}`);
+                confirmedPathNext.addPoints(polyline.slice(nextIndex + 1, previousIndex).map(worldToSlice));
             }
             else {
                 confirmedPath.addPoints(polyline.slice(0, previousIndex + 1).map(worldToSlice));
-                confirmedPathRight.addPoints(polyline.slice(nextIndex, polyline.length).map(worldToSlice));
+                confirmedPathNext.addPoints(polyline.slice(nextIndex, polyline.length).map(worldToSlice));
             }
             this.editData.confirmedPath = confirmedPath;
-            this.editData.confirmedPathRight = confirmedPathRight;
+            this.editData.confirmedPathNext = confirmedPathNext;
         }
         const { editData, scissors } = this;
         const { worldToSlice, sliceToWorld } = editData;
@@ -45156,14 +45148,14 @@ class LivewireContourTool extends _base_ContourSegmentationBaseTool__WEBPACK_IMP
         }
         handlePoints[handleIndex] = sliceToWorld(slicePos);
         const pathPointsLeft = scissors.findPathToPoint(slicePos);
-        const pathPointsRight = this.scissorsRight.findPathToPoint(slicePos);
+        const pathPointsRight = this.scissorsNext.findPathToPoint(slicePos);
         const currentPath = new _utilities_livewire_LiveWirePath__WEBPACK_IMPORTED_MODULE_13__/* .LivewirePath */ .j();
         currentPath.prependPath(editData.confirmedPath);
         if (handleIndex !== 0) {
             currentPath.addPoints(pathPointsLeft);
         }
         currentPath.addPoints(pathPointsRight.reverse());
-        currentPath.appendPath(editData.confirmedPathRight);
+        currentPath.appendPath(editData.confirmedPathNext);
         if (handleIndex === 0) {
             currentPath.addPoints(pathPointsLeft);
         }
@@ -45222,17 +45214,19 @@ class LivewireContourTool extends _base_ContourSegmentationBaseTool__WEBPACK_IMP
         if (!this.editData || !livewirePath) {
             return;
         }
-        const { annotation, sliceToWorld } = this.editData;
+        const { annotation, sliceToWorld, worldToSlice, closed, newAnnotation } = this.editData;
         let { pointArray: imagePoints } = livewirePath;
         if (imagePoints.length > 1) {
             imagePoints = [...imagePoints, imagePoints[0]];
         }
+        const targetWindingDirection = newAnnotation && closed ? _types_ContourAnnotation__WEBPACK_IMPORTED_MODULE_10__/* .ContourWindingDirection */ .W.Clockwise : undefined;
         this.updateContourPolyline(annotation, {
             points: imagePoints,
-            closed: annotation.data.contour.closed,
-            targetWindingDirection: _types_ContourAnnotation__WEBPACK_IMPORTED_MODULE_10__/* .ContourWindingDirection */ .W.Clockwise,
+            closed,
+            targetWindingDirection,
         }, {
             canvasToWorld: sliceToWorld,
+            worldToCanvas: worldToSlice,
         });
     }
 }

package/dist/{717.bundle.6547980cca1f670e7369.js → 717.bundle.ed7b18342e965b920fb1.js}

@@ -225,7 +225,7 @@ const machineConfiguration = {
         src: 'promptHydrateStructuredReport',
         onDone: [{
           target: 'tracking',
-          actions: ['setTrackedStudyAndMultipleSeries', 'jumpToFirstMeasurementInActiveViewport', 'setIsDirtyToClean'],
+          actions: ['setTrackedStudyAndMultipleSeries', 'jumpToSameImageInActiveViewport', 'setIsDirtyToClean'],
           cond: 'shouldHydrateStructuredReport'
         }, {
           target: 'idle',
@@ -242,7 +242,7 @@ const machineConfiguration = {
         src: 'hydrateStructuredReport',
         onDone: [{
           target: 'tracking',
-          actions: ['setTrackedStudyAndMultipleSeries', 'jumpToFirstMeasurementInActiveViewport', 'setIsDirtyToClean']
+          actions: ['setTrackedStudyAndMultipleSeries', 'jumpToSameImageInActiveViewport', 'setIsDirtyToClean']
         }],
         onError: {
           target: 'idle'
@@ -714,8 +714,8 @@ function promptTrackNewStudy_askSaveDiscardOrCancel(UIViewportDialogService, vie
   });
 }
 /* harmony default export */ const TrackedMeasurementsContext_promptTrackNewStudy = (promptTrackNewStudy);
-// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 90 modules
-var default_src = __webpack_require__(48827);
+// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 91 modules
+var default_src = __webpack_require__(36822);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/_shared/getNextSRSeriesNumber.js
 const MIN_SR_SERIES_NUMBER = 4700;
 function getNextSRSeriesNumber(displaySetService) {
@@ -1005,7 +1005,8 @@ function TrackedMeasurementsContextProvider({
   const {
     measurementService,
     displaySetService,
-    customizationService
+    customizationService,
+    cornerstoneViewportService
   } = servicesManager.services;
   const machineOptions = Object.assign({}, defaultOptions);
   machineOptions.actions = Object.assign({}, machineOptions.actions, {
@@ -1046,6 +1047,28 @@ function TrackedMeasurementsContextProvider({
         }
       });
     },
+    jumpToSameImageInActiveViewport: (ctx, evt) => {
+      const {
+        trackedStudy,
+        trackedSeries,
+        activeViewportId
+      } = ctx;
+      const measurements = measurementService.getMeasurements();
+      const trackedMeasurements = measurements.filter(m => trackedStudy === m.referenceStudyUID && trackedSeries.includes(m.referenceSeriesUID));
+      const trackedMeasurement = trackedMeasurements[0];
+      const referencedDisplaySetUID = trackedMeasurement.displaySetInstanceUID;
+      const viewport = cornerstoneViewportService.getCornerstoneViewport(activeViewportId);
+      const imageIndex = viewport.getCurrentImageIdIndex();
+      viewportGridService.setDisplaySetsForViewport({
+        viewportId: activeViewportId,
+        displaySetInstanceUIDs: [referencedDisplaySetUID],
+        viewportOptions: {
+          initialImageOptions: {
+            index: imageIndex
+          }
+        }
+      });
+    },
     showStructuredReportDisplaySetInActiveViewport: (ctx, evt) => {
       if (evt.data.createdDisplaySetInstanceUIDs.length > 0) {
         const StructuredReportDisplaySetInstanceUID = evt.data.createdDisplaySetInstanceUIDs[0];