Merge pull request #139 from LinkunGao/release/v1.12.15

Release/v1.12.15

Author: LinkunGao

docs/source/conf.py

@@ -22,7 +22,7 @@
 author = 'LinkunGao'
 
 # The full version, including alpha/beta/rc tags
-release = 'v1.12.14'
+release = 'v1.12.15'
 
 
 # -- General configuration ---------------------------------------------------

docs/source/release/release.md

@@ -1116,5 +1116,10 @@ const resetMainAreaSize = (factor: number) => {
 ## Release v1.12.14
 
 - remove arrow key function in nrrd tools.
-- add using cursor function to selete the point position on NRRD slice via corsshair.
+- add using cursor function to selete the point position on NRRD slice via crosshair.
   - press `s` on keyboard to use this function.
+
+## Release v1.12.15
+
+- Add basic logic for crosshair system.
+  - Now when using crosshair system mode, when user click the cursor on nrrd slice and use the switch orientation function, the next position's slice index will base the click point.

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

package.json

@@ -67,6 +67,7 @@ export class nrrd_tools {
     currentIndex: 0,
     maxIndex: 0,
     minIndex: 0,
+    z_Index: 0,
     RSARatio: 0,
     latestNotEmptyImg: new Image(),
     contrastNum: 0,
@@ -206,16 +207,30 @@ export class nrrd_tools {
    * @param {string} aixs:"x" | "y" | "z"
    *  */
   setSliceOrientation(axis: "x" | "y" | "z") {
+    if (this.nrrd_states.enableCursorChoose) {
+      if (this.axis === "z") {
+        this.nrrd_states.z_Index = this.nrrd_states.currentIndex;
+      }
+
+      if (axis === "z") {
+        this.nrrd_states.oldIndex = this.nrrd_states.currentIndex =
+          this.nrrd_states.z_Index;
+      } else if (axis === "x") {
+        this.nrrd_states.oldIndex = this.nrrd_states.currentIndex = Math.ceil(
+          this.nrrd_states.cursorPageX
+        );
+      } else if (axis === "y") {
+        this.nrrd_states.oldIndex = this.nrrd_states.currentIndex = Math.ceil(
+          this.nrrd_states.cursorPageY
+        );
+      }
+    }
+
     this.axis = axis;
     this.resetDisplaySlicesStatus();
   }
 
   addSkip(index: number) {
-    // const result = this.backUpDisplaySlices.includes(index);
-    // if (result) {
-    //   this.displaySlices.splice(index, 0, result);
-    //   this.nrrd_states.contrastNum = index;
-    // }
     this.skipSlicesDic[index] = this.backUpDisplaySlices[index];
     if (index >= this.displaySlices.length) {
       this.nrrd_states.contrastNum = this.displaySlices.length;

src/Utils/nrrd_tool.ts

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