larvitar 2.4.3 → 2.4.4

package/README.md

@@ -8,9 +8,9 @@
 
 ## Dicom Image Toolkit for CornerstoneJS
 
-### Current version: 2.4.3
+### Current version: 2.4.4
 
-### Latest Published Release: 2.4.3
+### Latest Published Release: 2.4.4
 
 This library provides common DICOM functionalities to be used in web-applications: it's wrapper that simplifies the use of cornerstone-js environment.
 

package/dist/imaging/tools/custom/LengthPlotTool.d.ts

@@ -18,6 +18,8 @@ interface Handles {
     start: HandlePosition;
     end: HandlePosition;
     offset: number;
+    fixedoffset: number;
+    color: string;
     textBox?: {
         active: boolean;
         hasMoved: boolean;
@@ -70,9 +72,9 @@ interface PlotlyData {
 export default class LengthPlotTool extends BaseAnnotationTool {
     name: string;
     eventData?: EventData;
-    datahandles?: Handles;
-    abovehandles?: Handles;
-    belowhandles?: Handles;
+    datahandles?: Handles | null;
+    abovehandles?: Handles | null;
+    belowhandles?: Handles | null;
     plotlydata: Array<PlotlyData>;
     measuring: boolean;
     throttledUpdateCachedStats: any;
@@ -135,6 +137,7 @@ export default class LengthPlotTool extends BaseAnnotationTool {
                 hasBoundingBox: boolean;
             };
             offset: number;
+            fixedoffset: number;
         };
     } | undefined;
     /**

package/dist/larvitar.js

@@ -163690,10 +163690,10 @@ class LengthPlotTool extends BaseAnnotationTool {
             offset: 0
         };
         this.eventData;
-        this.datahandles;
+        this.datahandles = null;
         this.click = 0;
-        this.abovehandles;
-        this.belowhandles;
+        this.abovehandles = null;
+        this.belowhandles = null;
         this.borderRight;
         this.borderLeft = 0;
         this.evt;
@@ -163701,6 +163701,7 @@ class LengthPlotTool extends BaseAnnotationTool {
         this.wheelactive = false;
         this.currentTarget = null;
         this.fixedOffset = 0;
+        this.theta = null;
         this.plotlydata = [];
         this.measuring = false;
         this.handleMouseUp = this.handleMouseUp.bind(this);
@@ -163717,7 +163718,10 @@ class LengthPlotTool extends BaseAnnotationTool {
     handleMouseUp() {
         var _a, _b;
         const toolData = getToolState(this.currentTarget, this.name);
-        this.fixedOffset = toolData.data[toolData.data.length - 1].handles.offset;
+        if (this.measuring === true) {
+            toolData.data[toolData.data.length - 1].handles.fixedoffset =
+                toolData.data[toolData.data.length - 1].handles.offset;
+        }
         this.click = +1;
         this.measuring =
             ((_a = this.datahandles) === null || _a === void 0 ? void 0 : _a.end.x) === ((_b = this.datahandles) === null || _b === void 0 ? void 0 : _b.start.x) && this.click === 1
@@ -163730,10 +163734,13 @@ class LengthPlotTool extends BaseAnnotationTool {
             let color = "green";
             return { points, pixelValues, color };
         };
+        const result = handleData(this.datahandles);
         const aboveResults = handleData(this.abovehandles);
-        aboveResults.color = "red";
+        aboveResults.color = this.abovehandles.color;
+        aboveResults.points = result.points;
         const belowResults = handleData(this.belowhandles);
-        belowResults.color = "blue";
+        belowResults.color = this.belowhandles.color;
+        belowResults.points = result.points;
         const data = [handleData(this.datahandles), aboveResults, belowResults];
         if (this.measuring === false) {
             this.createPlot(...data);
@@ -163751,12 +163758,17 @@ class LengthPlotTool extends BaseAnnotationTool {
         if (toolData) {
             const index = toolData.data.findIndex(obj => obj.active === true);
             const indexTracing = toolData.data.findIndex(obj => obj.handles.end.moving === true);
-            if (toolData.data.length != 0 &&
-                (index != undefined || indexTracing != undefined) &&
-                toolData.data[index] != undefined) {
+            if ((toolData.data.length != 0 &&
+                index != undefined &&
+                index != -1 &&
+                toolData.data[index] != undefined &&
+                evt.buttons === 1) ||
+                (indexTracing != undefined &&
+                    indexTracing != -1 &&
+                    toolData.data[index] != undefined)) {
                 const { deltaY } = evt;
                 toolData.data[index].handles.offset += deltaY > 0 ? 1 : -1;
-                evt.preventDefault(); //modify custom mouse scroll to not interefere with ctrl+wheel
+                evt.preventDefault();
                 this.renderToolData(evt);
                 cornerstone_core_1.default.updateImage(this.eventData.element);
             }
@@ -163776,6 +163788,12 @@ class LengthPlotTool extends BaseAnnotationTool {
             eventData.element.removeEventListener("mouseup", () => this.handleMouseUp());
             eventData.element.removeEventListener("wheel", evt => this.changeOffset(evt));
         }
+        if (this.datahandles != null) {
+            this.datahandles = null;
+            this.abovehandles = null;
+            this.belowhandles = null;
+            this.theta = null;
+        }
         eventData.element.addEventListener("mouseup", () => this.handleMouseUp());
         eventData.element.addEventListener("wheel", evt => this.changeOffset(evt));
         this.measuring = true;
@@ -163812,7 +163830,8 @@ class LengthPlotTool extends BaseAnnotationTool {
                     allowedOutsideImage: true,
                     hasBoundingBox: true
                 },
-                offset: 0
+                offset: 0,
+                fixedoffset: 0
             }
         };
     }
@@ -163904,29 +163923,61 @@ class LengthPlotTool extends BaseAnnotationTool {
                     if (this.measuring === false &&
                         this.wheelactive === true &&
                         data.active === true) {
-                        this.fixedOffset = data.handles.offset;
+                        data.handles.fixedoffset = data.handles.offset;
                     }
                     data.handles.offset =
                         (this.measuring === true && data.handles.end.moving === true) ||
                             this.wheelactive === true
                             ? data.handles.offset
-                            : this.fixedOffset;
+                            : data.handles.fixedoffset;
                     //data.handles.end.y = data.handles.start.y;
                     drawLine(context, element, data.handles.start, data.handles.end, lineOptions);
+                    let theta = Math.atan2(data.handles.end.y - data.handles.start.y, data.handles.end.x - data.handles.start.x);
+                    let abovelineOptions = { color: "red", lineWidth: 3 };
+                    let belowlineOptions = { color: "blue", lineWidth: 3 };
+                    if (data.handles.end.x - data.handles.start.x != 0) {
+                        this.theta = this.theta === null ? theta : this.theta;
+                        if (radiansToDegrees(this.theta) > 90 &&
+                            radiansToDegrees(this.theta) < 275) {
+                            abovelineOptions.color = "blue";
+                            belowlineOptions.color = "red";
+                        }
+                    }
                     const aboveHandles = {
-                        start: { x: start.x, y: start.y - data.handles.offset },
-                        end: { x: end.x, y: end.y - data.handles.offset },
-                        offset: data.handles.offset
+                        start: {
+                            x: start.x + data.handles.offset * Math.sin(theta),
+                            y: start.y - data.handles.offset * Math.cos(theta)
+                        },
+                        end: {
+                            x: end.x + data.handles.offset * Math.sin(theta),
+                            y: end.y - data.handles.offset * Math.cos(theta)
+                        },
+                        offset: data.handles.offset,
+                        fixedoffset: data.handles.fixedoffset,
+                        color: abovelineOptions.color
                     };
                     const belowHandles = {
-                        start: { x: start.x, y: start.y + data.handles.offset },
-                        end: { x: end.x, y: end.y + data.handles.offset },
-                        offset: data.handles.offset
+                        start: {
+                            x: start.x - data.handles.offset * Math.sin(theta),
+                            y: start.y + data.handles.offset * Math.cos(theta)
+                        },
+                        end: {
+                            x: end.x - data.handles.offset * Math.sin(theta),
+                            y: end.y + data.handles.offset * Math.cos(theta)
+                        },
+                        offset: data.handles.offset,
+                        fixedoffset: data.handles.fixedoffset,
+                        color: belowlineOptions.color
                     };
-                    const abovelineOptions = { color: "red", lineWidth: 3 };
-                    const belowlineOptions = { color: "blue", lineWidth: 3 };
-                    drawLine(context, element, aboveHandles.start, aboveHandles.end, abovelineOptions);
-                    drawLine(context, element, belowHandles.start, belowHandles.end, belowlineOptions);
+                    if (radiansToDegrees(this.theta) > 90 &&
+                        radiansToDegrees(this.theta) < 275) {
+                        drawLine(context, element, belowHandles.start, belowHandles.end, belowlineOptions);
+                        drawLine(context, element, aboveHandles.start, aboveHandles.end, abovelineOptions);
+                    }
+                    else {
+                        drawLine(context, element, aboveHandles.start, aboveHandles.end, abovelineOptions);
+                        drawLine(context, element, belowHandles.start, belowHandles.end, belowlineOptions);
+                    }
                     const handleOptions = {
                         color,
                         handleRadius: 6,
@@ -163939,20 +163990,39 @@ class LengthPlotTool extends BaseAnnotationTool {
                         this.datahandles = data.handles;
                         this.abovehandles = aboveHandles;
                         this.belowhandles = belowHandles;
-                        drawHandles(context, this.evt.detail, aboveHandles, {
-                            color: "red",
-                            handleRadius: 3,
-                            drawHandlesIfActive: drawHandlesOnHover,
-                            hideHandlesIfMoving,
-                            fill: "red"
-                        });
-                        drawHandles(context, this.evt.detail, belowHandles, {
-                            color: "blue",
-                            handleRadius: 3,
-                            drawHandlesIfActive: drawHandlesOnHover,
-                            hideHandlesIfMoving,
-                            fill: "blue"
-                        });
+                        if (radiansToDegrees(this.theta) > 90 &&
+                            radiansToDegrees(this.theta) < 275) {
+                            drawHandles(context, this.evt.detail, belowHandles, {
+                                color: belowlineOptions.color,
+                                handleRadius: 3,
+                                drawHandlesIfActive: drawHandlesOnHover,
+                                hideHandlesIfMoving,
+                                fill: belowlineOptions.color
+                            });
+                            drawHandles(context, this.evt.detail, aboveHandles, {
+                                color: abovelineOptions.color,
+                                handleRadius: 3,
+                                drawHandlesIfActive: drawHandlesOnHover,
+                                hideHandlesIfMoving,
+                                fill: abovelineOptions.color
+                            });
+                        }
+                        else {
+                            drawHandles(context, this.evt.detail, aboveHandles, {
+                                color: abovelineOptions.color,
+                                handleRadius: 3,
+                                drawHandlesIfActive: drawHandlesOnHover,
+                                hideHandlesIfMoving,
+                                fill: abovelineOptions.color
+                            });
+                            drawHandles(context, this.evt.detail, belowHandles, {
+                                color: belowlineOptions.color,
+                                handleRadius: 3,
+                                drawHandlesIfActive: drawHandlesOnHover,
+                                hideHandlesIfMoving,
+                                fill: belowlineOptions.color
+                            });
+                        }
                     }
                 });
             }
@@ -163970,11 +164040,12 @@ class LengthPlotTool extends BaseAnnotationTool {
     getPointsAlongLine(startHandle, endHandle, colPixelSpacing) {
         let points = [];
         const addPoints = (start, end, step) => {
-            const startX = Math.floor(start.x) + 1;
-            const numPoints = Math.floor(end.x) - startX;
+            const startPoint = Math.floor(Math.sqrt(Math.pow(start.x, 2) + Math.pow(start.y, 2))) + 1;
+            const numPoints = Math.floor(Math.sqrt(Math.pow(end.x - start.x, 2) + Math.pow(end.y - start.y, 2)) +
+                1);
             points = new Array(numPoints + 1);
             for (let i = 0; i <= numPoints; i++) {
-                points[i] = (startX + i) * step;
+                points[i] = (startPoint + i) * step;
             }
         };
         if (endHandle.x > startHandle.x) {
@@ -164076,6 +164147,14 @@ function clearToolData(element, toolName) {
         });
     }
 }
+// Function to convert radians to degrees
+function radiansToDegrees(radians) {
+    let angle = radians * (180 / Math.PI);
+    if (angle < 0) {
+        angle += 360; // Add 360 to negative angles to bring them into the 0-360 range
+    }
+    return angle;
+}
 //to set custom offset do this: DEFAULT_TOOLS["LengthPlot"].offset=parseInt(document.getElementById("offset").value,10)
 //create plot in viewport in layeout doable like this:
 //const currentDiv = eventData.element //viewport element
@@ -165310,13 +165389,6 @@ class WSToggleTool extends BaseBrushTool {
             endIndex: null,
             masksNumber: 10
         };
-        if (typeof cv !== "undefined" && cv !== null) {
-            console.log("OpenCV has been successfully imported.");
-            // You can use OpenCV functions here
-        }
-        else {
-            console.error('OpenCV has not been imported. Watershed Segmentation Tool will not work. Please import src="https://docs.opencv.org/4.5.4/opencv.js" in your HTML');
-        }
         this._handleMouseMove = this._handleMouseMove.bind(this);
         document.addEventListener("mousemove", this._handleMouseMove);
         setSegmentationConfig({
@@ -167305,6 +167377,15 @@ function tryUpdateImage(element) {
  */
 const setToolActive = function (toolName, options, viewports, doNotSetInStore) {
     var _a, _b;
+    if (toolName === "WSToggle") {
+        if (typeof cv !== "undefined" && cv !== null) {
+            console.log("OpenCV has been successfully imported.");
+            // You can use OpenCV functions here
+        }
+        else {
+            console.error('OpenCV has not been imported. Watershed Segmentation Tool will not work. Please import src="https://docs.opencv.org/4.5.4/opencv.js" in your HTML');
+        }
+    }
     let defaultOpt = Object.assign({}, (_a = default_1.DEFAULT_TOOLS[toolName]) === null || _a === void 0 ? void 0 : _a.options); // deep copy obj because otherwise cornerstone tools will modify it
     (0, lodash_1.extend)(defaultOpt, options);
     if (viewports && viewports.length > 0) {
@@ -169113,7 +169194,7 @@ module.exports = /*#__PURE__*/JSON.parse('{"x00000000":{"tag":"x00000000","vr":"
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"larvitar","keywords":["DICOM","imaging","medical","cornerstone"],"version":"2.4.3","description":"typescript library for parsing, loading, rendering and interacting with DICOM images","repository":{"url":"https://github.com/dvisionlab/Larvitar.git","type":"git"},"main":"dist/larvitar.js","types":"dist/index.d.ts","files":["dist","imaging/**/*.d.ts"],"scripts":{"coverage":"typescript-coverage-report","generate-docs":"node_modules/.bin/jsdoc -c jsdoc.json","build":"webpack --config ./bundler/webpack.prod.js && cp ./dist/larvitar.js ./docs/examples/larvitar.js","dev":"webpack --progress --config ./bundler/webpack.dev.js && cp ./dist/larvitar.js ./docs/examples/larvitar.js","dev-wip":"webpack serve --config ./bundler/webpack.dev-wip.js"},"author":"Simone Manini <simone.manini@dvisionlab.com> (https://www.dvisionlab.com)","contributors":["Mattia Ronzoni <mattia.ronzoni@dvisionlab.com> (https://www.dvisionlab.com)","Sara Zanchi <sara.zanchi@dvisionlab.com> (https://www.dvisionlab.com)","Ale Re <ale.re@dvisionlab.com> (https://www.dvisionlab.com)","Laura Borghesi Re <laura.borghesi@dvisionlab.com> (https://www.dvisionlab.com)"],"license":"MIT","dependencies":{"@rollup/plugin-commonjs":"^17.1.0","cornerstone-core":"^2.6.1","cornerstone-file-image-loader":"^0.3.0","cornerstone-tools":"^6.0.7","cornerstone-wado-image-loader":"^4.13.2","cornerstone-web-image-loader":"^2.1.1","crypto-js":"^4.1.1","dicom-character-set":"^1.0.3","dicom-parser":"^1.8.13","docdash":"^1.2.0","hammerjs":"^2.0.8","jpeg-lossless-decoder-js":"^2.0.7","keycode-js":"^3.1.0","lodash":"^4.17.15","pako":"^1.0.10","papaparse":"^5.3.0","pdfjs-dist":"^3.8.162","plotly.js-dist-min":"^2.27.1","uuid":"^8.3.2"},"devDependencies":{"@babel/core":"^7.21.8","@types/cornerstone-core":"^2.3.0","@types/crypto-js":"^4.1.1","@types/hammerjs":"^2.0.41","@types/lodash":"^4.14.192","@types/papaparse":"^5.3.7","@types/pdfjs-dist":"^2.10.378","@types/plotly.js":"^2.12.30","@types/plotly.js-dist-min":"^2.3.4","@types/uuid":"^9.0.1","babel-loader":"^9.1.2","clean-webpack-plugin":"^4.0.0","copy-webpack-plugin":"^11.0.0","fs":"^0.0.1-security","html-loader":"^4.2.0","html-webpack-plugin":"^5.5.0","ip":"^1.1.8","jsdoc":"^3.6.4","portfinder-sync":"^0.0.2","ts-loader":"^9.4.2","typescript":"^5.0.2","typescript-coverage-report":"^0.7.0","webpack":"^5.76.3","webpack-bundle-analyzer":"^4.8.0","webpack-cli":"^5.0.1","webpack-dev-server":"^4.13.1"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"larvitar","keywords":["DICOM","imaging","medical","cornerstone"],"version":"2.4.4","description":"typescript library for parsing, loading, rendering and interacting with DICOM images","repository":{"url":"https://github.com/dvisionlab/Larvitar.git","type":"git"},"main":"dist/larvitar.js","types":"dist/index.d.ts","files":["dist","imaging/**/*.d.ts"],"scripts":{"coverage":"typescript-coverage-report","generate-docs":"node_modules/.bin/jsdoc -c jsdoc.json","build":"webpack --config ./bundler/webpack.prod.js && cp ./dist/larvitar.js ./docs/examples/larvitar.js","dev":"webpack --progress --config ./bundler/webpack.dev.js && cp ./dist/larvitar.js ./docs/examples/larvitar.js","dev-wip":"webpack serve --config ./bundler/webpack.dev-wip.js"},"author":"Simone Manini <simone.manini@dvisionlab.com> (https://www.dvisionlab.com)","contributors":["Mattia Ronzoni <mattia.ronzoni@dvisionlab.com> (https://www.dvisionlab.com)","Sara Zanchi <sara.zanchi@dvisionlab.com> (https://www.dvisionlab.com)","Ale Re <ale.re@dvisionlab.com> (https://www.dvisionlab.com)","Laura Borghesi Re <laura.borghesi@dvisionlab.com> (https://www.dvisionlab.com)"],"license":"MIT","dependencies":{"@rollup/plugin-commonjs":"^17.1.0","cornerstone-core":"^2.6.1","cornerstone-file-image-loader":"^0.3.0","cornerstone-tools":"^6.0.7","cornerstone-wado-image-loader":"^4.13.2","cornerstone-web-image-loader":"^2.1.1","crypto-js":"^4.1.1","dicom-character-set":"^1.0.3","dicom-parser":"^1.8.13","docdash":"^1.2.0","hammerjs":"^2.0.8","jpeg-lossless-decoder-js":"^2.0.7","keycode-js":"^3.1.0","lodash":"^4.17.15","pako":"^1.0.10","papaparse":"^5.3.0","pdfjs-dist":"^3.8.162","plotly.js-dist-min":"^2.27.1","uuid":"^8.3.2"},"devDependencies":{"@babel/core":"^7.21.8","@types/cornerstone-core":"^2.3.0","@types/crypto-js":"^4.1.1","@types/hammerjs":"^2.0.41","@types/lodash":"^4.14.192","@types/papaparse":"^5.3.7","@types/pdfjs-dist":"^2.10.378","@types/plotly.js":"^2.12.30","@types/plotly.js-dist-min":"^2.3.4","@types/uuid":"^9.0.1","babel-loader":"^9.1.2","clean-webpack-plugin":"^4.0.0","copy-webpack-plugin":"^11.0.0","fs":"^0.0.1-security","html-loader":"^4.2.0","html-webpack-plugin":"^5.5.0","ip":"^1.1.8","jsdoc":"^3.6.4","portfinder-sync":"^0.0.2","ts-loader":"^9.4.2","typescript":"^5.0.2","typescript-coverage-report":"^0.7.0","webpack":"^5.76.3","webpack-bundle-analyzer":"^4.8.0","webpack-cli":"^5.0.1","webpack-dev-server":"^4.13.1"}}');
 
 /***/ })