@cornerstonejs/polymorphic-segmentation 5.8.2 → 5.10.3

package/dist/esm/Contour/contourComputationStrategies.js

@@ -4,6 +4,8 @@ import { extractContourData } from './utils/extractContourData.js';
 import { computeSurfaceFromLabelmapSegmentation } from '../Surface/surfaceComputationStrategies.js';
 import { clipAndCacheSurfacesForViewport } from '../utilities/clipAndCacheSurfacesForViewport.js';
 import { createAndAddContourSegmentationsFromClippedSurfaces } from './utils/createAndAddContourSegmentationsFromClippedSurfaces.js';
+import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
+const cs3dLogger = cornerstoneUtilities.logger.polySegLog.getLogger('Contour.contourComputationStrategies');
 const { getUniqueSegmentIndices } = utilities.segmentation;
 const { getSegmentation } = segmentation.state;
 const { segmentationStyle } = segmentation;
@@ -30,7 +32,7 @@ export async function computeContourData(segmentationId, options = {}) {
         }
     }
     catch (error) {
-        console.error(error);
+        cs3dLogger.error(error);
         throw error;
     }
     if (!rawContourData) {
@@ -51,7 +53,7 @@ async function computeContourFromLabelmapSegmentation(segmentationId, options =
     }
     const results = await computeSurfaceFromLabelmapSegmentation(segmentationId, options);
     if (!results?.length) {
-        console.error('Failed to convert labelmap to surface or labelmap is empty');
+        cs3dLogger.error('Failed to convert labelmap to surface or labelmap is empty');
         return;
     }
     const { viewport } = options;

package/dist/esm/Contour/utils/createAndAddContourSegmentationsFromClippedSurfaces.js

@@ -1,6 +1,8 @@
 import { utilities } from '@cornerstonejs/core';
 import { PlanarFreehandContourSegmentationTool, annotation, } from '@cornerstonejs/tools';
 import { vec3 } from 'gl-matrix';
+import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
+const cs3dLogger = cornerstoneUtilities.logger.polySegLog.getLogger('Contour.utils.createAndAddContourSegmentationsFromClippedSurfaces');
 function findBestContourForNormalCalculation(lines, minPreferredPoints = 3) {
     let bestContourIndex = 0;
     let bestCount = 0;
@@ -84,12 +86,12 @@ const { addAnnotation } = annotation.state;
 export function createAndAddContourSegmentationsFromClippedSurfaces(rawContourData, viewport, segmentationId) {
     const annotationUIDsMap = new Map();
     if (!viewport) {
-        console.warn('Invalid viewport given');
+        cs3dLogger.warn('Invalid viewport given');
         return;
     }
     const camera = viewport.getCamera();
     if (!camera) {
-        console.warn('Camera not available in viewport');
+        cs3dLogger.warn('Camera not available in viewport');
         return;
     }
     const planeNormal = camera.viewPlaneNormal;

package/dist/esm/Labelmap/convertContourToLabelmap.js

@@ -107,7 +107,7 @@ export async function convertContourToStackLabelmap(contourRepresentationData, o
         const segmentationInfo = segmentationsInfo.get(referencedImageId);
         const { imageId: segImageId } = segmentationInfo;
         const segImage = cache.getImage(segImageId);
-        segImage.voxelManager.getScalarData().set(scalarData);
+        segImage.voxelManager.setFromScalarData(scalarData);
         segImage.imageFrame?.pixelData?.set(scalarData);
         segImageIds.push(segImageId);
     });

package/dist/esm/Labelmap/labelmapComputationStrategies.js

@@ -3,6 +3,8 @@ import { utilities } from '@cornerstonejs/tools';
 import * as cornerstoneTools from '@cornerstonejs/tools';
 import { convertContourToStackLabelmap, convertContourToVolumeLabelmap, } from './convertContourToLabelmap.js';
 import { convertSurfaceToVolumeLabelmap } from './convertSurfaceToLabelmap.js';
+import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
+const cs3dLogger = cornerstoneUtilities.logger.polySegLog.getLogger('Labelmap.labelmapComputationStrategies');
 const { computeStackLabelmapFromVolume, getUniqueSegmentIndices } = utilities.segmentation;
 const { getSegmentation } = cornerstoneTools.segmentation.state;
 export async function computeLabelmapData(segmentationId, options = {}) {
@@ -27,7 +29,7 @@ export async function computeLabelmapData(segmentationId, options = {}) {
         }
     }
     catch (error) {
-        console.error(error);
+        cs3dLogger.error(error);
         throw error;
     }
     if (!rawLabelmapData) {

package/dist/esm/Surface/surfaceComputationStrategies.js

@@ -2,6 +2,8 @@ import * as cornerstoneTools from '@cornerstonejs/tools';
 import { convertContourToSurface } from './convertContourToSurface.js';
 import { createAndCacheSurfacesFromRaw } from './createAndCacheSurfacesFromRaw.js';
 import { convertLabelmapToSurface } from './convertLabelmapToSurface.js';
+import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
+const cs3dLogger = cornerstoneUtilities.logger.polySegLog.getLogger('Surface.surfaceComputationStrategies');
 const { getUniqueSegmentIndices } = cornerstoneTools.utilities.segmentation;
 const { getSegmentation } = cornerstoneTools.segmentation.state;
 export async function computeSurfaceData(segmentationId, options = {}) {
@@ -26,7 +28,7 @@ export async function computeSurfaceData(segmentationId, options = {}) {
         }
     }
     catch (error) {
-        console.error(error);
+        cs3dLogger.error(error);
         throw error;
     }
     if (!rawSurfacesData) {
@@ -38,7 +40,7 @@ export async function computeSurfaceData(segmentationId, options = {}) {
 async function computeSurfaceFromLabelmapSegmentation(segmentationId, options = {}) {
     const segmentation = getSegmentation(segmentationId);
     if (!segmentation?.representationData?.Labelmap) {
-        console.warn('Only support surface update from labelmaps');
+        cs3dLogger.warn('Only support surface update from labelmaps');
         return;
     }
     const labelmapRepresentationData = segmentation.representationData.Labelmap;
@@ -50,7 +52,7 @@ async function computeSurfaceFromLabelmapSegmentation(segmentationId, options =
     const surfaces = await Promise.allSettled(promises);
     const errors = surfaces.filter((p) => p.status === 'rejected');
     if (errors.length > 0) {
-        console.error(errors);
+        cs3dLogger.error(errors);
         throw new Error('Failed to convert labelmap to surface');
     }
     const rawSurfacesData = surfaces

package/dist/esm/canComputeRequestedRepresentation.js

@@ -1,4 +1,6 @@
 import { Enums, segmentation, utilities } from '@cornerstonejs/tools';
+import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
+const cs3dLogger = cornerstoneUtilities.logger.polySegLog.getLogger('canComputeRequestedRepresentation');
 const { getSegmentation } = segmentation.state;
 const { validateLabelmap } = utilities.segmentation;
 const conversionPaths = new Map([
@@ -42,7 +44,7 @@ function getExistingRepresentationTypes(representationData) {
                 supportedTypes.push(representationType);
             }
             catch (error) {
-                console.warn(`Validation failed for labelmap of type ${representationType}`);
+                cs3dLogger.warn(`Validation failed for labelmap of type ${representationType}`);
             }
         }
         else {

package/dist/esm/utilities/clipAndCacheSurfacesForViewport.js

@@ -1,6 +1,8 @@
 import { Enums, getWebWorkerManager, eventTarget, triggerEvent, } from '@cornerstonejs/core';
 import { Enums as ToolsEnums, utilities } from '@cornerstonejs/tools';
 import { registerPolySegWorker } from '../registerPolySegWorker.js';
+import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
+const cs3dLogger = cornerstoneUtilities.logger.polySegLog.getLogger('utilities.clipAndCacheSurfacesForViewport');
 const workerManager = getWebWorkerManager();
 const { WorkerTypes } = ToolsEnums;
 const { pointToString } = utilities;
@@ -51,7 +53,7 @@ export async function clipAndCacheSurfacesForViewport(surfacesInfo, viewport) {
         ],
     })
         .catch((error) => {
-        console.error(error);
+        cs3dLogger.error(error);
     });
     triggerWorkerProgress(eventTarget, 100);
     return polyDataCache;

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.8.2";
+export declare const version = "5.10.3";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.8.2';
+export const version = '5.10.3';

package/dist/esm/workers/polySegConverters.js

@@ -7,6 +7,8 @@ import vtkPlane from '@kitware/vtk.js/Common/DataModel/Plane.js';
 import vtkPolyData from '@kitware/vtk.js/Common/DataModel/PolyData.js';
 import vtkContourLoopExtraction from '@kitware/vtk.js/Filters/General/ContourLoopExtraction.js';
 import vtkCutter from '@kitware/vtk.js/Filters/Core/Cutter.js';
+import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
+const cs3dLogger = cornerstoneUtilities.logger.polySegLog.getLogger('workers.polySegConverters');
 const { math: { polyline: { containsPoint, getAABB, projectTo2D }, }, geometricSurfaceUtils: { checkStandardBasis, rotatePoints }, boundingBox: { getBoundingBoxAroundShapeWorld }, planar: { isPlaneIntersectingAABB }, } = ToolsUtilities;
 async function peerImport(moduleId) {
     try {
@@ -15,7 +17,7 @@ async function peerImport(moduleId) {
         }
     }
     catch (error) {
-        console.warn('Error importing module:', error);
+        cs3dLogger.warn('Error importing module:', error);
         return null;
     }
 }
@@ -29,8 +31,8 @@ const polySegConverters = {
             ICRPolySeg = (await peerImport('@icr/polyseg-wasm')).default;
         }
         catch (error) {
-            console.error(error);
-            console.debug("Warning: '@icr/polyseg-wasm' module not found. Please install it separately.");
+            cs3dLogger.error(error);
+            cs3dLogger.debug("Warning: '@icr/polyseg-wasm' module not found. Please install it separately.");
             return;
         }
         if (this.polySegInitializing) {
@@ -357,7 +359,7 @@ const polySegConverters = {
                         cutter.update();
                     }
                     catch (e) {
-                        console.warn('Error during clipping', e);
+                        cs3dLogger.warn('Error during clipping', e);
                         continue;
                     }
                     const polyData = cutter.getOutputData();
@@ -387,7 +389,7 @@ const polySegConverters = {
                         }
                     }
                     catch (loopError) {
-                        console.warn('Error during loop extraction:', loopError);
+                        cs3dLogger.warn('Error during loop extraction:', loopError);
                         continue;
                     }
                 }
@@ -396,7 +398,7 @@ const polySegConverters = {
             }
         }
         catch (e) {
-            console.warn('Error during processing', e);
+            cs3dLogger.warn('Error during processing', e);
         }
         finally {
             surfacesInfo = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/polymorphic-segmentation",
-  "version": "5.8.2",
+  "version": "5.10.3",
   "description": "Polymorphic Segmentation utility for Cornerstone3D",
   "files": [
     "dist"
@@ -55,13 +55,12 @@
     "@icr/polyseg-wasm": "0.4.0"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "5.8.2",
-    "@cornerstonejs/tools": "5.8.2"
+    "@cornerstonejs/core": "5.10.3",
+    "@cornerstonejs/tools": "5.10.3"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.8.2",
-    "@cornerstonejs/tools": "5.8.2",
+    "@cornerstonejs/core": "5.10.3",
+    "@cornerstonejs/tools": "5.10.3",
     "@kitware/vtk.js": "36.4.1"
-  },
-  "gitHead": "7034957b10f5e91ad8f4d7978591ef688e262d26"
+  }
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Open Health Imaging Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.