@cornerstonejs/tools 1.40.0 → 1.40.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.40.0",
+  "version": "1.40.2",
   "description": "Cornerstone3D Tools",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -29,7 +29,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^1.40.0",
+    "@cornerstonejs/core": "^1.40.2",
     "comlink": "^4.4.1",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
@@ -53,5 +53,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "28ed3eaf75ccd5cab7c7c0df0f4b09950cc42d7c"
+  "gitHead": "d0219949539e3f24a1b8f880c6c6aba797e061eb"
 }

package/src/stateManagement/segmentation/addSegmentationRepresentation.ts

@@ -5,7 +5,6 @@ import {
   RepresentationPublicInput,
   ToolGroupSpecificRepresentation,
 } from '../../types/SegmentationStateTypes';
-import Representations from '../../enums/SegmentationRepresentations';
 import * as SegmentationConfig from './config/segmentationConfig';
 import {
   addSegmentationRepresentation as addSegmentationRepresentationToState,
@@ -44,7 +43,7 @@ async function addSegmentationRepresentation(
   const toolGroupSpecificRepresentation: ToolGroupSpecificRepresentation = {
     segmentationId,
     segmentationRepresentationUID,
-    type: Representations.Labelmap,
+    type: representationInput.type,
     segmentsHidden,
     colorLUTIndex: colorLUTIndexToUse,
     active: true,

package/src/tools/annotation/LivewireContourTool.ts

@@ -1,4 +1,4 @@
-import { glMatrix, mat4, vec3 } from 'gl-matrix';
+import { vec3 } from 'gl-matrix';
 import { AnnotationTool } from '../base';
 
 import {
@@ -30,11 +30,7 @@ import {
   ToolProps,
   SVGDrawingHelper,
 } from '../../types';
-import {
-  math,
-  viewportFilters,
-  triggerAnnotationRenderForViewportIds,
-} from '../../utilities';
+import { math, triggerAnnotationRenderForViewportIds } from '../../utilities';
 import { LivewireContourAnnotation } from '../../types/ToolSpecificAnnotationTypes';
 import {
   AnnotationCompletedEventDetail,
@@ -44,8 +40,8 @@ import { StyleSpecifier } from '../../types/AnnotationStyle';
 
 import { LivewireScissors } from '../../utilities/livewire/LivewireScissors';
 import { LivewirePath } from '../../utilities/livewire/LiveWirePath';
+import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 
-const { getViewportIdsWithToolToRender } = viewportFilters;
 const CLICK_CLOSE_CURVE_SQR_DIST = 10 ** 2; // px
 
 class LivewireContourTool extends AnnotationTool {
@@ -406,7 +402,6 @@ class LivewireContourTool extends AnnotationTool {
     const { viewport, renderingEngine } = enabledElement;
     const controlPoints = this.editData.currentPath.getControlPoints();
     let closePath = controlPoints.length >= 2 && doubleClick;
-    let addNewPoint = true;
 
     // Check if user clicked on the first point to close the curve
     if (controlPoints.length >= 2) {
@@ -436,24 +431,20 @@ class LivewireContourTool extends AnnotationTool {
       }
 
       if (closestHandlePoint.index === 0) {
-        addNewPoint = false;
         closePath = true;
       }
     }
 
     this.editData.closed = this.editData.closed || closePath;
+    this.editData.confirmedPath = this.editData.currentPath;
 
-    if (addNewPoint) {
-      this.editData.confirmedPath = this.editData.currentPath;
-
-      // Add the current cursor position as a new control point after clicking
-      this.editData.confirmedPath.addControlPoint(
-        this.editData.currentPath.getLastPoint()
-      );
+    // Add the current cursor position as a new control point after clicking
+    this.editData.confirmedPath.addControlPoint(
+      this.editData.currentPath.getLastPoint()
+    );
 
-      // Start a new search starting at the last control point
-      this.scissors.startSearch(worldToSlice(worldPos));
-    }
+    // Start a new search starting at the last control point
+    this.scissors.startSearch(worldToSlice(worldPos));
 
     annotation.invalidated = true;
     triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);

package/src/tools/annotation/SplineROITool.ts

@@ -52,8 +52,6 @@ import { CardinalSpline } from './splines/CardinalSpline';
 import { LinearSpline } from './splines/LinearSpline';
 import { CatmullRomSpline } from './splines/CatmullRomSpline';
 import { BSpline } from './splines/BSpline';
-import * as viewportFilters from '../../utilities/viewportFilters';
-import * as drawing from '../../utilities/drawing';
 
 const SPLINE_MIN_POINTS = 3;
 const SPLINE_CLICK_CLOSE_CURVE_DIST = 10;

package/src/tools/segmentation/strategies/utils/stackVolumeCheck.ts

@@ -26,7 +26,7 @@ function isVolumeSegmentation(
   | LabelmapToolOperationDataVolume
   | LabelmapSegmentationDataVolume {
   return (
-    (operationData as LabelmapToolOperationDataVolume).volumeId !== undefined
+    (operationData as LabelmapToolOperationDataVolume)?.volumeId !== undefined
   );
 }