@cornerstonejs/core 0.43.0 → 0.43.1

package/package.json

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

package/src/RenderingEngine/StackViewport.ts

@@ -584,8 +584,10 @@ class StackViewport extends Viewport implements IStackViewport {
       return imagePlaneModule;
     }
 
-    const [calibratedRowSpacing, calibratedColumnSpacing] =
-      calibratedPixelSpacing;
+    const {
+      rowPixelSpacing: calibratedRowSpacing,
+      columnPixelSpacing: calibratedColumnSpacing,
+    } = calibratedPixelSpacing;
 
     // Todo: This is necessary in general, but breaks an edge case when an image
     // is calibrated to some other spacing, and it gets calibrated BACK to the
@@ -624,7 +626,9 @@ class StackViewport extends Viewport implements IStackViewport {
           calibratedColumnSpacing / imagePlaneModule.columnPixelSpacing,
       };
 
-      // modify imagePlaneModule for actor to use calibrated spacing
+      // modify the calibration object to store the actual updated values applied
+      calibratedPixelSpacing.appliedSpacing = calibratedPixelSpacing;
+      // This updates the render copy
       imagePlaneModule.rowPixelSpacing = calibratedRowSpacing;
       imagePlaneModule.columnPixelSpacing = calibratedColumnSpacing;
       return imagePlaneModule;
@@ -634,6 +638,8 @@ class StackViewport extends Viewport implements IStackViewport {
     const { imageData } = imageDataMetadata;
     const [columnPixelSpacing, rowPixelSpacing] = imageData.getSpacing();
 
+    // modify the calibration object to store the actual updated values applied
+    calibratedPixelSpacing.appliedSpacing = calibratedPixelSpacing;
     imagePlaneModule.rowPixelSpacing = calibratedRowSpacing;
     imagePlaneModule.columnPixelSpacing = calibratedColumnSpacing;
 
@@ -2574,10 +2580,25 @@ class StackViewport extends Viewport implements IStackViewport {
   private _getImagePlaneModule(imageId: string): ImagePlaneModule {
     const imagePlaneModule = metaData.get('imagePlaneModule', imageId);
 
+    const calibratedPixelSpacing = metaData.get(
+      'calibratedPixelSpacing',
+      imageId
+    );
+
     const newImagePlaneModule: ImagePlaneModule = {
       ...imagePlaneModule,
     };
 
+    if (calibratedPixelSpacing?.appliedSpacing) {
+      // Over-ride the image plane module spacing, as the measurement data
+      // has already been created with the calibrated spacing provided from
+      // down below inside calibrateIfNecessary
+      const { rowPixelSpacing, columnPixelSpacing } =
+        calibratedPixelSpacing.appliedSpacing;
+      newImagePlaneModule.rowPixelSpacing = rowPixelSpacing;
+      newImagePlaneModule.columnPixelSpacing = columnPixelSpacing;
+    }
+
     if (!newImagePlaneModule.columnPixelSpacing) {
       newImagePlaneModule.columnPixelSpacing = 1;
       this.hasPixelSpacing = false;

package/src/utilities/calibratedPixelSpacingMetadataProvider.ts

@@ -1,6 +1,13 @@
 import imageIdToURI from './imageIdToURI';
 
-const state = {}; // Calibrated pixel spacing per imageId
+export type CalibratedPixelValue = {
+  rowPixelSpacing: number;
+  columnPixelSpacing: number;
+  // These values get updated by the viewport after the change to record the applied value
+  appliedSpacing?: CalibratedPixelValue;
+};
+
+const state: Record<string, CalibratedPixelValue> = {}; // Calibrated pixel spacing per imageId
 
 /**
  * Simple metadataProvider object to store metadata for calibrated spacings.
@@ -13,11 +20,8 @@ const metadataProvider = {
    * @param imageId - the imageId for the metadata to store
    * @param payload - the payload composed of new calibrated pixel spacings
    */
-  add: (imageId: string, payload: [number, number]): void => {
+  add: (imageId: string, payload: CalibratedPixelValue): void => {
     const imageURI = imageIdToURI(imageId);
-    if (!state[imageURI]) {
-      state[imageURI] = {};
-    }
     state[imageURI] = payload;
   },
 
@@ -27,7 +31,7 @@ const metadataProvider = {
    * @param imageId - the imageId to enquire about
    * @returns the calibrated pixel spacings for the imageId if it exists, otherwise undefined
    */
-  get: (type: string, imageId: string): [number, number] => {
+  get: (type: string, imageId: string): CalibratedPixelValue => {
     if (type === 'calibratedPixelSpacing') {
       const imageURI = imageIdToURI(imageId);
       return state[imageURI];