@cornerstonejs/tools 3.11.5 → 3.11.7

package/dist/esm/stateManagement/segmentation/helpers/normalizeSegmentationInput.js

@@ -32,13 +32,16 @@ function normalizeSegments(segmentsConfig, type, data) {
     const normalizedSegments = {};
     if (segmentsConfig) {
         Object.entries(segmentsConfig).forEach(([segmentIndex, segment]) => {
-            normalizedSegments[segmentIndex] = {
+            const { label, locked, cachedStats, active, ...rest } = segment;
+            const normalizedSegment = {
                 segmentIndex: Number(segmentIndex),
-                label: segment.label ?? `Segment ${segmentIndex}`,
-                locked: segment.locked ?? false,
-                cachedStats: segment.cachedStats ?? {},
-                active: segment.active ?? false,
+                label: label ?? `Segment ${segmentIndex}`,
+                locked: locked ?? false,
+                cachedStats: cachedStats ?? {},
+                active: active ?? false,
+                ...rest,
             };
+            normalizedSegments[segmentIndex] = normalizedSegment;
         });
     }
     else if (type === SegmentationRepresentations.Surface) {

package/dist/esm/tools/displayTools/Contour/contourDisplay.js

@@ -16,10 +16,10 @@ function removeRepresentation(viewportId, segmentationId, renderImmediate = fals
         return;
     }
     const { viewport } = enabledElement;
+    removeContourFromElement(viewportId, segmentationId);
     if (!renderImmediate) {
         return;
     }
-    removeContourFromElement(viewportId, segmentationId);
     viewport.render();
 }
 async function render(viewport, contourRepresentation) {
@@ -91,11 +91,23 @@ async function render(viewport, contourRepresentation) {
     handleContourSegmentation(viewport, contourData.geometryIds, contourData.annotationUIDsMap, contourRepresentation);
 }
 function _checkContourGeometryMatchViewport(geometryIds, viewportNormal) {
-    const geometry = cache.getGeometry(geometryIds[0]);
-    if (!geometry) {
+    let validGeometry = null;
+    let geometryData = null;
+    for (const geometryId of geometryIds) {
+        const geometry = cache.getGeometry(geometryId);
+        if (!geometry) {
+            continue;
+        }
+        const data = geometry.data;
+        if (data.contours?.[0]?.points?.length >= 3) {
+            validGeometry = geometry;
+            geometryData = data;
+            break;
+        }
+    }
+    if (!validGeometry || !geometryData) {
         return false;
     }
-    const geometryData = geometry.data;
     const contours = geometryData.contours;
     const points = contours[0].points;
     const point1 = points[0];

package/dist/esm/utilities/segmentation/getStatistics.js

@@ -63,6 +63,7 @@ async function calculateVolumeStatistics({ operationData, indices, unit, mode, }
         segmentationInfo,
         imageInfo,
         indices,
+        unit,
         mode,
     });
     triggerWorkerProgress(WorkerTypes.COMPUTE_STATISTICS, 100);

package/dist/esm/utilities/voi/colorbar/ColorbarTicks.js

@@ -213,10 +213,22 @@ class ColorbarTicks {
         return { labelPoint, tickPoints };
     }
     _getTopTickInfo({ position, labelMeasure }) {
-        throw new Error('Not implemented');
+        const { height } = this._canvas;
+        const labelY = height - this.tickSize - this._labelMargin;
+        const labelPoint = [position, labelY];
+        const tickPoints = {
+            start: [position, height - this._tickSize],
+            end: [position, height],
+        };
+        return { labelPoint, tickPoints };
     }
     _getBottomTickInfo({ position, labelMeasure }) {
-        throw new Error('Not implemented');
+        const labelPoint = [position, this._tickSize + this._labelMargin];
+        const tickPoints = {
+            start: [position, 0],
+            end: [position, this._tickSize],
+        };
+        return { labelPoint, tickPoints };
     }
     render() {
         const { _canvas: canvas } = this;
@@ -235,7 +247,8 @@ class ColorbarTicks {
         const { ticks } = this._getTicks(range);
         canvasContext.clearRect(0, 0, width, height);
         canvasContext.font = this._font;
-        canvasContext.textBaseline = 'middle';
+        canvasContext.textBaseline = isHorizontal ? 'top' : 'middle';
+        canvasContext.textAlign = isHorizontal ? 'center' : 'left';
         canvasContext.fillStyle = this._color;
         canvasContext.strokeStyle = this._color;
         canvasContext.lineWidth = this.tickWidth;

package/dist/esm/workers/computeWorker.js

@@ -105,7 +105,7 @@ const computeWorker = {
         };
     },
     calculateSegmentsStatisticsVolume: (args) => {
-        const { mode, indices } = args;
+        const { mode, indices, unit } = args;
         const { segmentation, image } = computeWorker.getArgsFromInfo(args);
         const { voxelManager: segVoxelManager, spacing: segmentationSpacing } = segmentation;
         const { voxelManager: imageVoxelManager } = image;
@@ -119,8 +119,8 @@ const computeWorker = {
         });
         const stats = SegmentStatsCalculator.getStatistics({
             spacing: segmentationSpacing,
-            unit: 'mm',
             mode,
+            unit,
         });
         return stats;
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.11.5",
+  "version": "3.11.7",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -103,7 +103,7 @@
     "canvas": "^3.1.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^3.11.5",
+    "@cornerstonejs/core": "^3.11.7",
     "@kitware/vtk.js": "32.12.1",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -122,5 +122,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "10c1b64a5564152261575a6372136be3c97d940b"
+  "gitHead": "06bda800542fef976683b2dd679962100ab1da7c"
 }