From 8501192beba0e7d1aa8793ddc3c89a0a7124c9b9 Mon Sep 17 00:00:00 2001 From: Reggie <37439789+baokeyu123@users.noreply.github.com> Date: Mon, 25 Dec 2023 18:59:10 +0800 Subject: [PATCH 1/8] Update getPixelData.ts --- .../dicomImageLoader/src/imageLoader/wadors/getPixelData.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dicomImageLoader/src/imageLoader/wadors/getPixelData.ts b/packages/dicomImageLoader/src/imageLoader/wadors/getPixelData.ts index 4a6e7984de..ca238c8318 100644 --- a/packages/dicomImageLoader/src/imageLoader/wadors/getPixelData.ts +++ b/packages/dicomImageLoader/src/imageLoader/wadors/getPixelData.ts @@ -42,7 +42,7 @@ function getPixelData( } // Use the streaming parser only when configured to do so - if (retrieveOptions.streaming !== undefined) { + if (retrieveOptions.streaming) { return streamRequest(url, imageId, headers, options); } From ac0c5cf5c72b1eb913b08bc1b3d775f724dc7470 Mon Sep 17 00:00:00 2001 From: Reggie <37439789+baokeyu123@users.noreply.github.com> Date: Wed, 10 Jan 2024 18:44:32 +0800 Subject: [PATCH 2/8] Update ScaleOverlayTool.ts --- packages/tools/src/tools/ScaleOverlayTool.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/src/tools/ScaleOverlayTool.ts b/packages/tools/src/tools/ScaleOverlayTool.ts index ddc9ecb4d3..2ad7158fec 100644 --- a/packages/tools/src/tools/ScaleOverlayTool.ts +++ b/packages/tools/src/tools/ScaleOverlayTool.ts @@ -139,7 +139,7 @@ class ScaleOverlayTool extends AnnotationDisplayTool { addAnnotation(newAnnotation, viewport.element); annotation = newAnnotation; - } else if (this.editData.annotation.data.viewportId == viewport.id) { + } else if (this.editData.annotation && this.editData.annotation.data.viewportId == viewport.id) { this.editData.annotation.data.handles.points = viewportCanvasCornersInWorld; this.editData.annotation.data.viewportId = viewport.id; From efde8f578567937785fc5b2fcddeaa40e1924add Mon Sep 17 00:00:00 2001 From: Reggie <37439789+baokeyu123@users.noreply.github.com> Date: Tue, 16 Jan 2024 18:50:42 +0800 Subject: [PATCH 3/8] Update createImage.ts fix: Calibrate RGB pixelData and be fault tolerant --- packages/dicomImageLoader/src/imageLoader/createImage.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/dicomImageLoader/src/imageLoader/createImage.ts b/packages/dicomImageLoader/src/imageLoader/createImage.ts index 83d2727423..f7300c3307 100644 --- a/packages/dicomImageLoader/src/imageLoader/createImage.ts +++ b/packages/dicomImageLoader/src/imageLoader/createImage.ts @@ -242,7 +242,14 @@ function createImage( imageFrame.columns, imageFrame.rows ); - + const pixelDataLength = + imageFrame.columns * imageFrame.rows * imageFrame.samplesPerPixel; + if (imageFrame.pixelData.length > pixelDataLength) { + imageFrame.pixelData = imageFrame.pixelData.slice( + 0, + pixelDataLength + ); + } convertColorSpace(imageFrame, imageData.data, useRGBA); imageFrame.imageData = imageData; imageFrame.pixelData = imageData.data; From f2dd857390c6e99d32fc8f2be9d46de846148d9b Mon Sep 17 00:00:00 2001 From: Reggie <37439789+baokeyu123@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:22:19 +0800 Subject: [PATCH 4/8] fix: update EllipticalROITool.ts bug about preventHandleOutsideImage After dragging the ellipse out of the boundary,a new elliptical ROI cannot be drawn in the viewport --- packages/tools/src/tools/annotation/EllipticalROITool.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/tools/src/tools/annotation/EllipticalROITool.ts b/packages/tools/src/tools/annotation/EllipticalROITool.ts index 1d9607e4d5..b4dfbde48d 100644 --- a/packages/tools/src/tools/annotation/EllipticalROITool.ts +++ b/packages/tools/src/tools/annotation/EllipticalROITool.ts @@ -1044,6 +1044,8 @@ class EllipticalROITool extends AnnotationTool { // Some area to do stats over. if (this._isInsideVolume(worldPos1Index, worldPos2Index, dimensions)) { + this.isHandleOutsideImage = false; + const iMin = Math.min(worldPos1Index[0], worldPos2Index[0]); const iMax = Math.max(worldPos1Index[0], worldPos2Index[0]); From 8a0b8daca0e9dfe1c5ebf0b24d94f267b8e4b803 Mon Sep 17 00:00:00 2001 From: Reggie <37439789+baokeyu123@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:32:55 +0800 Subject: [PATCH 5/8] Rollback code createImage.ts Rollback code --- packages/dicomImageLoader/src/imageLoader/createImage.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/dicomImageLoader/src/imageLoader/createImage.ts b/packages/dicomImageLoader/src/imageLoader/createImage.ts index f7300c3307..dfbcbd8a74 100644 --- a/packages/dicomImageLoader/src/imageLoader/createImage.ts +++ b/packages/dicomImageLoader/src/imageLoader/createImage.ts @@ -242,14 +242,6 @@ function createImage( imageFrame.columns, imageFrame.rows ); - const pixelDataLength = - imageFrame.columns * imageFrame.rows * imageFrame.samplesPerPixel; - if (imageFrame.pixelData.length > pixelDataLength) { - imageFrame.pixelData = imageFrame.pixelData.slice( - 0, - pixelDataLength - ); - } convertColorSpace(imageFrame, imageData.data, useRGBA); imageFrame.imageData = imageData; imageFrame.pixelData = imageData.data; From d8db2da8c1545903a4efe8c2679553a8d1f8147c Mon Sep 17 00:00:00 2001 From: Reggie <37439789+baokeyu123@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:55:29 +0800 Subject: [PATCH 6/8] callback createImage.ts --- packages/dicomImageLoader/src/imageLoader/createImage.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/dicomImageLoader/src/imageLoader/createImage.ts b/packages/dicomImageLoader/src/imageLoader/createImage.ts index dfbcbd8a74..6cb51225ec 100644 --- a/packages/dicomImageLoader/src/imageLoader/createImage.ts +++ b/packages/dicomImageLoader/src/imageLoader/createImage.ts @@ -242,6 +242,7 @@ function createImage( imageFrame.columns, imageFrame.rows ); + convertColorSpace(imageFrame, imageData.data, useRGBA); imageFrame.imageData = imageData; imageFrame.pixelData = imageData.data; From ad1db0ea5ab4ba20f8b49d6d85875b4f661178af Mon Sep 17 00:00:00 2001 From: Reggie <37439789+baokeyu123@users.noreply.github.com> Date: Fri, 19 Jan 2024 15:02:11 +0800 Subject: [PATCH 7/8] Update createImage.ts From 4fbb27eb73feb81f951466eccc5b78f1062fd2e4 Mon Sep 17 00:00:00 2001 From: Reggie <37439789+baokeyu123@users.noreply.github.com> Date: Fri, 19 Jan 2024 15:21:28 +0800 Subject: [PATCH 8/8] Update createImage.ts --- packages/dicomImageLoader/src/imageLoader/createImage.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dicomImageLoader/src/imageLoader/createImage.ts b/packages/dicomImageLoader/src/imageLoader/createImage.ts index 6cb51225ec..83d2727423 100644 --- a/packages/dicomImageLoader/src/imageLoader/createImage.ts +++ b/packages/dicomImageLoader/src/imageLoader/createImage.ts @@ -242,7 +242,7 @@ function createImage( imageFrame.columns, imageFrame.rows ); - + convertColorSpace(imageFrame, imageData.data, useRGBA); imageFrame.imageData = imageData; imageFrame.pixelData = imageData.data;