@cornerstonejs/dicom-image-loader 3.0.0-beta.6 → 3.0.1

package/README.md

@@ -1,173 +1,3 @@
 # DICOM Image Loader
 
-This package provides a DICOM image loader for the Cornerstone library.
-This is the successor to the [cornerstoneDICOMImageLoader] which provides the following
-added features:
-
-- Typescript support (and type definitions)
-- Better developer experience (e.g. mono repo, linting, etc)
-
-
-
-A [cornerstone](https://github.com/cornerstonejs/cornerstone) Image Loader for
-DICOM P10 instances over HTTP (WADO-URI) or DICOMWeb (WADO-RS) and Local filedisk. This can be used
-to integrate cornerstone with WADO-URI servers, DICOMWeb servers or any other
-HTTP based server that returns DICOM P10 instances (e.g.
-[Orthanc](http://www.orthanc-server.com/) or custom servers)
-
-## Key Features
-
-- Implements a
-  [cornerstone ImageLoader](https://www.cornerstonejs.org/docs/concepts/cornerstone-core/imageLoader)
-  for DICOM P10 Instances via a HTTP get request.
-  - Can be used with a WADO-URI server
-  - Can be used with Orthanc's file endpoint
-  - Can be used with any server that returns DICOM P10 instances via HTTP GET
-- Implements a
-  [cornerstone ImageLoader](https://www.cornerstonejs.org/docs/concepts/cornerstone-core/imageLoader)
-  for WADO-RS (DICOMWeb)
-- Supports many popular transfer syntaxes and photometric interpretations
-  [see full list](docs/TransferSyntaxes.md)
-  and [codec](docs/Codecs.md) for more information.
-- Dynamicly Utilizes WebAssembly (WASM) builds of each codec which sgnificantly improves image decoding performance and enables us to load codec at runtime when needed dynamically, which reduces the build time and complexity.
-- Framework to execute CPU intensive tasks in [web workers](docs/WebWorkers.md)
-  - Used for image decoding
-  - Can be used for your own CPU intensive tasks (e.g. image processing)
-
-
-## Install
-
-### NPM
-
-```bash
-yarn add @cornerstonejs/dicom-image-loader
-```
-
-
-
-## Usage
-
-Specify the cornerstone instance you want to register the loader with.
-
-```javascript
-cornerstoneDICOMImageLoader.external.cornerstone = cornerstone;
-```
-
-Have your code configure the web worker framework:
-
-```javascript
-var config = {
-  maxWebWorkers: navigator.hardwareConcurrency || 1,
-  startWebWorkersOnDemand: true,
-};
-cornerstoneDICOMImageLoader.webWorkerManager.initialize(config);
-```
-
-See the [web workers](docs/WebWorkers.md) documentation for more details on
-configuring.
-
-
-
-#### Dynamic Import
-
-To be able to use the dynamic import feature for CDIL, instead of
-
-```js
-import cornerstoneDICOMImageLoader from '@cornerstonejs/dicom-image-loader';
-```
-
-you need to do:
-
-```js
-import cornerstoneDICOMImageLoader from '@cornerstonejs/dicom-image-loader/dist/dynamic-import/cornerstoneDICOMImageLoader.min.js';
-```
-
-This way, codecs are loaded dynamically when needed. You have another option to
-create an alias in the webpack config file:
-
-```js
-resolve: {
-  alias: {
-    '@cornerstonejs/dicom-image-loader':
-      '@cornerstonejs/dicom-image-loader/dist/dynamic-import/cornerstoneDICOMImageLoader.min.js',
-  },
-},
-```
-
-In addition WASM builds of the codec files should be made available in the build
-folder. You can use `CopyWebpackPlugin` to copy the WASM files to the build folder.
-
-
-```js
- plugins: [
-  new CopyWebpackPlugin([
-    {
-      from:
-        '../../../node_modules/@cornerstonejs/dicom-image-loader/dist/dynamic-import',
-      to: DIST_DIR,
-    },
-  ]),
-```
-
-Note 1: You need to give the correct path in the `CopyWebpackPlugin`, the above
-path is relative to the `node_modules` folder in the OHIF Viewer.
-
-Note 2: For other http servers like IIS, you need to configure it to serve WASM
-files with the correct MIME type.
-
-## Loading
-
-![Alt text](assets/load.png)
-
-## Backlog
-
-- ESM build for the library
-- Make the examples work again
-- Free up DICOM P10 instance after decoding to reduce memory consumption
-- Look at using EMSCRIPTEN based build of IJG for JPEG
-- Add support for bulk data items to WADO-RS Loader
-- WebWorker Manager
-  - Better handling of web worker loading
-  - Add events to webWorkerManager so its activity can be monitored
-  - Add support for issuing progress events from web worker tasks
-
-# FAQ
-
-_Why is this a separate library from cornerstone?_
-
-Mainly to avoid adding a dependency to cornerstone for the DICOM parsing
-library. While cornerstone is intended to be used to display medical images that
-are stored in DICOM, cornerstone aims to simplify the use of medical imaging and
-therefore tries to hide some of the complexity that exists within DICOM. It is
-also desirable to support display of non DICOM images so a DICOM independent
-image model makes sense.
-
-_How do I build this library myself?_
-
-See the documentation [here](docs/Building.md)
-
-_How do I add my own custom web worker tasks?_
-
-See the documentation [here](docs/WebWorkers.md)
-
-_How do I create imageIds that work with this image loader?_
-
-See the documentation [here](docs/ImageIds.md)
-
-# What Transfer Syntaxes are supported?
-
-See [transfer syntaxes](docs/TransferSyntaxes.md)
-
-
-[license-image]: http://img.shields.io/badge/license-MIT-blue.svg?style=flat
-[license-url]: LICENSE
-
-[npm-url]: https://npmjs.org/package/@cornerstonejs/dicom-image-loader
-[npm-version-image]: http://img.shields.io/npm/v/@cornerstonejs/dicom-image-loader.svg?style=flat
-[npm-downloads-image]: http://img.shields.io/npm/dm/@cornerstonejs/dicom-image-loader.svg?style=flat
-
-[travis-url]: http://travis-ci.org/cornerstonejs/cornerstoneDICOMImageLoader
-[travis-image]: https://travis-ci.org/cornerstonejs/cornerstoneDICOMImageLoader.svg?branch=master
-
-[coverage-url]: https://coveralls.io/github/cornerstonejs/cornerstoneDICOMImageLoader?branch=master
-[coverage-image]: https://coveralls.io/repos/github/cornerstonejs/cornerstoneDICOMImageLoader/badge.svg?branch=master
+See full guide on [cornerstonejs.org](https://cornerstonejs.org/)

package/dist/esm/imageLoader/createImage.js

@@ -1,5 +1,4 @@
 import getMinMax from '../shared/getMinMax';
-import getPixelDataTypeFromMinMax from '../shared/getPixelDataTypeFromMinMax';
 import { canRenderFloatTextures, Enums, metaData, utilities, } from '@cornerstonejs/core';
 import convertColorSpace from './convertColorSpace';
 import isColorConversionRequired from './isColorConversionRequired';
@@ -8,35 +7,10 @@ import getImageFrame from './getImageFrame';
 import getScalingParameters from './getScalingParameters';
 import { getOptions } from './internal/options';
 import isColorImageFn from '../shared/isColorImage';
+import removeAFromRGBA from './removeAFromRGBA';
+import isModalityLUTForDisplay from './isModalityLutForDisplay';
+import setPixelDataType from './setPixelDataType';
 let lastImageIdDrawn = '';
-function isModalityLUTForDisplay(sopClassUid) {
-    return (sopClassUid !== '1.2.840.10008.5.1.4.1.1.12.1' &&
-        sopClassUid !== '1.2.840.10008.5.1.4.1.1.12.2.1');
-}
-function setPixelDataType(imageFrame) {
-    const minValue = imageFrame.smallestPixelValue;
-    const maxValue = imageFrame.largestPixelValue;
-    const TypedArray = getPixelDataTypeFromMinMax(minValue, maxValue);
-    if (TypedArray) {
-        const typedArray = new TypedArray(imageFrame.pixelData);
-        imageFrame.pixelData = typedArray;
-    }
-    else {
-        throw new Error('Could not apply a typed array to the pixel data');
-    }
-}
-function removeAFromRGBA(pixelData, targetBuffer) {
-    const numPixels = pixelData.length / 4;
-    let rgbIndex = 0;
-    let bufferIndex = 0;
-    for (let i = 0; i < numPixels; i++) {
-        targetBuffer[bufferIndex++] = pixelData[rgbIndex++];
-        targetBuffer[bufferIndex++] = pixelData[rgbIndex++];
-        targetBuffer[bufferIndex++] = pixelData[rgbIndex++];
-        rgbIndex++;
-    }
-    return targetBuffer;
-}
 function createImage(imageId, pixelData, transferSyntax, options = {}) {
     const useRGBA = options.useRGBA;
     options.preScale = {

package/dist/esm/imageLoader/index.d.ts

@@ -10,6 +10,11 @@ import { default as getMinMax } from '../shared/getMinMax';
 import { default as isColorImage } from '../shared/isColorImage';
 import { default as isJPEGBaseline8BitColor } from './isJPEGBaseline8BitColor';
 import { default as getPixelData } from './wadors/getPixelData';
+import { default as getScalingParameters } from './getScalingParameters';
+import { default as isColorConversionRequired } from './isColorConversionRequired';
+import { default as removeAFromRGBA } from './removeAFromRGBA';
+import { default as isModalityLUTForDisplay } from './isModalityLutForDisplay';
+import { default as setPixelDataType } from './setPixelDataType';
 import { internal } from './internal/index';
 declare const cornerstoneDICOMImageLoader: {
     convertRGBColorByPixel: typeof convertRGBColorByPixel;
@@ -80,6 +85,11 @@ declare const cornerstoneDICOMImageLoader: {
     getMinMax: typeof getMinMax;
     isColorImage: typeof isColorImage;
     isJPEGBaseline8BitColor: typeof isJPEGBaseline8BitColor;
+    getScalingParameters: typeof getScalingParameters;
+    isColorConversionRequired: typeof isColorConversionRequired;
+    removeAFromRGBA: typeof removeAFromRGBA;
+    isModalityLUTForDisplay: typeof isModalityLUTForDisplay;
+    setPixelDataType: typeof setPixelDataType;
     internal: {
         xhrRequest: typeof import("./internal/xhrRequest").default;
         streamRequest: typeof import("./internal/streamRequest").default;

package/dist/esm/imageLoader/index.js

@@ -10,6 +10,11 @@ import { default as getMinMax } from '../shared/getMinMax';
 import { default as isColorImage } from '../shared/isColorImage';
 import { default as isJPEGBaseline8BitColor } from './isJPEGBaseline8BitColor';
 import { default as getPixelData } from './wadors/getPixelData';
+import { default as getScalingParameters } from './getScalingParameters';
+import { default as isColorConversionRequired } from './isColorConversionRequired';
+import { default as removeAFromRGBA } from './removeAFromRGBA';
+import { default as isModalityLUTForDisplay } from './isModalityLutForDisplay';
+import { default as setPixelDataType } from './setPixelDataType';
 import { internal } from './internal/index';
 const cornerstoneDICOMImageLoader = {
     convertRGBColorByPixel,
@@ -28,6 +33,11 @@ const cornerstoneDICOMImageLoader = {
     getMinMax,
     isColorImage,
     isJPEGBaseline8BitColor,
+    getScalingParameters,
+    isColorConversionRequired,
+    removeAFromRGBA,
+    isModalityLUTForDisplay,
+    setPixelDataType,
     internal,
 };
 export { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, wadouri, wadors, init, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, };

package/dist/esm/imageLoader/isModalityLutForDisplay.d.ts

@@ -0,0 +1,2 @@
+declare function isModalityLUTForDisplay(sopClassUid: string): boolean;
+export default isModalityLUTForDisplay;

package/dist/esm/imageLoader/isModalityLutForDisplay.js

@@ -0,0 +1,5 @@
+function isModalityLUTForDisplay(sopClassUid) {
+    return (sopClassUid !== '1.2.840.10008.5.1.4.1.1.12.1' &&
+        sopClassUid !== '1.2.840.10008.5.1.4.1.1.12.2.1');
+}
+export default isModalityLUTForDisplay;

package/dist/esm/imageLoader/removeAFromRGBA.d.ts

@@ -0,0 +1,3 @@
+import type { Types } from '@cornerstonejs/core';
+declare function removeAFromRGBA(pixelData: Types.PixelDataTypedArray, targetBuffer: Uint8ClampedArray | Uint8Array): Uint8Array | Uint8ClampedArray;
+export default removeAFromRGBA;

package/dist/esm/imageLoader/removeAFromRGBA.js

@@ -0,0 +1,13 @@
+function removeAFromRGBA(pixelData, targetBuffer) {
+    const numPixels = pixelData.length / 4;
+    let rgbIndex = 0;
+    let bufferIndex = 0;
+    for (let i = 0; i < numPixels; i++) {
+        targetBuffer[bufferIndex++] = pixelData[rgbIndex++];
+        targetBuffer[bufferIndex++] = pixelData[rgbIndex++];
+        targetBuffer[bufferIndex++] = pixelData[rgbIndex++];
+        rgbIndex++;
+    }
+    return targetBuffer;
+}
+export default removeAFromRGBA;

package/dist/esm/imageLoader/setPixelDataType.d.ts

@@ -0,0 +1,2 @@
+declare function setPixelDataType(imageFrame: any): void;
+export default setPixelDataType;

package/dist/esm/imageLoader/setPixelDataType.js

@@ -0,0 +1,14 @@
+import getPixelDataTypeFromMinMax from '../shared/getPixelDataTypeFromMinMax';
+function setPixelDataType(imageFrame) {
+    const minValue = imageFrame.smallestPixelValue;
+    const maxValue = imageFrame.largestPixelValue;
+    const TypedArray = getPixelDataTypeFromMinMax(minValue, maxValue);
+    if (TypedArray) {
+        const typedArray = new TypedArray(imageFrame.pixelData);
+        imageFrame.pixelData = typedArray;
+    }
+    else {
+        throw new Error('Could not apply a typed array to the pixel data');
+    }
+}
+export default setPixelDataType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/dicom-image-loader",
-  "version": "3.0.0-beta.6",
+  "version": "3.0.1",
   "description": "Cornerstone Image Loader for DICOM WADO-URI and WADO-RS and Local file",
   "keywords": [
     "DICOM",
@@ -116,7 +116,7 @@
     "uuid": "^9.0.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^3.0.0-beta.6",
+    "@cornerstonejs/core": "^3.0.1",
     "dicom-parser": "^1.8.9"
   },
   "lint-staged": {
@@ -131,5 +131,5 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   },
-  "gitHead": "c29fc0d8731f785f43184ab9fe43e59140e98386"
+  "gitHead": "ef8157e5e9c3135c34fe6194afde06b018c1655f"
 }