copper3d 2.0.9 → 2.1.1

package/dist/types/Utils/segmentation/DrawToolCore.d.ts

@@ -15,6 +15,10 @@ export declare class DrawToolCore extends CommToolsData {
     setPencilIconUrls(urls: string[]): void;
     private setCurrentLayer;
     draw(opts?: IDrawOpts): void;
+    drawCalSphereDown(x: number, y: number, sliceIndex: number, cal_position: "tumour" | "skin" | "nipple" | "ribcage"): void;
+    drawCalSphereUp(): void;
+    private zoomActionAfterDrawSphere;
+    private clearSpherePrintStoreImages;
     private paintOnCanvas;
     /*************************************May consider to move outside *******************************************/
     private drawLine;
@@ -25,13 +29,26 @@ export declare class DrawToolCore extends CommToolsData {
     private configMouseZoomWheel;
     private enableCrosshair;
     drawImageOnEmptyImage(canvas: HTMLCanvasElement): void;
+    /****************************Sphere calculate distance functions****************************************************/
+    private getSpherePosition;
+    drawCalculatorSphereOnEachViews(axis: "x" | "y" | "z"): void;
     /****************************Sphere functions****************************************************/
     private storeSphereImages;
     private drawSphereOnEachViews;
+    /**
+     *
+     * @param ctx draw sphere canvas ctx
+     * @param x width must be match the origin size, size factor 1, ignore the size factor
+     * @param y height must be match the origin size, size factor 1, ignore the size factor
+     * @param radius radius must be match the origin size, size factor 1, ignore the size factor
+     * @param color sphere color
+     */
     private drawSphereCore;
     private setSphereCanvasSize;
     private configMouseSphereWheel;
+    drawCalculatorSphere(radius: number): void;
     drawSphere(mouseX: number, mouseY: number, radius: number): void;
+    private clearSphereCanvas;
     /**
     * We generate the MRI slice from threejs based on mm, but when we display it is based on pixel size/distance.
     * So, the index munber on each axis (sagittal, axial, coronal) is the slice's depth in mm distance. And the width and height displayed on screen is the slice's width and height in pixel distance.

package/dist/types/Utils/segmentation/NrrdTools.d.ts

@@ -1,6 +1,6 @@
 import { nrrdSliceType, storeExportPaintImageType, loadingBarType } from "../../types/types";
 import { GUI } from "dat.gui";
-import { IStoredPaintImages, IMaskData, IDragOpts, IGuiParameterSettings } from "./coreTools/coreType";
+import { IPaintImages, IStoredPaintImages, IMaskData, IDragOpts, IGuiParameterSettings } from "./coreTools/coreType";
 import { DragOperator } from "./DragOperator";
 import { DrawToolCore } from "./DrawToolCore";
 export declare class NrrdTools extends DrawToolCore {
@@ -61,13 +61,14 @@ export declare class NrrdTools extends DrawToolCore {
     getVoxelSpacing(): number[];
     getSpaceOrigin(): number[];
     getMaskData(): IMaskData;
+    setCalculateDistanceSphere(x: number, y: number, sliceIndex: number, cal_position: "tumour" | "skin" | "nipple" | "ribcage"): void;
     private getSharedPlace;
     /**
      * init all painted images for store images
      * @param dimensions
      */
     private initPaintImages;
-    private createEmptyPaintImage;
+    createEmptyPaintImage(dimensions: Array<number>, paintImages: IPaintImages): void;
     /**
      * Switch all contrast slices' orientation
      * @param {string} aixs:"x" | "y" | "z"

package/dist/types/Utils/segmentation/coreTools/coreType.d.ts

@@ -124,7 +124,9 @@ interface IGUIStates {
     brushAndEraserSize: number;
     cursor: string;
     label: string;
+    cal_distance: "tumour" | "skin" | "nipple" | "ribcage";
     sphere: boolean;
+    calculator: boolean;
     readyToUpdate: boolean;
     defaultPaintCursor: string;
     max_sensitive: number;
@@ -163,6 +165,14 @@ interface INrrdStates {
     cursorPageX: number;
     cursorPageY: number;
     sphereOrigin: ICommXYZ;
+    tumourSphereOrigin: ICommXYZ | null;
+    skinSphereOrigin: ICommXYZ | null;
+    ribSphereOrigin: ICommXYZ | null;
+    nippleSphereOrigin: ICommXYZ | null;
+    tumourColor: "#00ff00";
+    skinColor: "#FFEB3B";
+    ribcageColor: "#2196F3";
+    nippleColor: "#E91E63";
     spherePlanB: boolean;
     sphereRadius: number;
     Mouse_Over_x: number;
@@ -177,6 +187,7 @@ interface INrrdStates {
     labels: ["label1", "label2", "label3"];
     getMask: (mask: ImageData, sliceId: number, label: string, width: number, height: number, clearAllFlag: boolean) => void;
     getSphere: (sphereOrigin: number[], sphereRadius: number) => void;
+    getCalculateSpherePositions: (tumourSphereOrigin: ICommXYZ | null, skinSphereOrigin: ICommXYZ | null, ribSphereOrigin: ICommXYZ | null, nippleSphereOrigin: ICommXYZ | null, aixs: "x" | "y" | "z") => void;
     drawStartPos: ICommXY;
 }
 interface IDragOpts {
@@ -186,6 +197,7 @@ interface IDragOpts {
 interface IDrawOpts {
     getMaskData?: (mask: ImageData, sliceId: number, label: string, width: number, height: number, clearAllFlag?: boolean) => void;
     getSphereData?: (sphereOrigin: number[], sphereRadius: number) => void;
+    getCalculateSpherePositionsData?: (tumourSphereOrigin: ICommXYZ | null, skinSphereOrigin: ICommXYZ | null, ribSphereOrigin: ICommXYZ | null, nippleSphereOrigin: ICommXYZ | null, aixs: "x" | "y" | "z") => void;
 }
 type UndoLayerType = {
     label1: Array<HTMLImageElement>;
@@ -242,6 +254,14 @@ interface IGuiParameterSettings {
         name: "Eraser";
         onChange: () => void;
     };
+    calculator: {
+        name: "Calculator";
+        onChange: () => void;
+    };
+    cal_distance: {
+        name: "CalculatorDistance";
+        onChange: (val: "tumour" | "skin" | "ribcage" | "nipple") => void;
+    };
     clear: {
         name: "Clear";
     };

package/dist/types/index.d.ts

@@ -17,8 +17,8 @@ import { Copper3dTrackballControls } from "./Controls/Copper3dTrackballControls"
 import { MeshNodeTool } from "./Utils/MeshNodeTool";
 import { removeGuiFolderChilden } from "./Utils/segmentation/coreTools/gui";
 import { nrrdMeshesType, nrrdSliceType, SensorDecodedValue_kiwrious, SensorReadResult_kiwrious, HeartRateResult_kiwrious, loadingBarType, exportPaintImageType, IOptVTKLoader } from "./types/types";
-import { IPaintImage } from "./Utils/segmentation/coreTools/coreType";
+import { IPaintImage, ICommXYZ } from "./Utils/segmentation/coreTools/coreType";
 import "./css/style.css";
-export declare const REVISION = "v2.0.9";
+export declare const REVISION = "v2.1.1";
 export { copperRenderer, copperRendererOnDemond, copperMSceneRenderer, setHDRFilePath, addLabelToScene, convert3DPostoScreenPos, convertScreenPosto3DPos, addBoxHelper, fullScreenListenner, configKiwriousHeart, copperScene, copperSceneOnDemond, copperMScene, CameraViewPoint, kiwrious, NrrdTools, loading, Copper3dTrackballControls, createTexture2D_NRRD, MeshNodeTool, throttle, removeGuiFolderChilden, };
-export type { positionType, screenPosType, optsType, nrrdMeshesType, nrrdSliceType, SensorDecodedValue_kiwrious, SensorReadResult_kiwrious, HeartRateResult_kiwrious, loadingBarType, IPaintImage, exportPaintImageType, IOptVTKLoader, };
+export type { positionType, screenPosType, optsType, nrrdMeshesType, nrrdSliceType, SensorDecodedValue_kiwrious, SensorReadResult_kiwrious, HeartRateResult_kiwrious, loadingBarType, IPaintImage, exportPaintImageType, IOptVTKLoader, ICommXYZ };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "copper3d",
   "description": "A 3d visualisation package base on threejs provides multiple scenes and Nrrd image load funtion.",
-  "version": "2.0.9",
+  "version": "2.1.1",
   "main": "dist/bundle.umd.js",
   "moudle": "dist/bundle.esm.js",
   "types": "dist/types/index.d.ts",