@cornerstonejs/tools 1.7.1 → 1.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "Cornerstone3D Tools",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -17,6 +17,7 @@
   "scripts": {
     "build:cjs": "tsc --project ./tsconfig.cjs.json",
     "build:esm": "tsc --project ./tsconfig.esm.json",
+    "build:esm:watch": "tsc --project ./tsconfig.esm.json --watch",
     "build:umd": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
     "build:all": "yarn run build:umd && yarn run build:cjs && yarn run build:esm",
     "build": "yarn run build:all",
@@ -28,7 +29,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^1.7.1",
+    "@cornerstonejs/core": "^1.8.0",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
   },
@@ -51,5 +52,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "7941b966bc6a5a6e58fe33ad5b929f953c8c78de"
+  "gitHead": "adb02393675fbdb364b9b7d9a9f6d5113b15d8be"
 }

package/src/cursors/SVGCursorDescriptor.ts

@@ -39,7 +39,7 @@ const SCISSOR_ICON = `<path fill="{{color}}" d="M82.89,10a12.09,12.09,0,0,0-16.8
 const RECTANGLE_ICON = `<path fill="{{color}}" d="M8.86,2.25V66.08H72.69V2.25H8.86ZM65.28,58.67h-49v-49h49v49Z" transform="translate(-8.86 -2.25)"/>`;
 const CIRCLE_ICON = `<path fill="{{color}}" d="M40.77,2.25A31.92,31.92,0,1,0,72.69,34.16,31.92,31.92,0,0,0,40.77,2.25Zm0,57.63A25.71,25.71,0,1,1,66.48,34.16,25.71,25.71,0,0,1,40.77,59.87Z" transform="translate(-8.86 -2.25)"/>`;
 
-const CursorSVG = {
+const CursorSVG: Record<string, SVGCursorDescriptor> = {
   Angle: extend(BASE, {
     iconContent: `<path fill="{{color}}" d="M1203 544q0 13-10 23l-393 393 393 393q10 10 10 23t-10 23l-50
     50q-10 10-23 10t-23-10l-466-466q-10-10-10-23t10-23l466-466q10-10 23-10t23
@@ -444,9 +444,7 @@ function registerCursor(
 function getDefinedSVGCursorDescriptor(
   name: string
 ): SVGCursorDescriptor | undefined {
-  if (Object.prototype.hasOwnProperty.call(CursorSVG, name)) {
-    return CursorSVG[name];
-  }
+  return CursorSVG[name];
 }
 
 /*

package/src/stateManagement/segmentation/SegmentationStateManager.ts

@@ -134,6 +134,25 @@ export default class SegmentationStateManager {
     return toolGroupSegRepresentationsWithConfig.segmentationRepresentations;
   }
 
+  /**
+   * Returns an array of all segmentation representations for all tool groups.
+   * @returns An array of ToolGroupSpecificRepresentations.
+   */
+  getAllSegmentationRepresentations(): Record<
+    string,
+    ToolGroupSpecificRepresentation[]
+  > {
+    const toolGroupSegReps: Record<string, ToolGroupSpecificRepresentation[]> =
+      {};
+    Object.entries(this.state.toolGroups).forEach(
+      ([toolGroupId, toolGroupSegRepresentationsWithConfig]) => {
+        toolGroupSegReps[toolGroupId] =
+          toolGroupSegRepresentationsWithConfig.segmentationRepresentations;
+      }
+    );
+    return toolGroupSegReps;
+  }
+
   /**
    * Add a new segmentation representation to the toolGroup's segmentation representations.
    * @param toolGroupId - The Id of the tool group .

package/src/stateManagement/segmentation/segmentationState.ts

@@ -85,6 +85,18 @@ function getSegmentationRepresentations(
   return segmentationStateManager.getSegmentationRepresentations(toolGroupId);
 }
 
+/**
+ * Get all segmentation representations in the state
+ * @returns An array of segmentation representation objects.
+ */
+function getAllSegmentationRepresentations(): Record<
+  string,
+  ToolGroupSpecificRepresentation[]
+> {
+  const segmentationStateManager = getDefaultSegmentationStateManager();
+  return segmentationStateManager.getAllSegmentationRepresentations();
+}
+
 /**
  * Get the tool group IDs that have a segmentation representation with the given
  * segmentationId
@@ -92,6 +104,10 @@ function getSegmentationRepresentations(
  * @returns An array of tool group IDs.
  */
 function getToolGroupIdsWithSegmentation(segmentationId: string): string[] {
+  if (!segmentationId) {
+    throw new Error('getToolGroupIdsWithSegmentation: segmentationId is empty');
+  }
+
   const segmentationStateManager = getDefaultSegmentationStateManager();
   const state = segmentationStateManager.getState();
   const toolGroupIds = Object.keys(state.toolGroups);
@@ -405,6 +421,7 @@ export {
   setSegmentSpecificRepresentationConfig,
   // helpers s
   getToolGroupIdsWithSegmentation,
+  getAllSegmentationRepresentations,
   getSegmentationRepresentationByUID,
   // color
   addColorLUT,

package/src/tools/segmentation/strategies/eraseRectangle.ts

@@ -35,10 +35,6 @@ function eraseRectangle(
 
   const boundsIJK = getBoundingBoxAroundShape(rectangleCornersIJK, dimensions);
 
-  if (boundsIJK.every(([min, max]) => min !== max)) {
-    throw new Error('Oblique segmentation tools are not supported yet');
-  }
-
   // Since always all points inside the boundsIJK is inside the rectangle...
   const pointInShape = () => true;
 

package/src/tools/segmentation/strategies/fillCircle.ts

@@ -68,10 +68,6 @@ function fillCircle(
 
   const boundsIJK = getBoundingBoxAroundShape(ellipsoidCornersIJK, dimensions);
 
-  if (boundsIJK.every(([min, max]) => min !== max)) {
-    throw new Error('Oblique segmentation tools are not supported yet');
-  }
-
   // using circle as a form of ellipse
   const ellipseObj = {
     center: center as Types.Point3,

package/src/tools/segmentation/strategies/fillRectangle.ts

@@ -54,10 +54,6 @@ function fillRectangle(
 
   const boundsIJK = getBoundingBoxAroundShape(rectangleCornersIJK, dimensions);
 
-  if (boundsIJK.every(([min, max]) => min !== max)) {
-    throw new Error('Oblique segmentation tools are not supported yet');
-  }
-
   // Since always all points inside the boundsIJK is inside the rectangle...
   const pointInRectangle = () => true;