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

package/dist/{236.bundle.ed0702d760569f060757.js → 236.bundle.a7e2f9e0cb3668fb6937.js}

@@ -2165,7 +2165,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);
@@ -2268,12 +2268,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;
@@ -17577,7 +17579,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) {
@@ -17922,7 +17924,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;
@@ -17965,12 +17967,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();
@@ -17986,7 +17988,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,
@@ -18012,7 +18014,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) {
@@ -18021,11 +18023,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);
@@ -18033,17 +18035,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;
@@ -18063,14 +18062,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);
         }
@@ -18129,17 +18128,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,
         });
     }
 }
@@ -24163,56 +24164,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-/***/ }),
-
-/***/ 75534:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-__webpack_require__.r(__webpack_exports__);
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   AnnotationToPointData: () => (/* reexport safe */ _AnnotationToPointData__WEBPACK_IMPORTED_MODULE_5__.A),
-/* harmony export */   acceptAutogeneratedInterpolations: () => (/* reexport safe */ _interpolation_acceptAutogeneratedInterpolations__WEBPACK_IMPORTED_MODULE_9__.A),
-/* harmony export */   areCoplanarContours: () => (/* reexport safe */ _areCoplanarContours__WEBPACK_IMPORTED_MODULE_0__.A),
-/* harmony export */   calculatePerimeter: () => (/* reexport safe */ _calculatePerimeter__WEBPACK_IMPORTED_MODULE_12__.A),
-/* harmony export */   contourFinder: () => (/* reexport safe */ _contourFinder__WEBPACK_IMPORTED_MODULE_1__.Ay),
-/* harmony export */   detectContourHoles: () => (/* reexport safe */ _detectContourHoles__WEBPACK_IMPORTED_MODULE_3__.A),
-/* harmony export */   findHandlePolylineIndex: () => (/* reexport safe */ _findHandlePolylineIndex__WEBPACK_IMPORTED_MODULE_11__.A),
-/* harmony export */   generateContourSetsFromLabelmap: () => (/* reexport safe */ _generateContourSetsFromLabelmap__WEBPACK_IMPORTED_MODULE_4__.d),
-/* harmony export */   getContourHolesDataCanvas: () => (/* reexport safe */ _getContourHolesDataCanvas__WEBPACK_IMPORTED_MODULE_7__.A),
-/* harmony export */   getContourHolesDataWorld: () => (/* reexport safe */ _getContourHolesDataWorld__WEBPACK_IMPORTED_MODULE_6__.A),
-/* harmony export */   getDeduplicatedVTKPolyDataPoints: () => (/* reexport safe */ _getDeduplicatedVTKPolyDataPoints__WEBPACK_IMPORTED_MODULE_2__.v),
-/* harmony export */   interpolation: () => (/* reexport module object */ _interpolation__WEBPACK_IMPORTED_MODULE_10__),
-/* harmony export */   updateContourPolyline: () => (/* reexport safe */ _updateContourPolyline__WEBPACK_IMPORTED_MODULE_8__.A)
-/* harmony export */ });
-/* harmony import */ var _areCoplanarContours__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(14633);
-/* harmony import */ var _contourFinder__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(11716);
-/* harmony import */ var _getDeduplicatedVTKPolyDataPoints__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(19866);
-/* harmony import */ var _detectContourHoles__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(92806);
-/* harmony import */ var _generateContourSetsFromLabelmap__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(36392);
-/* harmony import */ var _AnnotationToPointData__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(93712);
-/* harmony import */ var _getContourHolesDataWorld__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(98043);
-/* harmony import */ var _getContourHolesDataCanvas__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(88267);
-/* harmony import */ var _updateContourPolyline__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(89111);
-/* harmony import */ var _interpolation_acceptAutogeneratedInterpolations__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(65864);
-/* harmony import */ var _interpolation__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(69115);
-/* harmony import */ var _findHandlePolylineIndex__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(84045);
-/* harmony import */ var _calculatePerimeter__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(53891);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 /***/ }),
 
 /***/ 65903:
@@ -24344,8 +24295,8 @@ var pointInSurroundingSphereCallback = __webpack_require__(5093);
 var getViewportForAnnotation = __webpack_require__(39490);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/annotationHydration.js
 var annotationHydration = __webpack_require__(25781);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/contours/index.js
-var contours = __webpack_require__(75534);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/contours/index.js + 9 modules
+var contours = __webpack_require__(75908);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/segmentation/index.js
 var segmentation = __webpack_require__(10351);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/drawing/index.js + 1 modules

package/dist/{370.bundle.6b8d3e94eef8e83ced67.js → 370.bundle.26738a863fd92e6b0d96.js}

@@ -3473,7 +3473,7 @@ function findOpenUShapedContourVectorToPeakOnRender(enabledElement, annotation)
 /* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(73047);
 /* harmony import */ var _utilities_planarFreehandROITool_smoothPoints__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(36605);
 /* harmony import */ var _utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(23072);
-/* harmony import */ var _utilities_contours__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(75534);
+/* harmony import */ var _utilities_contours__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(75908);
 /* harmony import */ var _findOpenUShapedContourVectorToPeak__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(51051);
 /* harmony import */ var _stateManagement_annotation_helpers_state__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(54177);
 
@@ -3873,7 +3873,7 @@ function registerOpenContourEndEditLoop(toolInstance) {
 /* harmony import */ var _drawingSvg__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(49574);
 /* harmony import */ var _utilities_math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(73047);
 /* harmony import */ var _findOpenUShapedContourVectorToPeak__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(51051);
-/* harmony import */ var _utilities_contours__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(75534);
+/* harmony import */ var _utilities_contours__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(75908);
 
 
 
@@ -4808,8 +4808,8 @@ var annotationState = __webpack_require__(38296);
 var drawingSvg = __webpack_require__(49574);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/tools/base/AnnotationTool.js
 var AnnotationTool = __webpack_require__(52454);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/contours/index.js
-var contours = __webpack_require__(75534);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/contours/index.js + 9 modules
+var contours = __webpack_require__(75908);
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/tools/base/ContourBaseTool.js