larvitar 1.5.12 → 1.5.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/README.md +2 -2
  2. package/imaging/imageLoading.js +5 -4
  3. package/imaging/imageRendering.js +1 -1
  4. package/imaging/loaders/commonLoader.js +1 -1
  5. package/imaging/loaders/multiframeLoader.js +1 -1
  6. package/imaging/loaders/nrrdLoader.js +1 -1
  7. package/imaging/loaders/resliceLoader.js +1 -1
  8. package/index.js +1 -1
  9. package/package.json +2 -2
package/README.md CHANGED
@@ -6,8 +6,8 @@
6
6
 
7
7
  ## Dicom Image Toolkit for CornerstoneJS
8
8
 
9
- ### Current version: 1.5.12
10
- ### Latest Published Release: 1.5.12
9
+ ### Current version: 1.5.14
10
+ ### Latest Published Release: 1.5.14
11
11
 
12
12
  This library provides common DICOM functionalities to be used in web-applications: it's wrapper that simplifies the use of cornerstone-js environment.
13
13
  Orthogonal multiplanar reformat is included as well as custom loader/exporter for nrrd files and [Vuex](https://vuex.vuejs.org/) custom integration.
package/imaging/imageLoading.js CHANGED
@@ -6,7 +6,7 @@
6
6
  // external libraries
7
7
  import cornerstone from "cornerstone-core";
8
8
  import dicomParser from "dicom-parser";
9
- import cornerstoneDICOMImageLoader from "@cornerstonejs/dicom-image-loader/dist/cornerstoneDICOMImageLoader.bundle.min.js";
9
+ import { default as cornerstoneDICOMImageLoader } from "cornerstone-wado-image-loader";
10
10
  import cornerstoneWebImageLoader from "cornerstone-web-image-loader";
11
11
  import cornerstoneFileImageLoader from "cornerstone-file-image-loader";
12
12
  import { forEach } from "lodash";
@@ -177,9 +177,10 @@ export const updateLoadedStack = function (
177
177
  };
178
178
  }
179
179
 
180
- const sortMethods = is4D
181
- ? ["imagePosition", "contentTime"]
182
- : ["imagePosition"];
180
+ // get instance number from metadata
181
+ const instanceNumber = seriesData.metadata["x00200013"];
182
+ const defaultMethod = instanceNumber ? "instanceNumber" : "imagePosition";
183
+ const sortMethods = is4D ? [defaultMethod, "contentTime"] : [defaultMethod];
183
184
 
184
185
  // if the parsed file is a new series instance, keep it
185
186
  if (isNewInstance(allSeriesStack[id].instances, iid)) {
package/imaging/imageRendering.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  // external libraries
7
7
  import cornerstone from "cornerstone-core";
8
- import cornerstoneDICOMImageLoader from "@cornerstonejs/dicom-image-loader/dist/cornerstoneDICOMImageLoader.bundle.min.js";
8
+ import { default as cornerstoneDICOMImageLoader } from "cornerstone-wado-image-loader";
9
9
  import { each, has } from "lodash";
10
10
 
11
11
  // internal libraries
package/imaging/loaders/commonLoader.js CHANGED
@@ -4,7 +4,7 @@
4
4
  */
5
5
 
6
6
  // external libraries
7
- import cornerstoneDICOMImageLoader from "@cornerstonejs/dicom-image-loader/dist/cornerstoneDICOMImageLoader.bundle.min.js";
7
+ import { default as cornerstoneDICOMImageLoader } from "cornerstone-wado-image-loader";
8
8
  import { each } from "lodash";
9
9
  import { updateLoadedStack } from "../imageLoading";
10
10
 
package/imaging/loaders/multiframeLoader.js CHANGED
@@ -3,7 +3,7 @@
3
3
  */
4
4
 
5
5
  // external libraries
6
- import cornerstoneDICOMImageLoader from "@cornerstonejs/dicom-image-loader/dist/cornerstoneDICOMImageLoader.bundle.min.js";
6
+ import { default as cornerstoneDICOMImageLoader } from "cornerstone-wado-image-loader";
7
7
  import { each, range } from "lodash";
8
8
 
9
9
  // internal libraries
package/imaging/loaders/nrrdLoader.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  // external libraries
7
7
  import cornerstone from "cornerstone-core";
8
- import cornerstoneDICOMImageLoader from "@cornerstonejs/dicom-image-loader/dist/cornerstoneDICOMImageLoader.bundle.min.js";
8
+ import { default as cornerstoneDICOMImageLoader } from "cornerstone-wado-image-loader";
9
9
  import { each, clone, range, findKey, filter, pickBy } from "lodash";
10
10
  import { v4 as uuidv4 } from "uuid";
11
11
 
package/imaging/loaders/resliceLoader.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  // external libraries
7
7
  import cornerstone from "cornerstone-core";
8
- import cornerstoneDICOMImageLoader from "@cornerstonejs/dicom-image-loader/dist/cornerstoneDICOMImageLoader.bundle.min.js";
8
+ import { default as cornerstoneDICOMImageLoader } from "cornerstone-wado-image-loader";
9
9
 
10
10
  // internal libraries
11
11
  import {
package/index.js CHANGED
@@ -4,7 +4,7 @@ console.log(`LARVITAR v${VERSION}`);
4
4
 
5
5
  import cornerstone from "cornerstone-core";
6
6
  import cornerstoneTools from "cornerstone-tools";
7
- import cornerstoneDICOMImageLoader from "@cornerstonejs/dicom-image-loader/dist/cornerstoneDICOMImageLoader.bundle.min.js";
7
+ import { default as cornerstoneDICOMImageLoader } from "cornerstone-wado-image-loader";
8
8
  const segModule = cornerstoneTools.getModule("segmentation");
9
9
 
10
10
  import larvitarModule from "./modules/vuex/larvitar";
package/package.json CHANGED
@@ -6,7 +6,7 @@
6
6
  "medical",
7
7
  "cornerstone"
8
8
  ],
9
- "version": "1.5.12",
9
+ "version": "1.5.14",
10
10
  "description": "javascript library for parsing, loading, rendering and interacting with DICOM images",
11
11
  "repository": {
12
12
  "url": "https://github.com/dvisionlab/Larvitar.git",
@@ -25,11 +25,11 @@
25
25
  ],
26
26
  "license": "MIT",
27
27
  "dependencies": {
28
- "@cornerstonejs/dicom-image-loader": "^1.2.8",
29
28
  "@rollup/plugin-commonjs": "^17.1.0",
30
29
  "cornerstone-core": "^2.6.1",
31
30
  "cornerstone-file-image-loader": "^0.3.0",
32
31
  "cornerstone-tools": "^6.0.7",
32
+ "cornerstone-wado-image-loader": "^4.13.2",
33
33
  "cornerstone-web-image-loader": "^2.1.1",
34
34
  "crypto-js": "^4.1.1",
35
35
  "dicom-character-set": "^1.0.3",