Merge pull request #144 from LinkunGao/release/v1.12.20

Release/v1.12.20

Author: LinkunGao

docs/source/release/release.md

@@ -1160,3 +1160,8 @@ const resetMainAreaSize = (factor: number) => {
 ## Release v1.12.19
 
 - set default cursor to dot in nrrd_tools.
+
+## Release v1.12.20
+
+- Modify the drag method logic in nrrd_tools.
+  - now when user enable the showContrast (nrrdTools.setShowInMainArea(true)), the last slice's index contrast image will disable the drag function.

package-lock.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.12.19",
+  "version": "1.12.20",
   "main": "dist/bundle.umd.js",
   "moudle": "dist/bundle.esm.js",
   "types": "dist/types/index.d.ts",

package.json

@@ -21,6 +21,7 @@ export class nrrd_tools {
   paintImages: paintImagesType = { x: [], y: [], z: [] };
   // store all contrast slices, include x, y, z orientation
   private allSlicesArray: Array<nrrdSliceType> = [];
+  // to store all display slices, only include one orientation (e.g, x,y,z) for all contrast slices.
   private displaySlices: Array<any> = [];
   // Designed for reload displaySlices Array
   private backUpDisplaySlices: Array<any> = [];
@@ -373,7 +374,6 @@ export class nrrd_tools {
 
     this.axis = axis;
     this.resetDisplaySlicesStatus();
-    console.log(this.mainPreSlice);
   }
 
   addSkip(index: number) {
@@ -425,8 +425,8 @@ export class nrrd_tools {
     }
   }
 
-  setShowInMainArea(flag: boolean) {
-    this.nrrd_states.showContrast = flag;
+  setShowInMainArea(isShowContrast: boolean) {
+    this.nrrd_states.showContrast = isShowContrast;
     this.nrrd_states.contrastNum = 0;
     if (this.mainPreSlice) {
       this.redrawMianPreOnDisplayCanvas();
@@ -802,11 +802,18 @@ export class nrrd_tools {
       contrastModifyNum = move % this.displaySlices.length;
       this.nrrd_states.contrastNum += contrastModifyNum;
       if (move > 0) {
-        sliceModifyNum = Math.floor(move / this.displaySlices.length);
+        if (
+          this.mainPreSlice.index / this.nrrd_states.RSARatio <
+          this.nrrd_states.maxIndex
+        ) {
+          sliceModifyNum = Math.floor(move / this.displaySlices.length);
 
-        if (this.nrrd_states.contrastNum > this.displaySlices.length - 1) {
-          sliceModifyNum += 1;
-          this.nrrd_states.contrastNum -= this.displaySlices.length;
+          if (this.nrrd_states.contrastNum > this.displaySlices.length - 1) {
+            sliceModifyNum += 1;
+            this.nrrd_states.contrastNum -= this.displaySlices.length;
+          }
+        } else {
+          sliceModifyNum = 0;
         }
       } else {
         sliceModifyNum = Math.ceil(move / this.displaySlices.length);

src/Utils/nrrd_tool.ts

@@ -33,10 +33,10 @@ import {
 
 import "./css/style.css";
 
-export const REVISION = "v1.12.19";
+export const REVISION = "v1.12.20";
 
 console.log(
-  "%cCopper3D Visualisation %cBeta:v1.12.19",
+  "%cCopper3D Visualisation %cBeta:v1.12.20",
   "padding: 3px;color:white; background:#023047",
   "padding: 3px;color:white; background:#f50a25"
 );