npm - @cornerstonejs/tools - Versions diffs - 4.22.13 → 5.0.0 - Mend

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.22.13",
+  "version": "5.0.0",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -86,17 +86,17 @@
   },
   "scripts": {
     "prebuild": "node ../../scripts/generate-version.js ./",
-    "build:esm": "tsc --project ./tsconfig.json",
+    "build:esm": "pnpm run prebuild && tsc --project ./tsconfig.json",
     "build:esm:watch": "tsc --project ./tsconfig.json --watch",
     "build:umd": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
-    "build:all": "yarn run build:umd && yarn run build:esm",
-    "build": "yarn run build:esm",
+    "build:all": "pnpm run build:umd && pnpm run build:esm",
+    "build": "pnpm run build:esm",
     "clean": "rm -rf node_modules/.cache/storybook && shx rm -rf dist",
-    "clean:deep": "yarn run clean && shx rm -rf node_modules",
+    "clean:deep": "pnpm run clean && shx rm -rf node_modules",
     "dev": "tsc --project ./tsconfig.json --watch",
     "lint": "oxlint .",
     "api-check": "api-extractor --debug run ",
-    "prepublishOnly": "yarn run build",
+    "prepublishOnly": "pnpm run build",
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
@@ -105,12 +105,12 @@
     "lodash.get": "4.4.2"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "4.22.13",
+    "@cornerstonejs/core": "5.0.0",
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.22.13",
-    "@kitware/vtk.js": "34.15.1",
+    "@cornerstonejs/core": "5.0.0",
+    "@kitware/vtk.js": "35.5.3",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
     "d3-array": "3.2.4",
@@ -128,5 +128,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "6f7ce81ce424eb37a67ba59e6b7946de474a4578"
+  "gitHead": "d6f3fba43abcbaaf7468ff534588f6a88720b875"
 }

@@ -0,0 +1,18 @@
+function viewportHasMethod(viewport, method) {
+    return (typeof viewport?.[method] ===
+        'function');
+}
+export function viewportSupportsImageSlices(viewport) {
+    return (viewportHasMethod(viewport, 'getCurrentImageId') &&
+        viewportHasMethod(viewport, 'getCurrentImageIdIndex') &&
+        viewportHasMethod(viewport, 'getImageIds') &&
+        viewportHasMethod(viewport, 'hasImageURI'));
+}
+export function viewportSupportsStackCompatibility(viewport) {
+    return (viewportSupportsImageSlices(viewport) &&
+        viewportHasMethod(viewport, 'setStack'));
+}
+export function viewportSupportsStackCalibration(viewport) {
+    return (viewportSupportsImageSlices(viewport) &&
+        viewportHasMethod(viewport, 'calibrateSpacing'));
+}

@@ -1,2 +1,2 @@
-export declare function filterViewportsWithParallelNormals(viewports: any, camera: any, EPS?: number): any;
+export declare function filterViewportsWithParallelNormals(viewports: any, referenceViewport: any, EPS?: number): any;
 export default filterViewportsWithParallelNormals;

@@ -1,9 +1,17 @@
 import { vec3 } from 'gl-matrix';
-export function filterViewportsWithParallelNormals(viewports, camera, EPS = 0.999) {
+import getViewportICamera from '../getViewportICamera';
+export function filterViewportsWithParallelNormals(viewports, referenceViewport, EPS = 0.999) {
+    const referenceCamera = getViewportICamera(referenceViewport);
+    const referenceNormal = referenceCamera.viewPlaneNormal;
+    if (!referenceNormal) {
+        return [];
+    }
     return viewports.filter((viewport) => {
-        const vpCamera = viewport.getCamera();
-        const isParallel = Math.abs(vec3.dot(vpCamera.viewPlaneNormal, camera.viewPlaneNormal)) >
-            EPS;
+        const vpCamera = getViewportICamera(viewport);
+        if (!vpCamera.viewPlaneNormal) {
+            return false;
+        }
+        const isParallel = Math.abs(vec3.dot(vpCamera.viewPlaneNormal, referenceNormal)) > EPS;
         return isParallel;
     });
 }

@@ -1,2 +1,2 @@
-export declare function filterViewportsWithSameOrientation(viewports: any, camera: any): any;
+export declare function filterViewportsWithSameOrientation(viewports: any, referenceViewport: any): any;
 export default filterViewportsWithSameOrientation;

@@ -1,9 +1,16 @@
 import { utilities as csUtils } from '@cornerstonejs/core';
-export function filterViewportsWithSameOrientation(viewports, camera) {
+import getViewportICamera from '../getViewportICamera';
+export function filterViewportsWithSameOrientation(viewports, referenceViewport) {
+    const referenceCamera = getViewportICamera(referenceViewport);
+    if (!referenceCamera.viewPlaneNormal || !referenceCamera.viewUp) {
+        return [];
+    }
     return viewports.filter((viewport) => {
-        const vpCamera = viewport.getCamera();
-        return (csUtils.isEqual(vpCamera.viewPlaneNormal, camera.viewPlaneNormal) &&
-            csUtils.isEqual(vpCamera.viewUp, camera.viewUp));
+        const vpCamera = getViewportICamera(viewport);
+        if (!vpCamera.viewPlaneNormal || !vpCamera.viewUp) {
+            return false;
+        }
+        return (csUtils.isEqual(vpCamera.viewPlaneNormal, referenceCamera.viewPlaneNormal) && csUtils.isEqual(vpCamera.viewUp, referenceCamera.viewUp));
     });
 }
 export default filterViewportsWithSameOrientation;

@@ -10,7 +10,7 @@ export default function getViewportIdsWithToolToRender(element, toolName, requir
     viewports = filterViewportsWithToolEnabled(viewports, toolName);
     const viewport = renderingEngine.getViewport(enabledElement.viewportId);
     if (requireParallelNormals) {
-        viewports = filterViewportsWithParallelNormals(viewports, viewport.getCamera());
+        viewports = filterViewportsWithParallelNormals(viewports, viewport);
     }
     const viewportIds = viewports.map((vp) => vp.id);
     return viewportIds;

@@ -0,0 +1,3 @@
+import { type Types } from '@cornerstonejs/core';
+export declare function getViewportPresentation(viewport: unknown, selector?: Types.ViewPresentationSelector): unknown;
+export declare function applyViewportPresentation(viewport: unknown, presentation: unknown): boolean;

@@ -0,0 +1,26 @@
+import { viewportProjection } from '@cornerstonejs/core';
+export function getViewportPresentation(viewport, selector) {
+    const projectionPresentation = viewportProjection.getPresentation(viewport, {
+        selector,
+    });
+    if (projectionPresentation) {
+        return projectionPresentation;
+    }
+    return viewport.getViewPresentation?.(selector);
+}
+export function applyViewportPresentation(viewport, presentation) {
+    if (!presentation) {
+        return false;
+    }
+    const target = viewport;
+    const nextViewState = viewportProjection.withPresentation(viewport, presentation);
+    if (nextViewState && typeof target.setViewState === 'function') {
+        target.setViewState(nextViewState);
+        return true;
+    }
+    if (typeof target.setViewPresentation === 'function') {
+        target.setViewPresentation(presentation);
+        return true;
+    }
+    return false;
+}

	@@ -1 +1 @@
1	- export declare const version = "4.22.13";
1	+ export declare const version = "5.0.0";

	@@ -1 +1 @@
1	- export const version = '4.22.13';
1	+ export const version = '5.0.0';

@cornerstonejs/tools 4.22.13 → 5.0.0