@cornerstonejs/core 1.25.0 → 1.26.1

package/src/types/VideoViewportProperties.ts

@@ -0,0 +1,17 @@
+import { ViewportProperties } from './ViewportProperties';
+import Point2 from './Point2';
+
+/**
+ * Stack Viewport Properties
+ */
+type VideoViewportProperties = ViewportProperties & {
+  loop?: boolean;
+  muted?: boolean;
+  pan?: Point2;
+  playbackRate?: number;
+  // The zoom factor, naming consistent with vtk cameras for now,
+  // but this isn't necessarily necessary.
+  parallelScale?: number;
+};
+
+export default VideoViewportProperties;

package/src/types/VideoViewportTypes.ts

@@ -0,0 +1,20 @@
+import { ViewportType } from '../enums';
+import Point2 from './Point2';
+
+export type InternalVideoCamera = {
+  panWorld?: Point2;
+  parallelScale?: number;
+};
+
+export type VideoViewportInput = {
+  id: string;
+  renderingEngineId: string;
+  type: ViewportType;
+  element: HTMLDivElement;
+  sx: number;
+  sy: number;
+  sWidth: number;
+  sHeight: number;
+  defaultOptions: any;
+  canvas: HTMLCanvasElement;
+};

package/src/types/index.ts

@@ -83,6 +83,12 @@ import type { PixelDataTypedArray } from './PixelDataTypedArray';
 import type { ImagePixelModule } from './ImagePixelModule';
 import type { ImagePlaneModule } from './ImagePlaneModule';
 import type { AffineMatrix } from './AffineMatrix';
+import type VideoViewportProperties from './VideoViewportProperties';
+import type IVideoViewport from './IVideoViewport';
+import type {
+  InternalVideoCamera,
+  VideoViewportInput,
+} from './VideoViewportTypes';
 
 export type {
   // config
@@ -90,6 +96,7 @@ export type {
   //
   ICamera,
   IStackViewport,
+  IVideoViewport,
   IVolumeViewport,
   IEnabledElement,
   ICache,
@@ -136,6 +143,7 @@ export type {
   Mat3,
   Plane,
   ViewportInputOptions,
+  VideoViewportProperties,
   VOIRange,
   VOI,
   DisplayArea,
@@ -180,4 +188,7 @@ export type {
   ImagePixelModule,
   ImagePlaneModule,
   AffineMatrix,
+  // video
+  InternalVideoCamera,
+  VideoViewportInput,
 };

package/src/utilities/getTargetVolumeAndSpacingInNormalDir.ts

@@ -1,7 +1,7 @@
 import cache from '../cache/cache';
 import { EPSILON } from '../constants';
 // import type { VolumeViewport } from '../RenderingEngine'
-import { ICamera, IImageVolume, IVolumeViewport } from '../types';
+import { ICamera, IImageVolume, IVolumeViewport, Point3 } from '../types';
 import getSpacingInNormalDirection from './getSpacingInNormalDirection';
 import { getVolumeLoaderSchemes } from '../loaders/volumeLoader';
 
@@ -71,9 +71,11 @@ export default function getTargetVolumeAndSpacingInNormalDir(
 
     const imageVolume = imageVolumes[imageVolumeIndex];
     const { uid: actorUID } = volumeActors[imageVolumeIndex];
-    const spacingInNormalDirection = getSpacingInNormalDirection(
+
+    const spacingInNormalDirection = getSpacingInNormal(
       imageVolume,
-      viewPlaneNormal
+      viewPlaneNormal,
+      viewport
     );
 
     return { imageVolume, spacingInNormalDirection, actorUID };
@@ -104,9 +106,10 @@ export default function getTargetVolumeAndSpacingInNormalDir(
       continue;
     }
 
-    const spacingInNormalDirection = getSpacingInNormalDirection(
+    const spacingInNormalDirection = getSpacingInNormal(
       imageVolume,
-      viewPlaneNormal
+      viewPlaneNormal,
+      viewport
     );
 
     // Allow for EPSILON part larger requirement to prefer earlier volumes
@@ -124,3 +127,20 @@ export default function getTargetVolumeAndSpacingInNormalDir(
 
   return smallest;
 }
+
+function getSpacingInNormal(
+  imageVolume: IImageVolume,
+  viewPlaneNormal: Point3,
+  viewport: IVolumeViewport
+): number {
+  const { slabThickness } = viewport.getProperties();
+  let spacingInNormalDirection = slabThickness;
+  if (!slabThickness) {
+    spacingInNormalDirection = getSpacingInNormalDirection(
+      imageVolume,
+      viewPlaneNormal
+    );
+  }
+
+  return spacingInNormalDirection;
+}