Ohif 2020 08 28 (#2)

* feat: 🎸 Update react-vtkjs-viewport usage to use requestPool (OHIF#1984) * feat: 🎸 Update react-vtkjs-viewport usage to use requestPool * Fix import of react-vtkjs-viewport to cornerstone-tools path. * Increase maximum load time of MPR test now we are throttling requests. * Remove debugger Co-authored-by: Erik Ziegler <[email protected]> * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] * fix: Avoid lerna:restore unless we are on Netlify (closes OHIF#1926, OHIF#1996) * wip * fix: Fix incorrect command name in Percy test (OHIF#1999) * perf(stackPrefetch): Added stackPrefetch config with 20 max concurrent requests (OHIF#2000) Co-authored-by: Danny Brown <[email protected]> * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] * feat: 🎸 Filter/promote multiple series instances (OHIF#1533) improve filter/promote to be applied on multiple series instances ✅ Closes: 1532 Co-authored-by: Rodolfo Ladeira <[email protected]> * chore(release): publish [skip ci] - @ohif/[email protected] * fix: Updated react-cornerstone-viewport to version 4.0.2 (OHIF#2001) Co-authored-by: Danny Brown <[email protected]> * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] * fix: 🐛 Fail gracefully on an MPR load error (OHIF#1992) * feat: 🎸 Update react-vtkjs-viewport usage to use requestPool * Fix import of react-vtkjs-viewport to cornerstone-tools path. * Increase maximum load time of MPR test now we are throttling requests. * fix: 🐛 Fail gracefully on an MPR load error * Respond to reviewer comments. * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] * [IDC-1994] Sort series list by SeriesNumber, and sort by same SeriesNumber by date/time. (OHIF#2010) * Sort based on SeriesNumber and SeriesDate/SeriesTime. * Harden, and perform final sort in algorithm if last N entries have the same SeriesNumber. * Switch to insertion rather than sorting as sorting is too slow. Reimplement low priority sorting into new insertion method. * Fix local file viewing. * chore(release): publish [skip ci] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] - @ohif/[email protected] Co-authored-by: James Petts <[email protected]> Co-authored-by: Erik Ziegler <[email protected]> Co-authored-by: ohif-bot <[email protected]> Co-authored-by: Alex Broaddus <[email protected]> Co-authored-by: Danny Brown <[email protected]> Co-authored-by: ladeirarodolfo <[email protected]> Co-authored-by: Rodolfo Ladeira <[email protected]>
ImagingDataCommons · Aug 28, 2020 · 32fa156 · 32fa156
1 parent 01659d3
commit 32fa156
Show file tree

Hide file tree

Showing 39 changed files with 513 additions and 234 deletions.
diff --git a/.netlify/build-deploy-preview.sh b/.netlify/build-deploy-preview.sh
@@ -11,6 +11,7 @@ node -v
 
 # Install build deps and all monorepo package dependencies. Yarn Workspaces
 # should also symlink all projects appropriately
+yarn run lerna:restore
 yarn install --no-ignore-optional --pure-lockfile
 
 # Build && Move PWA Output

diff --git a/extensions/cornerstone/CHANGELOG.md b/extensions/cornerstone/CHANGELOG.md
@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.9.2](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-20)
+
+
+### Bug Fixes
+
+* Updated react-cornerstone-viewport to version 4.0.2 ([#2001](https://github.com/OHIF/Viewers/issues/2001)) ([59ab68b](https://github.com/OHIF/Viewers/commit/59ab68b4edbfec010170c4429c300a53f688bf94))
+
+
+
+
+
+## [2.9.1](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-20)
+
+
+### Performance Improvements
+
+* **stackPrefetch:** Added stackPrefetch config with 20 max concurrent requests ([#2000](https://github.com/OHIF/Viewers/issues/2000)) ([3b02a06](https://github.com/OHIF/Viewers/commit/3b02a06f5e250660edde4862ce44147db3dc3ab9))
+
+
+
+
+
+# [2.9.0](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-18)
+
+
+### Features
+
+* 🎸 Update react-vtkjs-viewport usage to use requestPool ([#1984](https://github.com/OHIF/Viewers/issues/1984)) ([bb5f30c](https://github.com/OHIF/Viewers/commit/bb5f30ce2a0192d2e021beaaadfff22fd38e17b9))
+
+
+
+
+
 ## [2.8.5](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-05)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone

diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone",
-  "version": "2.8.5",
+  "version": "2.9.2",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",
@@ -34,7 +34,7 @@
     "@ohif/ui": "^0.50.0",
     "cornerstone-core": "^2.2.8",
     "cornerstone-math": "^0.1.8",
-    "cornerstone-tools": "4.15.1",
+    "cornerstone-tools": "^4.20.1",
     "cornerstone-wado-image-loader": "^3.1.0",
     "dcmjs": "0.16.0",
     "dicom-parser": "^1.8.3",
@@ -51,6 +51,6 @@
     "classnames": "^2.2.6",
     "lodash.merge": "^4.6.2",
     "lodash.throttle": "^4.1.1",
-    "react-cornerstone-viewport": "4.0.1"
+    "react-cornerstone-viewport": "4.0.2"
   }
 }
diff --git a/extensions/cornerstone/src/initCornerstoneTools.js b/extensions/cornerstone/src/initCornerstoneTools.js
@@ -34,4 +34,11 @@ export default function(configuration = {}) {
   cornerstoneTools.toolColors.setActiveColor('rgb(0, 255, 0)');
 
   cornerstoneTools.store.state.touchProximity = 40;
+
+  // Configure stack prefetch
+  cornerstoneTools.stackPrefetch.setConfiguration({
+    maxImagesToPrefetch: Infinity,
+    preserveExistingPool: false,
+    maxSimultaneousRequests: 20,
+  });
 }
diff --git a/extensions/dicom-html/CHANGELOG.md b/extensions/dicom-html/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.
 
+## [1.2.5](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-28)
+
+**Note:** Version bump only for package @ohif/extension-dicom-html
+
+
+
+
+
 ## [1.2.4](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-07-13)
 
 **Note:** Version bump only for package @ohif/extension-dicom-html

diff --git a/extensions/dicom-html/package.json b/extensions/dicom-html/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-html",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "OHIF extension for rendering structured reports to HTML",
   "author": "OHIF",
   "license": "MIT",

diff --git a/extensions/dicom-html/src/OHIFDicomHtmlSopClassHandler.js b/extensions/dicom-html/src/OHIFDicomHtmlSopClassHandler.js
@@ -22,6 +22,12 @@ const OHIFDicomHtmlSopClassHandler = {
   getDisplaySetFromSeries(series, study, dicomWebClient, authorizationHeaders) {
     const instance = series.getFirstInstance();
 
+    const {
+      SeriesDate,
+      SeriesTime,
+      SeriesNumber,
+    } = instance._instance.metadata;
+
     return {
       plugin: 'html',
       Modality: 'SR',
@@ -31,6 +37,9 @@ const OHIFDicomHtmlSopClassHandler = {
       SOPInstanceUID: instance.getSOPInstanceUID(),
       SeriesInstanceUID: series.getSeriesInstanceUID(),
       StudyInstanceUID: study.getStudyInstanceUID(),
+      SeriesDate,
+      SeriesTime,
+      SeriesNumber,
       authorizationHeaders,
     };
   },

diff --git a/extensions/dicom-microscopy/CHANGELOG.md b/extensions/dicom-microscopy/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.
 
+## [0.51.1](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-28)
+
+**Note:** Version bump only for package @ohif/extension-dicom-microscopy
+
+
+
+
+
 # [0.51.0](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-06-04)
 
 

diff --git a/extensions/dicom-microscopy/package.json b/extensions/dicom-microscopy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-microscopy",
-  "version": "0.51.0",
+  "version": "0.51.1",
   "description": "OHIF extension for Dicom Microscopy",
   "author": "OHIF",
   "license": "MIT",

diff --git a/extensions/dicom-microscopy/src/DicomMicroscopySopClassHandler.js b/extensions/dicom-microscopy/src/DicomMicroscopySopClassHandler.js
@@ -12,6 +12,12 @@ const DicomMicroscopySopClassHandler = {
   getDisplaySetFromSeries(series, study, dicomWebClient) {
     const instance = series.getFirstInstance();
 
+    const {
+      ContentDate,
+      ContentTime,
+      SeriesNumber,
+    } = instance._instance.metadata;
+
     // Note: We are passing the dicomweb client into each viewport!
 
     return {
@@ -22,6 +28,9 @@ const DicomMicroscopySopClassHandler = {
       SOPInstanceUID: instance.getSOPInstanceUID(),
       SeriesInstanceUID: series.getSeriesInstanceUID(),
       StudyInstanceUID: study.getStudyInstanceUID(),
+      SeriesDate: ContentDate, // Map ContentDate/Time to SeriesTime for series list sorting.
+      SeriesTime: ContentTime,
+      SeriesNumber,
     };
   },
 };

diff --git a/extensions/dicom-pdf/CHANGELOG.md b/extensions/dicom-pdf/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.
 
+## [1.0.4](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-28)
+
+**Note:** Version bump only for package @ohif/extension-dicom-pdf
+
+
+
+
+
 ## [1.0.3](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-04-02)
 
 **Note:** Version bump only for package @ohif/extension-dicom-pdf

diff --git a/extensions/dicom-pdf/package.json b/extensions/dicom-pdf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-pdf",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "OHIF extension for Dicom PDF",
   "author": "OHIF",
   "license": "MIT",

diff --git a/extensions/dicom-pdf/src/OHIFDicomPDFSopClassHandler.js b/extensions/dicom-pdf/src/OHIFDicomPDFSopClassHandler.js
@@ -12,6 +12,12 @@ const OHIFDicomPDFSopClassHandler = {
   getDisplaySetFromSeries(series, study, dicomWebClient, authorizationHeaders) {
     const instance = series.getFirstInstance();
 
+    const {
+      ContentDate,
+      ContentTime,
+      SeriesNumber,
+    } = instance._instance.metadata;
+
     return {
       plugin: 'pdf',
       Modality: 'DOC',
@@ -21,6 +27,9 @@ const OHIFDicomPDFSopClassHandler = {
       SOPInstanceUID: instance.getSOPInstanceUID(),
       SeriesInstanceUID: series.getSeriesInstanceUID(),
       StudyInstanceUID: study.getStudyInstanceUID(),
+      SeriesDate: ContentDate, // Map ContentDate/Time to SeriesTime for series list sorting.
+      SeriesTime: ContentTime,
+      SeriesNumber,
       authorizationHeaders: authorizationHeaders,
     };
   },

diff --git a/extensions/dicom-rt/CHANGELOG.md b/extensions/dicom-rt/CHANGELOG.md
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.4.1](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-28)
+
+**Note:** Version bump only for package @ohif/extension-dicom-rt
+
+
+
+
+
+# [0.4.0](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-18)
+
+
+### Features
+
+* 🎸 Update react-vtkjs-viewport usage to use requestPool ([#1984](https://github.com/OHIF/Viewers/issues/1984)) ([bb5f30c](https://github.com/OHIF/Viewers/commit/bb5f30ce2a0192d2e021beaaadfff22fd38e17b9))
+
+
+
+
+
 # [0.3.0](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-10)
 
 

diff --git a/extensions/dicom-rt/package.json b/extensions/dicom-rt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-rt",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "OHIF extension for rendering DICOM RTSTRUCTs on top of cornerstone images.",
   "author": "OHIF",
   "license": "MIT",
@@ -30,7 +30,7 @@
   "peerDependencies": {
     "@ohif/core": "^0.50.0",
     "cornerstone-core": "^2.2.8",
-    "cornerstone-tools": "4.15.1",
+    "cornerstone-tools": "^4.20.1",
     "dcmjs": "0.16.0",
     "prop-types": "^15.6.2",
     "react": "^16.8.6",

diff --git a/extensions/dicom-rt/src/OHIFDicomRTStructSopClassHandler.js b/extensions/dicom-rt/src/OHIFDicomRTStructSopClassHandler.js
@@ -27,6 +27,7 @@ const OHIFDicomRTStructSopClassHandler = {
     const {
       SeriesDate,
       SeriesTime,
+      SeriesNumber,
       SeriesDescription,
       FrameOfReferenceUID,
       SOPInstanceUID,
@@ -53,6 +54,7 @@ const OHIFDicomRTStructSopClassHandler = {
       isLoaded: false,
       SeriesDate,
       SeriesTime,
+      SeriesNumber,
       SeriesDescription,
     };
 

diff --git a/extensions/dicom-segmentation/CHANGELOG.md b/extensions/dicom-segmentation/CHANGELOG.md
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.4.1](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-28)
+
+**Note:** Version bump only for package @ohif/extension-dicom-segmentation
+
+
+
+
+
+# [0.4.0](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-18)
+
+
+### Features
+
+* 🎸 Update react-vtkjs-viewport usage to use requestPool ([#1984](https://github.com/OHIF/Viewers/issues/1984)) ([bb5f30c](https://github.com/OHIF/Viewers/commit/bb5f30ce2a0192d2e021beaaadfff22fd38e17b9))
+
+
+
+
+
 ## [0.3.4](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-10)
 
 **Note:** Version bump only for package @ohif/extension-dicom-segmentation

diff --git a/extensions/dicom-segmentation/package.json b/extensions/dicom-segmentation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-segmentation",
-  "version": "0.3.4",
+  "version": "0.4.1",
   "description": "OHIF extension for viewing segmentations in the 2D MPR view",
   "author": "OHIF",
   "license": "MIT",
@@ -30,7 +30,7 @@
   "peerDependencies": {
     "@ohif/core": "^0.50.0",
     "cornerstone-core": "^2.2.8",
-    "cornerstone-tools": "4.15.1",
+    "cornerstone-tools": "^4.20.1",
     "dcmjs": "0.16.0",
     "prop-types": "^15.6.2",
     "react": "^16.8.6",

diff --git a/extensions/dicom-segmentation/src/getOHIFDicomSegSopClassHandler.js b/extensions/dicom-segmentation/src/getOHIFDicomSegSopClassHandler.js
@@ -28,6 +28,7 @@ export default function getSopClassHandlerModule({ servicesManager }) {
       const {
         SeriesDate,
         SeriesTime,
+        SeriesNumber,
         SeriesDescription,
         FrameOfReferenceUID,
         SOPInstanceUID,
@@ -52,6 +53,7 @@ export default function getSopClassHandlerModule({ servicesManager }) {
         isLoaded: false,
         SeriesDate,
         SeriesTime,
+        SeriesNumber,
         SeriesDescription,
       };
 

diff --git a/extensions/vtk/CHANGELOG.md b/extensions/vtk/CHANGELOG.md
@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.7.2](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-28)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.7.1](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-24)
+
+
+### Bug Fixes
+
+* 🐛 Fail gracefully on an MPR load error ([#1992](https://github.com/OHIF/Viewers/issues/1992)) ([779a7e0](https://github.com/OHIF/Viewers/commit/779a7e0976aa3a2d2bf1dc8f056950f0545c9fff))
+
+
+
+
+
+# [1.7.0](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-18)
+
+
+### Features
+
+* 🎸 Update react-vtkjs-viewport usage to use requestPool ([#1984](https://github.com/OHIF/Viewers/issues/1984)) ([bb5f30c](https://github.com/OHIF/Viewers/commit/bb5f30ce2a0192d2e021beaaadfff22fd38e17b9))
+
+
+
+
+
 ## [1.6.10](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2020-08-10)
 
 **Note:** Version bump only for package @ohif/extension-vtk