Merge pull request #56 from LinkunGao/release/v1.11.8

Release/v1.11.8
LinkunGao · Sep 22, 2022 · 237c8ef · 237c8ef
2 parents a0f113f + b0dcc99
commit 237c8ef
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 36 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -22,7 +22,7 @@
 author = 'LinkunGao'
 
 # The full version, including alpha/beta/rc tags
-release = 'v1.11.7'
+release = 'v1.11.8'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/docs/source/release/release.md b/docs/source/release/release.md
@@ -671,3 +671,20 @@ appRenderer.sceneInfos[0].addPreRenderCallbackFunction(nrrdTools.start);
 - Fixed undo issue.
 
 - Optimised dicom loader.
+
+## Release v1.11.8
+
+- fixed dicom loader disoder issue after load all dicom files.
+  - the default order is ascending order.
+- add set order function in copperScene.
+  ```ts
+  scene.setDicomFilesOrder("descending"); // value => "ascending" | descending
+  // set order must before load function
+  scene.loadDicom(
+    urls,
+    (mesh) => {
+      console.log(mesh);
+    },
+    gui
+  );
+  ```
diff --git a/docs/source/tutorial/15_texture2d_heartmodel.md b/docs/source/tutorial/15_texture2d_heartmodel.md
@@ -81,6 +81,8 @@ function loadModel(urls: Array<string>, name: string) {
 
     if (scene) {
       appRenderer.setCurrentScene(scene);
+
+      scene.setDicomFilesOrder("descending");
       //   load dicom image
       scene.loadDicom(
         urls,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "copper3d_visualisation",
   "description": "A 3d visualisation package base on threejs provides multiple scenes and Nrrd image load funtion.",
-  "version": "1.11.7",
+  "version": "1.11.8",
   "main": "dist/bundle.umd.js",
   "moudle": "dist/bundle.esm.js",
   "types": "dist/types/index.d.ts",

diff --git a/src/Loader/copperDicomLoader.ts b/src/Loader/copperDicomLoader.ts
@@ -11,57 +11,55 @@ export function copperDicomLoader(
 ) {
   loader.load(url, (arrayBuffer) => {
     var dicomFileAsBuffer = new Uint8Array(arrayBuffer as ArrayBuffer);
+
     const dataSet = dicomParser.parseDicom(dicomFileAsBuffer);
     let tags: any = null;
     let w: number;
     let h: number;
     let invert: boolean;
     let windowCenter: number;
     let windowWidth: number;
+    let order: number = 0;
+
+    // console.log(dataSet.elements.x00181060);
+    // console.log(dataSet.elements.x00201041);
+
+    // console.log(dataSet.uint16("x00280004"));
+    // // console.log(dataSet.string("x00201041"));
+    // console.log(dataSet.string("x00201041"));
 
     try {
       tags = dicomParser.explicitDataSetToJS(dataSet);
+      if (dataSet.elements.x00181060) {
+        order = parseInt(tags["x00181060"]);
+      } else if (dataSet.elements.x00201041) {
+        order = parseInt(tags["x00201041"]);
+      }
       w = parseInt(tags["x00280011"]); //width
       h = parseInt(tags["x00280010"]); //height
       invert = tags["x00280004"] === "MONOCHROME1" ? true : false; //is invert?
       windowCenter = parseInt(tags["x00281050"]); //window center
       windowWidth = parseInt(tags["x00281051"]); //window width
     } catch {
-      w = convertImplicitElement(
-        dataSet.elements.x00280011,
-        dicomFileAsBuffer
-      )[0];
-      h = convertImplicitElement(
-        dataSet.elements.x00280010,
-        dicomFileAsBuffer
-      )[0];
-      invert =
-        convertImplicitElement(
-          dataSet.elements.x00280004,
-          dicomFileAsBuffer
-        )[0] === 20301
-          ? false
-          : true;
-
-      windowCenter = 226;
-      windowWidth = 537;
+      w = dataSet.uint16("x00280011");
+      h = dataSet.uint16("x00280010");
+      invert = dataSet.string("x00280004") === "MONOCHROME1" ? true : false;
+      windowCenter = parseInt(dataSet.string("x00281050"));
+      windowWidth = parseInt(dataSet.string("x00281051"));
+      if (dataSet.elements.x00181060) {
+        order = parseInt(dataSet.string("x00181060"));
+      } else if (dataSet.elements.x00201041) {
+        order = parseInt(dataSet.string("x00201041"));
+      }
     }
+
     if (windowCenter == 0 || windowWidth == 0) {
       windowCenter = 226;
       windowWidth = 537;
     }
 
     let pixelData = dataSet.elements.x7fe00010;
-    let pixelDataBuffer = dicomParser.sharedCopy(
-      dicomFileAsBuffer,
-      pixelData.dataOffset,
-      pixelData.length
-    );
-    let uint16 = new Uint16Array(
-      pixelDataBuffer.buffer,
-      pixelDataBuffer.byteOffset,
-      pixelDataBuffer.byteLength / Uint16Array.BYTES_PER_ELEMENT
-    );
+    let uint16 = convertImplicitElement(pixelData, dicomFileAsBuffer);
     let voiLUT;
     let lut = getLut(uint16, windowWidth, windowCenter, invert, voiLUT);
     let uint8 = new Uint8ClampedArray(uint16.length);
@@ -77,6 +75,7 @@ export function copperDicomLoader(
       invert,
       uint16,
       uint8,
+      order,
     };
     callback && callback(copperVolume);
   });

diff --git a/src/Scene/copperScene.ts b/src/Scene/copperScene.ts
@@ -35,6 +35,7 @@ export default class copperScene extends baseScene {
   private depthStep: number = 0.4;
   private texture2dMesh: THREE.Mesh | null = null;
   private preRenderCallbackFunctions: Array<preRenderCallbackFunctionType> = [];
+  private sort: boolean = true; //default ascending order
 
   constructor(container: HTMLDivElement, renderer: THREE.WebGLRenderer) {
     super(container, renderer);
@@ -49,6 +50,13 @@ export default class copperScene extends baseScene {
   setDepth(value: number) {
     this.depthStep = value;
   }
+  setDicomFilesOrder(value: "ascending" | "descending") {
+    if (value === "ascending") {
+      this.sort = true;
+    } else if (value === "descending") {
+      this.sort = false;
+    }
+  }
 
   loadGltf(url: string, callback?: (content: THREE.Group) => void) {
     const loader = copperGltfLoader(this.renderer);
@@ -223,19 +231,34 @@ export default class copperScene extends baseScene {
     if (Array.isArray(urls)) {
       const depth: number = urls.length;
 
+      const copperVolumes: Array<copperVolumeType> = [];
       let unit8Arrays: Array<Uint8ClampedArray> = [];
       let unit16Arrays: Array<Uint16Array> = [];
       urls.forEach((url) => {
         copperDicomLoader(url, (copperVolume) => {
-          unit8Arrays.push(copperVolume.uint8);
-          unit16Arrays.push(copperVolume.uint16);
-          if (unit8Arrays.length === depth) {
+          copperVolumes.push(copperVolume);
+
+          if (copperVolumes.length === depth) {
+            // reorder each dicom file
+            copperVolumes.sort((a: copperVolumeType, b: copperVolumeType) => {
+              if (this.sort) {
+                return a.order - b.order;
+              } else {
+                return b.order - a.order;
+              }
+            });
+            copperVolumes.forEach((volume) => {
+              unit8Arrays.push(volume.uint8);
+              unit16Arrays.push(volume.uint16);
+            });
+
             const uint8 = new Uint8ClampedArray(
               copperVolume.width * copperVolume.height * depth
             );
             const uint16 = new Uint16Array(uint8.length);
             let base8Index = 0;
             let base16Index = 0;
+
             unit8Arrays.forEach((array, index) => {
               base8Index = index * copperVolume.width * copperVolume.height;
               for (let i = 0; i < array.length; i++) {

diff --git a/src/index.ts b/src/index.ts
@@ -34,7 +34,7 @@ import {
 import "./css/style.css";
 
 console.log(
-  "%cMedtech Heart Plugin %cBeta:v1.11.7",
+  "%cMedtech Heart Plugin %cBeta:v1.11.8",
   "padding: 3px;color:white; background:#023047",
   "padding: 3px;color:white; background:#f50a25"
 );

diff --git a/src/types/types.ts b/src/types/types.ts
@@ -166,6 +166,7 @@ interface copperVolumeType {
   invert: boolean;
   uint16: Uint16Array;
   uint8: Uint8ClampedArray;
+  order: number;
 }
 
 export type {