From a5895373b11c17248e9f8e867f7c74bb37c00b79 Mon Sep 17 00:00:00 2001 From: justin Date: Tue, 7 Nov 2023 12:35:35 -0500 Subject: [PATCH 1/4] Annotate across all series --- packages/tools/src/drawingSvg/drawRect.ts | 7 +++++- .../src/tools/annotation/RectangleROITool.ts | 23 +++++++++++++++---- .../planar/filterAnnotationsForDisplay.ts | 2 ++ 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/packages/tools/src/drawingSvg/drawRect.ts b/packages/tools/src/drawingSvg/drawRect.ts index b403b46546..04d5bb4cb7 100644 --- a/packages/tools/src/drawingSvg/drawRect.ts +++ b/packages/tools/src/drawingSvg/drawRect.ts @@ -20,12 +20,16 @@ export default function drawRect( width: _width, lineWidth, lineDash, + fill, + 'fill-opacity': fillOpacity, } = Object.assign( { color: 'dodgerblue', width: '2', lineWidth: undefined, lineDash: undefined, + fill: 'black', + 'fill-opacity': '50%', }, options ); @@ -47,7 +51,8 @@ export default function drawRect( width: `${width}`, height: `${height}`, stroke: color, - fill: 'transparent', + fill: fill, + 'fill-opacity': fillOpacity, 'stroke-width': strokeWidth, 'stroke-dasharray': lineDash, }; diff --git a/packages/tools/src/tools/annotation/RectangleROITool.ts b/packages/tools/src/tools/annotation/RectangleROITool.ts index a3479abb50..517dd82fb6 100644 --- a/packages/tools/src/tools/annotation/RectangleROITool.ts +++ b/packages/tools/src/tools/annotation/RectangleROITool.ts @@ -166,6 +166,7 @@ class RectangleROITool extends AnnotationTool { ); const FrameOfReferenceUID = viewport.getFrameOfReferenceUID(); + console.log('frameofreferenceuid', FrameOfReferenceUID); const annotation = { invalidated: true, @@ -175,7 +176,7 @@ class RectangleROITool extends AnnotationTool { viewPlaneNormal: [...viewPlaneNormal], viewUp: [...viewUp], FrameOfReferenceUID, - referencedImageId, + //referencedImageId, }, data: { label: '', @@ -604,6 +605,19 @@ class RectangleROITool extends AnnotationTool { element.removeEventListener(Events.TOUCH_TAP, this._endCallback); }; + filterInteractableAnnotationsForElement = (element, annotations) => { + if (!annotations || !annotations.length) { + return []; + } + + const enabledElement = getEnabledElement(element); + const { viewportId } = enabledElement; + + const filteredAnnotations = annotations.filter((annotation) => true); + + return filteredAnnotations; + }; + /** * it is used to draw the rectangleROI annotation in each * request animation frame. It calculates the updated cached statistics if @@ -696,7 +710,7 @@ class RectangleROITool extends AnnotationTool { // we re-render the correct tool position. This is due to stackViewport // which doesn't have the full volume at each time, and we are only working // on one slice at a time. - if (viewport instanceof VolumeViewport) { + /*if (viewport instanceof VolumeViewport) { const { referencedImageId } = annotation.metadata; // invalidate all the relevant stackViewports if they are not @@ -722,7 +736,7 @@ class RectangleROITool extends AnnotationTool { } } } - } + }*/ } // If rendering engine has been destroyed while rendering @@ -1023,11 +1037,12 @@ function defaultGetTextLines(data, targetId: string): string[] { } const textLines: string[] = []; - + /* textLines.push(`Area: ${roundNumber(area)} ${areaUnit}`); textLines.push(`Mean: ${roundNumber(mean)} ${modalityUnit}`); textLines.push(`Max: ${roundNumber(max)} ${modalityUnit}`); textLines.push(`Std Dev: ${roundNumber(stdDev)} ${modalityUnit}`); + */ return textLines; } diff --git a/packages/tools/src/utilities/planar/filterAnnotationsForDisplay.ts b/packages/tools/src/utilities/planar/filterAnnotationsForDisplay.ts index eec6d01c83..14e33b2286 100644 --- a/packages/tools/src/utilities/planar/filterAnnotationsForDisplay.ts +++ b/packages/tools/src/utilities/planar/filterAnnotationsForDisplay.ts @@ -35,6 +35,7 @@ export default function filterAnnotationsForDisplay( // and we don't have a proper way to check distance either since a stack can be // composed of multiple unrelated images return annotations.filter((annotation) => { + return true; if (!annotation.isVisible) { return false; } @@ -55,6 +56,7 @@ export default function filterAnnotationsForDisplay( const frameOfReferenceUID: string = viewport.getFrameOfReferenceUID(); return annotations.filter((toolData) => { + return true; return toolData.metadata.FrameOfReferenceUID === frameOfReferenceUID; }); } else if (viewport instanceof VolumeViewport) { From 7d39ffcddcfce31a4d57aa9253d501e248790b70 Mon Sep 17 00:00:00 2001 From: justin Date: Tue, 7 Nov 2023 13:51:10 -0500 Subject: [PATCH 2/4] Update package names --- package.json | 7 ++++--- packages/adapters/package.json | 2 +- packages/core/package.json | 2 +- packages/dicomImageLoader/package.json | 2 +- packages/nifti-volume-loader/package.json | 2 +- packages/streaming-image-volume-loader/package.json | 2 +- packages/tools/package.json | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index c78be762a3..7426ea469d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "root", + "name": "@segmed/cornerstonejs", "description": "Cornerstone.js Monorepo Root", - "private": true, + "private": false, "workspaces": [ "packages/*" ], @@ -164,5 +164,6 @@ "not op_mini all" ], "dependencies": {}, - "resolutions": {} + "resolutions": {}, + "version": "2.7.3-segmed" } diff --git a/packages/adapters/package.json b/packages/adapters/package.json index 54e74c20d5..617bb87732 100644 --- a/packages/adapters/package.json +++ b/packages/adapters/package.json @@ -1,5 +1,5 @@ { - "name": "@cornerstonejs/adapters", + "name": "@segmed/cornerstonejs-adapters", "version": "1.27.3", "description": "Adapters for Cornerstone3D to/from formats including DICOM SR and others", "src": "src/index.ts", diff --git a/packages/core/package.json b/packages/core/package.json index ea21ac23ec..dae1454f7e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,5 +1,5 @@ { - "name": "@cornerstonejs/core", + "name": "@segmed/cornerstonejs-core", "version": "1.27.3", "description": "", "main": "src/index.ts", diff --git a/packages/dicomImageLoader/package.json b/packages/dicomImageLoader/package.json index 5fe92136af..434a51e519 100644 --- a/packages/dicomImageLoader/package.json +++ b/packages/dicomImageLoader/package.json @@ -1,5 +1,5 @@ { - "name": "@cornerstonejs/dicom-image-loader", + "name": "@segmed/cornerstonejs-dicom-image-loader", "version": "1.27.3", "description": "Cornerstone Image Loader for DICOM WADO-URI and WADO-RS and Local file", "keywords": [ diff --git a/packages/nifti-volume-loader/package.json b/packages/nifti-volume-loader/package.json index 7519db4690..891c235e03 100644 --- a/packages/nifti-volume-loader/package.json +++ b/packages/nifti-volume-loader/package.json @@ -1,5 +1,5 @@ { - "name": "@cornerstonejs/nifti-volume-loader", + "name": "@segmed/cornerstonejs-nifti-volume-loader", "version": "1.27.3", "description": "", "main": "dist/umd/index.js", diff --git a/packages/streaming-image-volume-loader/package.json b/packages/streaming-image-volume-loader/package.json index f62c39e789..45a4cef773 100644 --- a/packages/streaming-image-volume-loader/package.json +++ b/packages/streaming-image-volume-loader/package.json @@ -1,5 +1,5 @@ { - "name": "@cornerstonejs/streaming-image-volume-loader", + "name": "@segmed/cornerstonejs-streaming-image-volume-loader", "version": "1.27.3", "description": "", "main": "src/index.ts", diff --git a/packages/tools/package.json b/packages/tools/package.json index 7da5e5fbd0..095af6644a 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -1,5 +1,5 @@ { - "name": "@cornerstonejs/tools", + "name": "@segmed/cornerstonejs-tools", "version": "1.27.3", "description": "Cornerstone3D Tools", "main": "src/index.ts", From b9742b39b8489fc3b6cb7e503004ab34297183b7 Mon Sep 17 00:00:00 2001 From: justin Date: Tue, 7 Nov 2023 15:22:45 -0500 Subject: [PATCH 3/4] Version no --- packages/tools/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/package.json b/packages/tools/package.json index 095af6644a..b8fd680285 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -1,6 +1,6 @@ { "name": "@segmed/cornerstonejs-tools", - "version": "1.27.3", + "version": "1.27.3-segmed.1", "description": "Cornerstone3D Tools", "main": "src/index.ts", "types": "dist/esm/index.d.ts", From 603db77b6580af9e8ad8c3aa98d9872af998d8a4 Mon Sep 17 00:00:00 2001 From: justin Date: Thu, 21 Mar 2024 13:45:50 -0400 Subject: [PATCH 4/4] Fix: Version number --- .vscode/settings.json | 2 +- packages/dicomImageLoader/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 06b3169120..7e10ac7e83 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -29,6 +29,6 @@ ], "workbench.colorCustomizations": {}, "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" } } diff --git a/packages/dicomImageLoader/package.json b/packages/dicomImageLoader/package.json index 434a51e519..553d59e52b 100644 --- a/packages/dicomImageLoader/package.json +++ b/packages/dicomImageLoader/package.json @@ -1,6 +1,6 @@ { "name": "@segmed/cornerstonejs-dicom-image-loader", - "version": "1.27.3", + "version": "1.27.3-segmed", "description": "Cornerstone Image Loader for DICOM WADO-URI and WADO-RS and Local file", "keywords": [ "DICOM",