@cornerstonejs/core 0.6.2 → 0.7.0

package/dist/cjs/utilities/index.js

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderToCanvas = exports.loadImageToCanvas = exports.prefetchStack = exports.transformWorldToIndex = exports.getVolumeViewportsContainingVolumeId = exports.getVolumeViewportsContainingSameVolumes = exports.indexWithinDimensions = exports.getVolumeActorCorners = exports.getTargetVolumeAndSpacingInNormalDir = exports.getSpacingInNormalDirection = exports.getClosestImageId = exports.windowLevel = exports.createUint8SharedArray = exports.createFloat32SharedArray = exports.isOpposite = exports.isEqual = exports.getRuntimeId = exports.getMinMax = exports.planar = exports.uuidv4 = exports.calibratedPixelSpacingMetadataProvider = exports.imageIdToURI = exports.triggerEvent = exports.scaleRgbTransferFunction = exports.invertRgbTransferFunction = void 0;
+exports.imageToWorldCoords = exports.worldToImageCoords = exports.renderToCanvas = exports.loadImageToCanvas = exports.prefetchStack = exports.transformWorldToIndex = exports.getVolumeViewportsContainingVolumeId = exports.getVolumeViewportsContainingSameVolumes = exports.indexWithinDimensions = exports.getVolumeActorCorners = exports.getTargetVolumeAndSpacingInNormalDir = exports.getSpacingInNormalDirection = exports.getClosestImageId = exports.windowLevel = exports.createUint8SharedArray = exports.createFloat32SharedArray = exports.isOpposite = exports.isEqual = exports.getRuntimeId = exports.getMinMax = exports.planar = exports.uuidv4 = exports.calibratedPixelSpacingMetadataProvider = exports.imageIdToURI = exports.triggerEvent = exports.scaleRgbTransferFunction = exports.invertRgbTransferFunction = void 0;
 const invertRgbTransferFunction_1 = __importDefault(require("./invertRgbTransferFunction"));
 exports.invertRgbTransferFunction = invertRgbTransferFunction_1.default;
 const scaleRgbTransferFunction_1 = __importDefault(require("./scaleRgbTransferFunction"));
@@ -69,6 +69,10 @@ const loadImageToCanvas_1 = __importDefault(require("./loadImageToCanvas"));
 exports.loadImageToCanvas = loadImageToCanvas_1.default;
 const renderToCanvas_1 = __importDefault(require("./renderToCanvas"));
 exports.renderToCanvas = renderToCanvas_1.default;
+const worldToImageCoords_1 = __importDefault(require("./worldToImageCoords"));
+exports.worldToImageCoords = worldToImageCoords_1.default;
+const imageToWorldCoords_1 = __importDefault(require("./imageToWorldCoords"));
+exports.imageToWorldCoords = imageToWorldCoords_1.default;
 const planar = __importStar(require("./planar"));
 exports.planar = planar;
 const windowLevel = __importStar(require("./windowLevel"));

package/dist/cjs/utilities/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utilities/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4FAAoE;AA6BlE,oCA7BK,mCAAyB,CA6BL;AA5B3B,0FAAkE;AA6BhE,mCA7BK,kCAAwB,CA6BL;AA5B1B,kEAA0C;AA6BxC,uBA7BK,sBAAY,CA6BL;AA5Bd,sDAA8B;AA+B5B,iBA/BK,gBAAM,CA+BL;AA9BR,4DAAoC;AAgClC,oBAhCK,mBAAS,CAgCL;AA/BX,kEAA0C;AAgCxC,uBAhCK,sBAAY,CAgCL;AA/Bd,kEAA0C;AA0BxC,uBA1BK,sBAAY,CA0BL;AAzBd,sHAA8F;AA0B5F,iDA1BK,gDAAsC,CA0BL;AAzBxC,wDAAgC;AA8B9B,kBA9BK,iBAAO,CA8BL;AA7BT,8DAAsC;AA8BpC,qBA9BK,oBAAU,CA8BL;AA7BZ,sFAA8D;AA+B5D,iCA/BK,gCAAsB,CA+BL;AA9BxB,0FAAkE;AA6BhE,mCA7BK,kCAAwB,CA6BL;AA5B1B,4EAAoD;AA+BlD,4BA/BK,2BAAiB,CA+BL;AA9BnB,gGAAwE;AA+BtE,sCA/BK,qCAA2B,CA+BL;AA9B7B,kHAA0F;AA+BxF,+CA/BK,8CAAoC,CA+BL;AA9BtC,oFAA4D;AA+B1D,gCA/BK,+BAAqB,CA+BL;AA9BvB,oFAA4D;AA+B1D,gCA/BK,+BAAqB,CA+BL;AA9BvB,wHAAgG;AA+B9F,kDA/BK,iDAAuC,CA+BL;AA9BzC,kHAA0F;AA+BxF,+CA/BK,8CAAoC,CA+BL;AA9BtC,oFAA4D;AA+B1D,gCA/BK,+BAAqB,CA+BL;AA9BvB,oEAA4C;AA+B1C,wBA/BK,uBAAa,CA+BL;AA9Bf,4EAAoD;AA+BlD,4BA/BK,2BAAiB,CA+BL;AA9BnB,sEAA8C;AA+B5C,yBA/BK,wBAAc,CA+BL;AA5BhB,iDAAmC;AAUjC,wBAAM;AATR,2DAA6C;AAgB3C,kCAAW"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utilities/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4FAAoE;AA+BlE,oCA/BK,mCAAyB,CA+BL;AA9B3B,0FAAkE;AA+BhE,mCA/BK,kCAAwB,CA+BL;AA9B1B,kEAA0C;AA+BxC,uBA/BK,sBAAY,CA+BL;AA9Bd,sDAA8B;AAiC5B,iBAjCK,gBAAM,CAiCL;AAhCR,4DAAoC;AAkClC,oBAlCK,mBAAS,CAkCL;AAjCX,kEAA0C;AAkCxC,uBAlCK,sBAAY,CAkCL;AAjCd,kEAA0C;AA4BxC,uBA5BK,sBAAY,CA4BL;AA3Bd,sHAA8F;AA4B5F,iDA5BK,gDAAsC,CA4BL;AA3BxC,wDAAgC;AAgC9B,kBAhCK,iBAAO,CAgCL;AA/BT,8DAAsC;AAgCpC,qBAhCK,oBAAU,CAgCL;AA/BZ,sFAA8D;AAiC5D,iCAjCK,gCAAsB,CAiCL;AAhCxB,0FAAkE;AA+BhE,mCA/BK,kCAAwB,CA+BL;AA9B1B,4EAAoD;AAiClD,4BAjCK,2BAAiB,CAiCL;AAhCnB,gGAAwE;AAiCtE,sCAjCK,qCAA2B,CAiCL;AAhC7B,kHAA0F;AAiCxF,+CAjCK,8CAAoC,CAiCL;AAhCtC,oFAA4D;AAiC1D,gCAjCK,+BAAqB,CAiCL;AAhCvB,oFAA4D;AAiC1D,gCAjCK,+BAAqB,CAiCL;AAhCvB,wHAAgG;AAiC9F,kDAjCK,iDAAuC,CAiCL;AAhCzC,kHAA0F;AAiCxF,+CAjCK,8CAAoC,CAiCL;AAhCtC,oFAA4D;AAiC1D,gCAjCK,+BAAqB,CAiCL;AAhCvB,oEAA4C;AAiC1C,wBAjCK,uBAAa,CAiCL;AAhCf,4EAAoD;AAiClD,4BAjCK,2BAAiB,CAiCL;AAhCnB,sEAA8C;AAiC5C,yBAjCK,wBAAc,CAiCL;AAhChB,8EAAsD;AAiCpD,6BAjCK,4BAAkB,CAiCL;AAhCpB,8EAAsD;AAiCpD,6BAjCK,4BAAkB,CAiCL;AA9BpB,iDAAmC;AAUjC,wBAAM;AATR,2DAA6C;AAgB3C,kCAAW"}

package/dist/cjs/utilities/loadImageToCanvas.js

@@ -27,10 +27,11 @@ const metaData = __importStar(require("../metaData"));
 const enums_1 = require("../enums");
 const imageLoadPoolManager_1 = __importDefault(require("../requestPool/imageLoadPoolManager"));
 const renderToCanvas_1 = __importDefault(require("./renderToCanvas"));
-function loadImageToCanvas(canvas, imageId, requestType = enums_1.RequestType.Interaction, priority = -5) {
+function loadImageToCanvas(canvas, imageId, requestType = enums_1.RequestType.Thumbnail, priority = -5) {
     return new Promise((resolve, reject) => {
         function successCallback(image, imageId) {
             const { modality } = metaData.get('generalSeriesModule', imageId) || {};
+            image.isPreScaled = isImagePreScaled(image);
             (0, renderToCanvas_1.default)(canvas, image, modality);
             resolve(imageId);
         }
@@ -63,9 +64,24 @@ function loadImageToCanvas(canvas, imageId, requestType = enums_1.RequestType.In
             preScale: {
                 scalingParameters,
             },
+            requestType,
         };
         imageLoadPoolManager_1.default.addRequest(sendRequest.bind(null, imageId, null, options), requestType, { imageId }, priority);
     });
 }
 exports.default = loadImageToCanvas;
+function isImagePreScaled(image) {
+    const { imageId } = image;
+    const modalityLutModule = metaData.get('modalityLutModule', imageId) || {};
+    const suvFactor = metaData.get('scalingModule', imageId) || {};
+    const generalSeriesModule = metaData.get('generalSeriesModule', imageId) || {};
+    if (modalityLutModule.rescaleSlope !== undefined &&
+        modalityLutModule.rescaleIntercept !== undefined) {
+        if (generalSeriesModule.modality === 'PT') {
+            return suvFactor.suvbw !== undefined;
+        }
+        return true;
+    }
+    return false;
+}
 //# sourceMappingURL=loadImageToCanvas.js.map

package/dist/cjs/utilities/loadImageToCanvas.js.map

@@ -1 +1 @@
-{"version":3,"file":"loadImageToCanvas.js","sourceRoot":"","sources":["../../../src/utilities/loadImageToCanvas.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAEA,gDAAmD;AACnD,sDAAwC;AACxC,oCAAuC;AACvC,+FAAuE;AACvE,sEAA8C;AAoB9C,SAAwB,iBAAiB,CACvC,MAAyB,EACzB,OAAe,EACf,WAAW,GAAG,mBAAW,CAAC,WAAW,EACrC,QAAQ,GAAG,CAAC,CAAC;IAEb,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,SAAS,eAAe,CAAC,KAAa,EAAE,OAAe;YACrD,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,qBAAqB,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;YACxE,IAAA,wBAAc,EAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;YACxC,OAAO,CAAC,OAAO,CAAC,CAAC;QACnB,CAAC;QAED,SAAS,aAAa,CAAC,KAAY,EAAE,OAAe;YAClD,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC9B,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC;QAED,SAAS,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO;YACjD,OAAO,IAAA,+BAAiB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,CAC7C,CAAC,KAAK,EAAE,EAAE;gBACR,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;YAC3D,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;gBACR,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;YAC3C,CAAC,CACF,CAAC;QACJ,CAAC;QAED,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,mBAAmB,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QAC3E,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QAE/D,MAAM,mBAAmB,GACvB,QAAQ,CAAC,GAAG,CAAC,qBAAqB,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QAErD,MAAM,iBAAiB,GAAG;YACxB,YAAY,EAAE,iBAAiB,CAAC,YAAY;YAC5C,gBAAgB,EAAE,iBAAiB,CAAC,gBAAgB;YACpD,QAAQ,EAAE,mBAAmB,CAAC,QAAQ;YACtC,KAAK,EAAE,SAAS,CAAC,KAAK;SACvB,CAAC;QAEF,MAAM,OAAO,GAAG;YACd,YAAY,EAAE;gBACZ,IAAI,EAAE,cAAc;gBACpB,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;aACb;YACD,QAAQ,EAAE;gBACR,iBAAiB;aAClB;SACF,CAAC;QAEF,8BAAoB,CAAC,UAAU,CAC7B,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,EAC9C,WAAW,EACX,EAAE,OAAO,EAAE,EACX,QAAQ,CACT,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AA5DD,oCA4DC"}
+{"version":3,"file":"loadImageToCanvas.js","sourceRoot":"","sources":["../../../src/utilities/loadImageToCanvas.ts"],"names":[],"mappings":"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"}

package/dist/cjs/utilities/prefetchStack.js

@@ -22,6 +22,7 @@ function prefetchStack(imageIds, requestType = enums_1.RequestType.Prefetch, pri
             offset: null,
             length: null,
         },
+        requestType,
     };
     imageIds.forEach((imageId, imageIdIndex) => {
         const modalityLutModule = __1.metaData.get('modalityLutModule', imageId) || {};

package/dist/cjs/utilities/prefetchStack.js.map

@@ -1 +1 @@
-{"version":3,"file":"prefetchStack.js","sourceRoot":"","sources":["../../../src/utilities/prefetchStack.ts"],"names":[],"mappings":";;;;;AAAA,+FAAuE;AACvE,gDAAmD;AACnD,oCAAuC;AACvC,0BAA8B;AAW9B,SAAS,aAAa,CACpB,QAAkB,EAClB,WAAW,GAAG,mBAAW,CAAC,QAAQ,EAClC,QAAQ,GAAG,CAAC;IAEZ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QACzB,OAAO;KACR;IAED,SAAS,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO;QACjD,OAAO,IAAA,+BAAiB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,CAE7C,CAAC,KAAK,EAAE,EAAE,GAAE,CAAC,EACb,CAAC,KAAK,EAAE,EAAE;YACR,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CACF,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG;QACd,YAAY,EAAE;YACZ,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,IAAI;SACb;KACF,CAAC;IAEF,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE;QACzC,MAAM,iBAAiB,GAAG,YAAQ,CAAC,GAAG,CAAC,mBAAmB,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QAC3E,MAAM,SAAS,GAAG,YAAQ,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QAE/D,MAAM,mBAAmB,GACvB,YAAQ,CAAC,GAAG,CAAC,qBAAqB,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QAErD,MAAM,iBAAiB,GAAG;YACxB,YAAY,EAAE,iBAAiB,CAAC,YAAY;YAC5C,gBAAgB,EAAE,iBAAiB,CAAC,gBAAgB;YACpD,QAAQ,EAAE,mBAAmB,CAAC,QAAQ;YACtC,KAAK,EAAE,SAAS,CAAC,KAAK;SACvB,CAAC;QAEF,MAAM,iBAAiB,GAAG,EAAE,OAAO,EAAE,CAAC;QACtC,MAAM,YAAY,mCACb,OAAO,KACV,QAAQ,EAAE;gBACR,iBAAiB;aAClB,GACF,CAAC;QAEF,8BAAoB,CAAC,UAAU,CAC7B,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,CAAC,EAC3D,WAAW,EACX,iBAAiB,EACjB,QAAQ,CACT,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,kBAAe,aAAa,CAAC"}
+{"version":3,"file":"prefetchStack.js","sourceRoot":"","sources":["../../../src/utilities/prefetchStack.ts"],"names":[],"mappings":";;;;;AAAA,+FAAuE;AACvE,gDAAmD;AACnD,oCAAuC;AACvC,0BAA8B;AAW9B,SAAS,aAAa,CACpB,QAAkB,EAClB,WAAW,GAAG,mBAAW,CAAC,QAAQ,EAClC,QAAQ,GAAG,CAAC;IAEZ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QACzB,OAAO;KACR;IAED,SAAS,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO;QACjD,OAAO,IAAA,+BAAiB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,CAE7C,CAAC,KAAK,EAAE,EAAE,GAAE,CAAC,EACb,CAAC,KAAK,EAAE,EAAE;YACR,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CACF,CAAC;IACJ,CAAC;IAID,MAAM,OAAO,GAAG;QACd,YAAY,EAAE;YACZ,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,IAAI;SACb;QACD,WAAW;KACZ,CAAC;IAEF,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE;QACzC,MAAM,iBAAiB,GAAG,YAAQ,CAAC,GAAG,CAAC,mBAAmB,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QAC3E,MAAM,SAAS,GAAG,YAAQ,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QAE/D,MAAM,mBAAmB,GACvB,YAAQ,CAAC,GAAG,CAAC,qBAAqB,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QAErD,MAAM,iBAAiB,GAAG;YACxB,YAAY,EAAE,iBAAiB,CAAC,YAAY;YAC5C,gBAAgB,EAAE,iBAAiB,CAAC,gBAAgB;YACpD,QAAQ,EAAE,mBAAmB,CAAC,QAAQ;YACtC,KAAK,EAAE,SAAS,CAAC,KAAK;SACvB,CAAC;QAEF,MAAM,iBAAiB,GAAG,EAAE,OAAO,EAAE,CAAC;QACtC,MAAM,YAAY,mCACb,OAAO,KACV,QAAQ,EAAE;gBACR,iBAAiB;aAClB,GACF,CAAC;QAEF,8BAAoB,CAAC,UAAU,CAC7B,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,CAAC,EAC3D,WAAW,EACX,iBAAiB,EACjB,QAAQ,CACT,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,kBAAe,aAAa,CAAC"}

package/dist/cjs/utilities/worldToImageCoords.d.ts

@@ -0,0 +1,3 @@
+import { Point2, Point3 } from '../types';
+declare function worldToImageCoords(imageId: string, worldCoords: Point3): Point2 | undefined;
+export default worldToImageCoords;

package/dist/cjs/utilities/worldToImageCoords.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const gl_matrix_1 = require("gl-matrix");
+const __1 = require("..");
+function worldToImageCoords(imageId, worldCoords) {
+    const imagePlaneModule = __1.metaData.get('imagePlaneModule', imageId);
+    if (!imagePlaneModule) {
+        throw new Error(`No imagePlaneModule found for imageId: ${imageId}`);
+    }
+    const { columnCosines, columnPixelSpacing, rowCosines, rowPixelSpacing, imagePositionPatient: origin, rows, columns, } = imagePlaneModule;
+    const newOrigin = gl_matrix_1.vec3.create();
+    gl_matrix_1.vec3.scaleAndAdd(newOrigin, origin, columnCosines, -columnPixelSpacing / 2);
+    gl_matrix_1.vec3.scaleAndAdd(newOrigin, newOrigin, rowCosines, -rowPixelSpacing / 2);
+    const sub = gl_matrix_1.vec3.create();
+    gl_matrix_1.vec3.sub(sub, worldCoords, newOrigin);
+    const rowDistance = gl_matrix_1.vec3.dot(sub, rowCosines);
+    const columnDistance = gl_matrix_1.vec3.dot(sub, columnCosines);
+    const imageCoords = [
+        rowDistance / rowPixelSpacing,
+        columnDistance / columnPixelSpacing,
+    ];
+    if (imageCoords[0] < 0 ||
+        imageCoords[0] >= columns ||
+        imageCoords[1] < 0 ||
+        imageCoords[1] >= rows) {
+        throw new Error(`The image coordinates are outside of the image, imageCoords: ${imageCoords}`);
+    }
+    return imageCoords;
+}
+exports.default = worldToImageCoords;
+//# sourceMappingURL=worldToImageCoords.js.map

package/dist/cjs/utilities/worldToImageCoords.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worldToImageCoords.js","sourceRoot":"","sources":["../../../src/utilities/worldToImageCoords.ts"],"names":[],"mappings":";;AAAA,yCAAiC;AACjC,0BAA8B;AAa9B,SAAS,kBAAkB,CACzB,OAAe,EACf,WAAmB;IAEnB,MAAM,gBAAgB,GAAG,YAAQ,CAAC,GAAG,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IAEnE,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,0CAA0C,OAAO,EAAE,CAAC,CAAC;KACtE;IAKD,MAAM,EACJ,aAAa,EACb,kBAAkB,EAClB,UAAU,EACV,eAAe,EACf,oBAAoB,EAAE,MAAM,EAC5B,IAAI,EACJ,OAAO,GACR,GAAG,gBAAgB,CAAC;IAKrB,MAAM,SAAS,GAAG,gBAAI,CAAC,MAAM,EAAE,CAAC;IAEhC,gBAAI,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAC;IAC5E,gBAAI,CAAC,WAAW,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC;IAGzE,MAAM,GAAG,GAAG,gBAAI,CAAC,MAAM,EAAE,CAAC;IAC1B,gBAAI,CAAC,GAAG,CAAC,GAAG,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IAGtC,MAAM,WAAW,GAAG,gBAAI,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAG9C,MAAM,cAAc,GAAG,gBAAI,CAAC,GAAG,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAEpD,MAAM,WAAW,GAAG;QAClB,WAAW,GAAG,eAAe;QAC7B,cAAc,GAAG,kBAAkB;KACpC,CAAC;IAEF,IACE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;QAClB,WAAW,CAAC,CAAC,CAAC,IAAI,OAAO;QACzB,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;QAClB,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,EACtB;QACA,MAAM,IAAI,KAAK,CACb,gEAAgE,WAAW,EAAE,CAC9E,CAAC;KACH;IAED,OAAO,WAAqB,CAAC;AAC/B,CAAC;AAED,kBAAe,kBAAkB,CAAC"}

package/dist/esm/RenderingEngine/StackViewport.d.ts

@@ -8,12 +8,10 @@ declare class StackViewport extends Viewport implements IStackViewport {
     private initialVOIRange;
     private invert;
     private interpolationType;
-    private rotation;
     private _imageData;
     private cameraPosOnRender;
     private stackInvalidated;
     private panCache;
-    private shouldFlip;
     private voiApplied;
     private rotationCache;
     private _publishCalibratedEvent;
@@ -24,6 +22,7 @@ declare class StackViewport extends Viewport implements IStackViewport {
     private cpuRenderingInvalidated;
     modality: string;
     scaling: Scaling;
+    private scalingCache;
     constructor(props: ViewportInput);
     static get useCustomRenderingPipeline(): boolean;
     resize: () => void;
@@ -35,7 +34,7 @@ declare class StackViewport extends Viewport implements IStackViewport {
     private createActorMapper;
     private buildMetadata;
     private calibrateIfNecessary;
-    setProperties({ voiRange, invert, interpolationType, rotation, flipHorizontal, flipVertical, }?: StackViewportProperties): void;
+    setProperties({ voiRange, invert, interpolationType, rotation, }?: StackViewportProperties): void;
     getProperties: () => StackViewportProperties;
     resetProperties(): void;
     getCamera(): ICamera;
@@ -44,7 +43,6 @@ declare class StackViewport extends Viewport implements IStackViewport {
     private _setPropertiesFromCache;
     private getCameraCPU;
     private setCameraCPU;
-    private setFlipDirection;
     private setFlipCPU;
     private setVOI;
     private setRotation;
@@ -66,9 +64,10 @@ declare class StackViewport extends Viewport implements IStackViewport {
     setStack(imageIds: Array<string>, currentImageIdIndex?: number): Promise<string>;
     private _checkVTKImageDataMatchesCornerstoneImage;
     private _updateVTKImageDataFromCornerstoneImage;
-    private _loadImage;
-    private _loadImageCPU;
-    private _loadImageGPU;
+    private _loadAndDisplayImage;
+    private _loadAndDisplayImageCPU;
+    private _loadAndDisplayImageGPU;
+    isImagePreScaled(imageId: string): boolean;
     private _updateActorToDisplayImageId;
     private _setImageIdIndex;
     resetCamera(resetPan?: boolean, resetZoom?: boolean): boolean;

package/dist/esm/RenderingEngine/StackViewport.js

@@ -4,7 +4,7 @@ import vtkVolume from '@kitware/vtk.js/Rendering/Core/Volume';
 import vtkVolumeMapper from '@kitware/vtk.js/Rendering/Core/VolumeMapper';
 import _cloneDeep from 'lodash.clonedeep';
 import vtkCamera from '@kitware/vtk.js/Rendering/Core/Camera';
-import { vec2, vec3 } from 'gl-matrix';
+import { vec2, vec3, mat4 } from 'gl-matrix';
 import * as metaData from '../metaData';
 import Viewport from './Viewport';
 import eventTarget from '../eventTarget';
@@ -29,12 +29,11 @@ class StackViewport extends Viewport {
     constructor(props) {
         super(props);
         this.invert = false;
-        this.rotation = 0;
         this.stackInvalidated = false;
-        this.shouldFlip = false;
         this.voiApplied = false;
         this.rotationCache = 0;
         this._publishCalibratedEvent = false;
+        this.scalingCache = {};
         this.resize = () => {
             if (this.useCPURendering) {
                 this._resizeCPU();
@@ -80,8 +79,6 @@ class StackViewport extends Viewport {
                 rotation: this.rotationCache,
                 interpolationType: this.interpolationType,
                 invert: this.invert,
-                flipHorizontal: this.flipHorizontal,
-                flipVertical: this.flipVertical,
             };
         };
         this.canvasToWorld = (canvasPos) => {
@@ -352,7 +349,7 @@ class StackViewport extends Viewport {
         };
         return imagePlaneModule;
     }
-    setProperties({ voiRange, invert, interpolationType, rotation, flipHorizontal, flipVertical, } = {}) {
+    setProperties({ voiRange, invert, interpolationType, rotation, } = {}) {
         if (typeof voiRange !== 'undefined' || !this.voiApplied) {
             this.setVOI(voiRange);
         }
@@ -367,10 +364,6 @@ class StackViewport extends Viewport {
                 this.setRotation(this.rotationCache, rotation);
             }
         }
-        if (typeof flipHorizontal !== 'undefined' ||
-            typeof flipVertical !== 'undefined') {
-            this.setFlipDirection({ flipHorizontal, flipVertical });
-        }
     }
     resetProperties() {
         this.cpuRenderingInvalidated = true;
@@ -404,8 +397,6 @@ class StackViewport extends Viewport {
             rotation: 0,
             interpolationType: InterpolationType.LINEAR,
             invert: false,
-            flipHorizontal: false,
-            flipVertical: false,
         });
     }
     _setPropertiesFromCache() {
@@ -414,15 +405,17 @@ class StackViewport extends Viewport {
             rotation: this.rotation,
             interpolationType: this.interpolationType,
             invert: this.invert,
-            flipHorizontal: this.flipHorizontal,
-            flipVertical: this.flipVertical,
         });
     }
     getCameraCPU() {
         const { metadata, viewport } = this._cpuFallbackEnabledElement;
         const { direction } = metadata;
         const viewPlaneNormal = direction.slice(6, 9).map((x) => -x);
-        const viewUp = direction.slice(3, 6).map((x) => -x);
+        let viewUp = direction.slice(3, 6).map((x) => -x);
+        if (this.rotation) {
+            const rotationMatrix = mat4.fromRotation(mat4.create(), (this.rotation * Math.PI) / 180, viewPlaneNormal);
+            viewUp = vec3.transformMat4(vec3.create(), viewUp, rotationMatrix);
+        }
         return {
             parallelProjection: true,
             focalPoint: [0, 0, 0],
@@ -439,7 +432,7 @@ class StackViewport extends Viewport {
     setCameraCPU(cameraInterface) {
         const { viewport } = this._cpuFallbackEnabledElement;
         const previousCamera = this.getCameraCPU();
-        const { focalPoint, viewUp, parallelScale } = cameraInterface;
+        const { focalPoint, viewUp, parallelScale, flipHorizontal, flipVertical } = cameraInterface;
         if (focalPoint) {
             const focalPointCanvas = this.worldToCanvasCPU(cameraInterface.focalPoint);
             const previousFocalPointCanvas = this.worldToCanvasCPU(previousCamera.focalPoint);
@@ -452,11 +445,16 @@ class StackViewport extends Viewport {
             const diff = previousCamera.parallelScale - parallelScale;
             viewport.scale += diff;
         }
+        if (flipHorizontal || flipVertical) {
+            this.setFlipCPU({ flipHorizontal, flipVertical });
+        }
         const updatedCamera = {
             ...previousCamera,
             focalPoint,
             viewUp,
             parallelScale,
+            flipHorizontal,
+            flipVertical,
         };
         const eventDetail = {
             previousCamera,
@@ -464,18 +462,10 @@ class StackViewport extends Viewport {
             element: this.element,
             viewportId: this.id,
             renderingEngineId: this.renderingEngineId,
+            rotation: this.rotation,
         };
         triggerEvent(this.element, Events.CAMERA_MODIFIED, eventDetail);
     }
-    setFlipDirection(flipDirection) {
-        if (this.useCPURendering) {
-            this.setFlipCPU(flipDirection);
-        }
-        else {
-            super.flip(flipDirection);
-        }
-        this.shouldFlip = false;
-    }
     setFlipCPU({ flipHorizontal, flipVertical }) {
         const { viewport } = this._cpuFallbackEnabledElement;
         viewport.hflip = flipHorizontal;
@@ -491,11 +481,23 @@ class StackViewport extends Viewport {
         this.setVOIGPU(voiRange);
     }
     setRotation(rotationCache, rotation) {
+        const previousCamera = this.getCamera();
         if (this.useCPURendering) {
             this.setRotationCPU(rotationCache, rotation);
-            return;
         }
-        this.setRotationGPU(rotationCache, rotation);
+        else {
+            this.setRotationGPU(rotationCache, rotation);
+        }
+        const camera = this.getCamera();
+        const eventDetail = {
+            previousCamera,
+            camera,
+            element: this.element,
+            viewportId: this.id,
+            renderingEngineId: this.renderingEngineId,
+            rotation: this.rotation,
+        };
+        triggerEvent(this.element, Events.CAMERA_MODIFIED, eventDetail);
     }
     setInterpolationType(interpolationType) {
         if (this.useCPURendering) {
@@ -665,7 +667,7 @@ class StackViewport extends Viewport {
         const ySpacing = imagePlaneModule.rowPixelSpacing || image.rowPixelSpacing;
         const xVoxels = image.columns;
         const yVoxels = image.rows;
-        const zSpacing = image.sliceThickness || EPSILON;
+        const zSpacing = EPSILON;
         const zVoxels = 1;
         const numComps = image.numComps ||
             this._getNumCompsFromPhotometricInterpretation(imagePixelModule.photometricInterpretation);
@@ -728,6 +730,7 @@ class StackViewport extends Viewport {
         this.imageIds = imageIds;
         this.currentImageIdIndex = currentImageIdIndex;
         this.stackInvalidated = true;
+        this.scalingCache = {};
         this.rotationCache = 0;
         this.flipVertical = false;
         this.flipHorizontal = false;
@@ -785,16 +788,16 @@ class StackViewport extends Viewport {
         }
         this._imageData.modified();
     }
-    async _loadImage(imageId, imageIdIndex) {
+    async _loadAndDisplayImage(imageId, imageIdIndex) {
         if (this.useCPURendering) {
-            await this._loadImageCPU(imageId, imageIdIndex);
+            await this._loadAndDisplayImageCPU(imageId, imageIdIndex);
         }
         else {
-            await this._loadImageGPU(imageId, imageIdIndex);
+            await this._loadAndDisplayImageGPU(imageId, imageIdIndex);
         }
         return imageId;
     }
-    _loadImageCPU(imageId, imageIdIndex) {
+    _loadAndDisplayImageCPU(imageId, imageIdIndex) {
         return new Promise((resolve, reject) => {
             function successCallback(image, imageIdIndex, imageId) {
                 if (this.currentImageIdIndex !== imageIdIndex) {
@@ -808,6 +811,7 @@ class StackViewport extends Viewport {
                 };
                 triggerEvent(this.element, Events.STACK_NEW_IMAGE, eventDetail);
                 const metadata = this._getImageDataMetadata(image);
+                image.isPreScaled = this.isImagePreScaled(imageId);
                 const viewport = getDefaultViewport(this.canvas, image, this.modality, this._cpuFallbackEnabledElement.viewport.colormap);
                 this._cpuFallbackEnabledElement.image = image;
                 this._cpuFallbackEnabledElement.metadata = {
@@ -852,6 +856,7 @@ class StackViewport extends Viewport {
                 modality: generalSeriesModule.modality,
                 suvbw: suvFactor.suvbw,
             };
+            this.scalingCache[imageId] = scalingParameters;
             const type = 'Float32Array';
             const priority = -5;
             const requestType = RequestType.Interaction;
@@ -869,7 +874,7 @@ class StackViewport extends Viewport {
             imageLoadPoolManager.addRequest(sendRequest.bind(this, imageId, imageIdIndex, options), requestType, additionalDetails, priority);
         });
     }
-    _loadImageGPU(imageId, imageIdIndex) {
+    _loadAndDisplayImageGPU(imageId, imageIdIndex) {
         return new Promise((resolve, reject) => {
             function successCallback(image, imageIdIndex, imageId) {
                 if (this.currentImageIdIndex !== imageIdIndex) {
@@ -912,6 +917,7 @@ class StackViewport extends Viewport {
                 modality: generalSeriesModule.modality,
                 suvbw: suvFactor.suvbw,
             };
+            this.scalingCache[imageId] = scalingParameters;
             const type = 'Float32Array';
             const priority = -5;
             const requestType = RequestType.Interaction;
@@ -926,9 +932,29 @@ class StackViewport extends Viewport {
                     scalingParameters,
                 },
             };
+            const eventDetail = {
+                imageId,
+                viewportId: this.id,
+                renderingEngineId: this.renderingEngineId,
+            };
+            triggerEvent(this.element, Events.PRE_STACK_NEW_IMAGE, eventDetail);
             imageLoadPoolManager.addRequest(sendRequest.bind(this, imageId, imageIdIndex, options), requestType, additionalDetails, priority);
         });
     }
+    isImagePreScaled(imageId) {
+        const scalingParameters = this.scalingCache[imageId];
+        if (!scalingParameters) {
+            return false;
+        }
+        const { modality, rescaleIntercept, rescaleSlope, suvbw } = scalingParameters;
+        if (rescaleSlope !== undefined && rescaleIntercept !== undefined) {
+            if (modality === 'PT') {
+                return suvbw !== undefined;
+            }
+            return true;
+        }
+        return false;
+    }
     _updateActorToDisplayImageId(image) {
         const sameImageData = this._checkVTKImageDataMatchesCornerstoneImage(image, this._imageData);
         const activeCamera = this.getRenderer().getActiveCamera();
@@ -970,9 +996,13 @@ class StackViewport extends Viewport {
         this.triggerCameraEvent(this.getCamera(), previousCameraProps);
         activeCamera.setFreezeFocalPoint(true);
         const { windowCenter, windowWidth } = imagePixelModule;
-        const voiRange = typeof windowCenter === 'number' && typeof windowWidth === 'number'
+        let voiRange = typeof windowCenter === 'number' && typeof windowWidth === 'number'
             ? windowLevelUtil.toLowHighRange(windowWidth, windowCenter)
             : undefined;
+        const isPreScaled = this.isImagePreScaled(image.imageId);
+        if (imagePixelModule.modality === 'PT' && isPreScaled) {
+            voiRange = { lower: 0, upper: 5 };
+        }
         this.initialVOIRange = voiRange;
         this.setProperties({ voiRange });
         const { position } = this.getCamera();
@@ -987,7 +1017,7 @@ class StackViewport extends Viewport {
             throw new Error(`ImageIdIndex provided ${imageIdIndex} is invalid, the stack only has ${this.imageIds.length} elements`);
         }
         this.currentImageIdIndex = imageIdIndex;
-        const imageId = await this._loadImage(this.imageIds[imageIdIndex], imageIdIndex);
+        const imageId = await this._loadAndDisplayImage(this.imageIds[imageIdIndex], imageIdIndex);
         return imageId;
     }
     resetCamera(resetPan = true, resetZoom = true) {
@@ -997,6 +1027,8 @@ class StackViewport extends Viewport {
         else {
             this.resetCameraGPU(resetPan, resetZoom);
         }
+        this.rotation = 0;
+        this.rotationCache = 0;
         return true;
     }
     resetCameraCPU(resetPan, resetZoom) {
@@ -1019,7 +1051,7 @@ class StackViewport extends Viewport {
     calibrateSpacing(imageId) {
         const imageIdIndex = this.getImageIds().indexOf(imageId);
         this.stackInvalidated = true;
-        this._loadImage(imageId, imageIdIndex);
+        this._loadAndDisplayImage(imageId, imageIdIndex);
     }
     _restoreCameraProps({ parallelScale: prevScale }, previousCamera) {
         const renderer = this.getRenderer();