Merge pull request #141 from LinkunGao/release/v1.12.17

Release/v1.12.17

Author: LinkunGao

docs/source/release/release.md

@@ -1128,3 +1128,27 @@ const resetMainAreaSize = (factor: number) => {
 
 - fixed the crosshair system bug.
 - add `getCurrentSlicesNumAndContrastNum()`, it will return current index number and contrast index number.
+
+## Release v1.12.17
+
+- solved the crosshair Inaccuracy issue.
+
+  - Notice: the real cursor x is releted slice's RASDimension, but in copper3d system the slice index is releted to slice's dimension. So we need to do some convert things!
+  - z -> x:
+    slice_z cursor x is slice_x's index, so we need to convert cursor x to slice's dimension format.
+    slice_z's index is slice_x cursor x, so we need to convert the dimention to RASDimention.
+  - z -> y:
+    slice_z's cursor y is slice_y's index
+    slice_z's index is slice_y's cursor y
+  - x -> z:
+    slice_x's cursor x is slice_z's index
+    slice_x's index is slice_z's cursor x
+  - x -> y:
+    slice_x's cursor y is slice_y's index
+    slice_x's index is slice_y's cursor x
+  - y -> z:
+    slice_y's cursor y is slice_z's index
+    slice_y's index is slice_z's cursor y
+  - y -> x:
+    slice_y's cursor x is slice_x's index
+    slice_y's index is slice_x's cursor y

docs/source/tutorial/15_drawContrastInMainArea.md

@@ -616,9 +616,6 @@ const resetLoadState = () => {
 };
 
 const loaded = (uploadFile: UploadFile) => {
-  //   console.log(uploadFile);
-  //   console.log(uploadFile.name);
-  //   console.log(uploadFile.raw);
   if (loadedFiles) {
     loadedFiles = false;
     resetLoadState();
@@ -639,7 +636,6 @@ const removeLoadFile = (uploadFile: UploadFile) => {
   files = files.filter((file) => {
     return file.name !== uploadFile.name;
   });
-  console.log(files);
 };
 
 /**

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

package.json

@@ -246,10 +246,12 @@ export class nrrd_tools {
           if (this.axis === "x") {
             this.nrrd_states.oldIndex = this.nrrd_states.currentIndex =
               Math.ceil(
-                (this.cursorPage.x.cursorPageX /
-                  this.mainPreSlice.volume.RASDimensions[0]) *
-                  this.mainPreSlice.volume.dimensions[0]
+                (1 -
+                  this.cursorPage.x.cursorPageX /
+                    this.mainPreSlice.volume.dimensions[2]) *
+                  this.mainPreSlice.volume.RASDimensions[2]
               );
+
             this.nrrd_states.cursorPageX = Math.ceil(
               (this.cursorPage.x.index /
                 this.mainPreSlice.volume.dimensions[0]) *
@@ -258,7 +260,12 @@ export class nrrd_tools {
           }
           if (this.axis === "y") {
             this.nrrd_states.oldIndex = this.nrrd_states.currentIndex =
-              Math.ceil(this.cursorPage.y.cursorPageY);
+              Math.ceil(
+                (1 -
+                  this.cursorPage.y.cursorPageY /
+                    this.mainPreSlice.volume.dimensions[2]) *
+                  this.mainPreSlice.volume.RASDimensions[2]
+              );
             this.nrrd_states.cursorPageY = Math.ceil(
               (1 -
                 this.cursorPage.y.index /
@@ -283,8 +290,9 @@ export class nrrd_tools {
                   this.mainPreSlice.volume.dimensions[0]
               );
             this.nrrd_states.cursorPageX = Math.ceil(
-              (this.cursorPage.z.index /
-                this.mainPreSlice.volume.dimensions[2]) *
+              (1 -
+                this.cursorPage.z.index /
+                  this.mainPreSlice.volume.dimensions[2]) *
                 this.mainPreSlice.volume.RASDimensions[2]
             );
           }
@@ -341,9 +349,7 @@ export class nrrd_tools {
                 this.mainPreSlice.volume.RASDimensions[0]
             );
             this.nrrd_states.cursorPageY = Math.ceil(
-              (this.cursorPage.x.cursorPageY /
-                this.mainPreSlice.volume.RASDimensions[0]) *
-                this.mainPreSlice.volume.RASDimensions[2]
+              this.cursorPage.x.cursorPageX
             );
           }
           this.cursorPage.y.updated = true;

src/Utils/nrrd_tool.ts

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