@cornerstonejs/core 0.36.5 → 0.37.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "0.36.5",
+  "version": "0.37.0",
   "description": "",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -51,5 +51,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "5c2b9eec6cbd9715fc049529783b63cf80892ba5"
+  "gitHead": "1e40104275742f14a7a48b076f244610f90e8657"
 }

package/src/RenderingEngine/VolumeViewport3D.ts

@@ -41,6 +41,10 @@ class VolumeViewport3D extends BaseVolumeViewport {
   public getCurrentImageIdIndex = (): number | undefined => {
     return undefined;
   };
+
+  public getCurrentImageId = (): string => {
+    return null;
+  };
 }
 
 export default VolumeViewport3D;

package/src/cache/classes/Contour.ts

@@ -5,6 +5,7 @@ type ContourProps = {
   id: string;
   data: ContourData;
   color: Point3;
+  segmentIndex: number;
 };
 
 /**
@@ -19,6 +20,7 @@ export class Contour implements IContour {
   points: Point3[];
   color: Point3;
   type: ContourType;
+  segmentIndex: number;
 
   constructor(props: ContourProps) {
     const { points, type } = props.data;
@@ -26,6 +28,7 @@ export class Contour implements IContour {
     this.points = points;
     this.type = type;
     this.color = props.color;
+    this.segmentIndex = props.segmentIndex;
 
     this.sizeInBytes = this._getSizeInBytes();
   }

package/src/cache/classes/ContourSet.ts

@@ -5,6 +5,7 @@ type ContourSetProps = {
   id: string;
   data: ContourData[];
   frameOfReferenceUID: string;
+  segmentIndex: number;
   color?: Point3;
 };
 
@@ -17,6 +18,7 @@ export class ContourSet implements IContourSet {
   readonly sizeInBytes: number;
   readonly frameOfReferenceUID: string;
   private color: Point3 = [200, 0, 0]; // default color
+  private segmentIndex: number;
   contours: IContour[];
 
   constructor(props: ContourSetProps) {
@@ -24,24 +26,30 @@ export class ContourSet implements IContourSet {
     this.contours = [];
     this.color = props.color ?? this.color;
     this.frameOfReferenceUID = props.frameOfReferenceUID;
+    this.segmentIndex = props.segmentIndex;
 
     this._createEachContour(props.data);
     this.sizeInBytes = this._getSizeInBytes();
   }
 
   _createEachContour(contourDataArray: ContourData[]): void {
-    for (let i = 0; i < contourDataArray.length; i++) {
+    contourDataArray.forEach((contourData) => {
+      const { points, type, color } = contourData;
+
       const contour = new Contour({
-        id: `${this.id}-${i}`,
+        id: `${this.id}-segment-${this.segmentIndex}`,
         data: {
-          points: contourDataArray[i].points,
-          type: contourDataArray[i].type,
+          points,
+          type,
+          segmentIndex: this.segmentIndex,
+          color: color ?? this.color,
         },
-        color: contourDataArray[i].color ?? this.color,
+        segmentIndex: this.segmentIndex,
+        color: color ?? this.color,
       });
 
       this.contours.push(contour);
-    }
+    });
   }
 
   _getSizeInBytes(): number {
@@ -50,6 +58,10 @@ export class ContourSet implements IContourSet {
     }, 0);
   }
 
+  public getSegmentIndex(): number {
+    return this.segmentIndex;
+  }
+
   public getColor(): Point3 {
     // Currently, all contours in a contour set have the same color.
     // This may change in the future.

package/src/loaders/geometryLoader.ts

@@ -93,6 +93,7 @@ function _createContourSet(
     data: contourSetData.data,
     color: contourSetData.color,
     frameOfReferenceUID: contourSetData.frameOfReferenceUID,
+    segmentIndex: contourSetData.segmentIndex,
   });
 
   const geometry: IGeometry = {

package/src/types/ContourData.ts

@@ -8,12 +8,14 @@ type ContourSetData = {
   data: ContourData[];
   frameOfReferenceUID: string;
   color?: Point3;
+  segmentIndex?: number;
 };
 
 type ContourData = {
   points: Point3[];
   type: ContourType;
-  color?: Point3;
+  color: Point3;
+  segmentIndex: number;
 };
 
 export type { PublicContourSetData, ContourSetData, ContourData };

package/src/types/IContourSet.ts

@@ -11,6 +11,7 @@ export interface IContourSet {
   contours: IContour[];
   _createEachContour(data: ContourData[]): void;
   getSizeInBytes(): number;
+  getSegmentIndex(): number;
   getColor(): any;
   /**
    * This function returns the contours of the image

package/src/types/IGeometry.ts

@@ -1,11 +1,11 @@
-import { ContourSet } from '../cache/classes/ContourSet';
 import { GeometryType } from '../enums';
+import { IContourSet } from './IContourSet';
 
 // interface IGeometry can be array of IContourSet
 interface IGeometry {
   id: string;
   type: GeometryType;
-  data: ContourSet; // | Array<IClosedSurface> , etc
+  data: IContourSet; // | Array<IClosedSurface> , etc
   sizeInBytes: number;
 }
 

package/src/types/IStreamingVolumeProperties.ts

@@ -6,6 +6,7 @@ interface IStreamingVolumeProperties {
   loadStatus: {
     loaded: boolean;
     loading: boolean;
+    cancelled: boolean;
     cachedFrames: Array<boolean>;
     callbacks: Array<() => void>;
   };