From bad67020cc83c081096a58a15033db4419ffb920 Mon Sep 17 00:00:00 2001 From: Woonchan Cho Date: Mon, 26 Jul 2021 06:34:55 -0500 Subject: [PATCH 1/3] chore(#2483) make client-side code debuggable right from the source code (#2484) --- .vscode/launch.json | 15 +++++++++++++++ platform/viewer/.webpack/webpack.pwa.js | 7 +++++++ 2 files changed, 22 insertions(+) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 000000000..1689524c2 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,15 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "pwa-chrome", + "request": "launch", + "name": "Launch Chrome against localhost", + "url": "http://localhost:3000", + "webRoot": "${workspaceFolder}" + } + ] +} diff --git a/platform/viewer/.webpack/webpack.pwa.js b/platform/viewer/.webpack/webpack.pwa.js index 5b5d36a25..a36f6daa1 100644 --- a/platform/viewer/.webpack/webpack.pwa.js +++ b/platform/viewer/.webpack/webpack.pwa.js @@ -41,6 +41,13 @@ module.exports = (env, argv) => { path: DIST_DIR, filename: isProdBuild ? '[name].bundle.[chunkhash].js' : '[name].js', publicPath: PUBLIC_URL, // Used by HtmlWebPackPlugin for asset prefix + devtoolModuleFilenameTemplate: function(info) { + if (isProdBuild) { + return `webpack:///${info.resourcePath}`; + } else { + return 'file:///' + encodeURI(info.absoluteResourcePath); + } + }, }, module: { rules: [...extractStyleChunksRule(isProdBuild)], From b8ae92c2d4f733b3ca89826118029685650b396a Mon Sep 17 00:00:00 2001 From: Michael Andersen <32403382+Michael-Andersen@users.noreply.github.com> Date: Mon, 26 Jul 2021 07:35:37 -0400 Subject: [PATCH 2/3] fix: changed new image handler conditional for 0 edge case (#2338) Co-authored-by: Michael Andersen Co-authored-by: Erik Ziegler --- extensions/cornerstone/src/OHIFCornerstoneViewport.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/cornerstone/src/OHIFCornerstoneViewport.js b/extensions/cornerstone/src/OHIFCornerstoneViewport.js index b2c7d9eb9..d0b14c7e3 100644 --- a/extensions/cornerstone/src/OHIFCornerstoneViewport.js +++ b/extensions/cornerstone/src/OHIFCornerstoneViewport.js @@ -180,7 +180,7 @@ class OHIFCornerstoneViewport extends Component { if ( displaySet.displaySetInstanceUID !== - prevDisplaySet.displaySetInstanceUID || + prevDisplaySet.displaySetInstanceUID || displaySet.SOPInstanceUID !== prevDisplaySet.SOPInstanceUID || displaySet.frameIndex !== prevDisplaySet.frameIndex ) { @@ -221,7 +221,7 @@ class OHIFCornerstoneViewport extends Component { const { displaySet } = this.props.viewportData; const { StudyInstanceUID } = displaySet; - if (currentImageIdIndex > 0) { + if (currentImageIdIndex >= 0) { this.props.onNewImage({ StudyInstanceUID, SOPInstanceUID: sopInstanceUid, From 4cf17185dae6f5f51eb02d8a8af0b347333bf128 Mon Sep 17 00:00:00 2001 From: ohif-bot Date: Mon, 26 Jul 2021 11:44:06 +0000 Subject: [PATCH 3/3] chore(release): publish [skip ci] - @ohif/extension-cornerstone@2.10.10 - @ohif/viewer@4.9.21 --- extensions/cornerstone/CHANGELOG.md | 11 +++++++++++ extensions/cornerstone/package.json | 2 +- platform/viewer/CHANGELOG.md | 8 ++++++++ platform/viewer/package.json | 4 ++-- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/extensions/cornerstone/CHANGELOG.md b/extensions/cornerstone/CHANGELOG.md index c3b653fb8..73a50bf1b 100644 --- a/extensions/cornerstone/CHANGELOG.md +++ b/extensions/cornerstone/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.10.10](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.10.9...@ohif/extension-cornerstone@2.10.10) (2021-07-26) + + +### Bug Fixes + +* changed new image handler conditional for 0 edge case ([#2338](https://github.com/OHIF/Viewers/issues/2338)) ([b8ae92c](https://github.com/OHIF/Viewers/commit/b8ae92c2d4f733b3ca89826118029685650b396a)) + + + + + ## [2.10.9](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.10.8...@ohif/extension-cornerstone@2.10.9) (2021-06-02) diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json index 413cbc210..773837861 100644 --- a/extensions/cornerstone/package.json +++ b/extensions/cornerstone/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-cornerstone", - "version": "2.10.9", + "version": "2.10.10", "description": "OHIF extension for Cornerstone", "author": "OHIF", "license": "MIT", diff --git a/platform/viewer/CHANGELOG.md b/platform/viewer/CHANGELOG.md index 06d95fa1e..7f75ea415 100644 --- a/platform/viewer/CHANGELOG.md +++ b/platform/viewer/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [4.9.21](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.9.20...@ohif/viewer@4.9.21) (2021-07-26) + +**Note:** Version bump only for package @ohif/viewer + + + + + ## [4.9.20](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.9.19...@ohif/viewer@4.9.20) (2021-06-03) **Note:** Version bump only for package @ohif/viewer diff --git a/platform/viewer/package.json b/platform/viewer/package.json index 888a2f1ea..a3a442937 100644 --- a/platform/viewer/package.json +++ b/platform/viewer/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/viewer", - "version": "4.9.20", + "version": "4.9.21", "description": "OHIF Viewer", "author": "OHIF Contributors", "license": "MIT", @@ -50,7 +50,7 @@ "dependencies": { "@babel/runtime": "^7.5.5", "@ohif/core": "^2.13.13", - "@ohif/extension-cornerstone": "^2.10.9", + "@ohif/extension-cornerstone": "^2.10.10", "@ohif/extension-debugging": "^0.2.2", "@ohif/extension-dicom-html": "^1.3.10", "@ohif/extension-dicom-microscopy": "^0.52.0",