Merge branch 'feat/bidirectional' of github.com:RadicalImaging/OHIF-F…

…UBerlin into feat/bidirectional
OHIF · Oct 28, 2021 · 145d832 · 145d832
2 parents e520027 + e9e8f84
commit 145d832
Show file tree

Hide file tree

Showing 48 changed files with 673 additions and 227 deletions.
diff --git a/extensions/calibration-tool/package.json b/extensions/calibration-tool/package.json
@@ -31,8 +31,8 @@
   "peerDependencies": {
     "@ohif/core": "^0.50.0",
     "cornerstone-core": "^2.2.8",
-    "cornerstone-tools": "4.12.5",
     "dcmjs": "0.19.0",
+    "cornerstone-tools": "6.0.5",
     "prop-types": "^15.6.2",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"

diff --git a/extensions/cobb-angle-tool/package.json b/extensions/cobb-angle-tool/package.json
@@ -31,7 +31,7 @@
   "peerDependencies": {
     "@ohif/core": "^0.50.0",
     "cornerstone-core": "^2.2.8",
-    "cornerstone-tools": "4.12.5",
+    "cornerstone-tools": "6.0.5",
     "prop-types": "^15.6.2"
   },
   "dependencies": {

diff --git a/extensions/cornerstone/CHANGELOG.md b/extensions/cornerstone/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.
 
+## [2.12.2](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2021-10-26)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone
+
+
+
+
+
 ## [2.12.1](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2021-09-28)
 
 **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.12.1",
+  "version": "2.12.2",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",
@@ -34,7 +34,7 @@
     "@ohif/ui": "^0.50.0",
     "cornerstone-core": "^2.5.0",
     "cornerstone-math": "^0.1.9",
-    "cornerstone-tools": "^6.0.0",
+    "cornerstone-tools": "^6.0.5",
     "cornerstone-wado-image-loader": "^4.0.3",
     "dcmjs": "0.19.0",
     "dicom-parser": "^1.8.9",

diff --git a/extensions/cornerstone/src/commandsModule.js b/extensions/cornerstone/src/commandsModule.js
@@ -180,6 +180,8 @@ const commandsModule = ({ servicesManager }) => {
       measurementNumber,
       location,
       description,
+      finding,
+      findingSites,
     }) {
       // Update all measurements by measurement number
       const measurementApi = OHIF.measurements.MeasurementApi.Instance;
@@ -190,6 +192,8 @@ const commandsModule = ({ servicesManager }) => {
       measurements.forEach(measurement => {
         measurement.location = location;
         measurement.description = description;
+        measurement.finding = finding;
+        measurement.findingSites = findingSites;
 
         measurementApi.updateMeasurement(measurement.toolType, measurement);
       });
@@ -276,14 +280,7 @@ const commandsModule = ({ servicesManager }) => {
       activeViewportIndex,
       refreshViewports = true,
     }) => {
-      const study = studyMetadataManager.get(StudyInstanceUID);
-
-      const displaySet = study.findDisplaySet(ds => {
-        return (
-          ds.images &&
-          ds.images.find(i => i.getSOPInstanceUID() === SOPInstanceUID)
-        );
-      });
+      const { displaySet } = studyMetadataManager.getInstance(StudyInstanceUID, SOPInstanceUID, frameIndex);
 
       if (!displaySet) {
         return;

diff --git a/extensions/dicom-html/CHANGELOG.md b/extensions/dicom-html/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.13](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2021-10-26)
+
+**Note:** Version bump only for package @ohif/extension-dicom-html
+
+
+
+
+
+## [1.3.12](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2021-10-25)
+
+**Note:** Version bump only for package @ohif/extension-dicom-html
+
+
+
+
+
 ## [1.3.11](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2021-09-28)
 
 **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.3.11",
+  "version": "1.3.13",
   "description": "OHIF extension for rendering structured reports to HTML",
   "author": "OHIF",
   "license": "MIT",

diff --git a/extensions/dicom-html/src/DicomHtmlViewport.js b/extensions/dicom-html/src/DicomHtmlViewport.js
@@ -160,7 +160,7 @@ const getContentSequence = (data, level = 1) => {
 
   const root = [];
   if (header) {
-    const HeaderDynamicLevel = `h${level}`;
+    const HeaderDynamicLevel = `h${Math.min(level, 6)}`;
 
     root.push(<HeaderDynamicLevel key={header}>{header}</HeaderDynamicLevel>);
   }
@@ -170,7 +170,7 @@ const getContentSequence = (data, level = 1) => {
 
     if (key === '_meta') {
       const HeaderDynamicLevel = `h3`;
-      root.push(<hr />);
+      root.push(<hr key={root.length} />);
       root.push(
         <HeaderDynamicLevel key="Metadata">
           DICOM File Meta Information
@@ -217,7 +217,7 @@ class DicomHtmlViewport extends Component {
   };
 
   componentDidMount() {
-    const dataSet = this.setContentFromByteArray(this.props.byteArray);
+    this.setContentFromByteArray(this.props.byteArray);
   }
 
   setContentFromByteArray(byteArray) {

diff --git a/extensions/dicom-rt/CHANGELOG.md b/extensions/dicom-rt/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.7.3](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2021-10-26)
+
+**Note:** Version bump only for package @ohif/extension-dicom-rt
+
+
+
+
+
+## [0.7.2](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2021-10-06)
+
+**Note:** Version bump only for package @ohif/extension-dicom-rt
+
+
+
+
+
 ## [0.7.1](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2021-09-28)
 
 **Note:** Version bump only for package @ohif/extension-dicom-rt

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.7.1",
+  "version": "0.7.3",
   "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.5.0",
-    "cornerstone-tools": "^6.0.0",
+    "cornerstone-tools": "^6.0.5",
     "dcmjs": "0.19.0",
     "gl-matrix": "^3.3.0",
     "prop-types": "^15.6.2",

diff --git a/extensions/dicom-rt/src/index.js b/extensions/dicom-rt/src/index.js
@@ -74,6 +74,9 @@ export default {
               const studyMetadata = studyMetadataManager.get(
                 activeViewport.StudyInstanceUID
               );
+              if (!studyMetadata) {
+                return;
+              }
               const referencedDisplaySets = studyMetadata.getDerivedDatasets({
                 referencedSeriesInstanceUID: activeViewport.SeriesInstanceUID,
                 Modality: 'RTSTRUCT',
@@ -84,6 +87,10 @@ export default {
                   ['RTSTRUCT'].includes(ds.Modality)
                 )
               ) {
+                triggerRTPanelUpdatedEvent({
+                  badgeNumber: referencedDisplaySets.length,
+                  target: 'rt-panel',
+                });
                 return false;
               }
             }

diff --git a/extensions/dicom-segmentation/CHANGELOG.md b/extensions/dicom-segmentation/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.7.3](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2021-10-26)
+
+**Note:** Version bump only for package @ohif/extension-dicom-segmentation
+
+
+
+
+
+## [0.7.2](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2021-10-06)
+
+**Note:** Version bump only for package @ohif/extension-dicom-segmentation
+
+
+
+
+
 ## [0.7.1](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2021-09-28)
 
 **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.7.1",
+  "version": "0.7.3",
   "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.5.0",
-    "cornerstone-tools": "^6.0.0",
+    "cornerstone-tools": "^6.0.5",
     "dcmjs": "0.19.0",
     "prop-types": "^15.6.2",
     "react": "^16.8.6",

diff --git a/extensions/dicom-segmentation/src/index.js b/extensions/dicom-segmentation/src/index.js
@@ -85,7 +85,7 @@ export default {
           icon: 'list',
           label: 'Segmentations',
           target: 'segmentation-panel',
-          isDisabled: studies => {
+          isDisabled: (studies, activeViewport) => {
             if (!studies) {
               return true;
             }
@@ -98,6 +98,23 @@ export default {
                   const series = study.series[j];
 
                   if (series.Modality === 'SEG') {
+                    if (activeViewport) {
+                      const studyMetadata = studyMetadataManager.get(
+                        activeViewport.StudyInstanceUID
+                      );
+                      if (!studyMetadata) {
+                        return;
+                      }
+                      const referencedDS = studyMetadata.getDerivedDatasets({
+                        referencedSeriesInstanceUID:
+                          activeViewport.SeriesInstanceUID,
+                        Modality: 'SEG',
+                      });
+                      triggerSegmentationPanelTabUpdatedEvent({
+                        badgeNumber: referencedDS.length,
+                        target: 'segmentation-panel',
+                      });
+                    }
                     return false;
                   }
                 }

diff --git a/extensions/dicom-tag-browser/CHANGELOG.md b/extensions/dicom-tag-browser/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.2.13](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2021-10-26)
+
+**Note:** Version bump only for package @ohif/extension-dicom-tag-browser
+
+
+
+
+
 ## [0.2.12](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2021-09-28)
 
 **Note:** Version bump only for package @ohif/extension-dicom-tag-browser

diff --git a/extensions/dicom-tag-browser/package.json b/extensions/dicom-tag-browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-tag-browser",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "description": "OHIF extension for checking DICOM headers.",
   "author": "OHIF",
   "license": "MIT",
@@ -28,7 +28,7 @@
   },
   "peerDependencies": {
     "@ohif/core": "^2.6.0",
-    "dcmjs": "0.19.0",
+    "dcmjs": "0.18.10",
     "react": "^16.8.6"
   },
   "dependencies": {

diff --git a/extensions/dicom-video/src/DICOMVideoViewport.css b/extensions/dicom-video/src/DICOMVideoViewport.css
@@ -1,9 +1,9 @@
 .DICOMVideoViewport {
-  display: flex;
   justify-content: center;
   align-items: center;
   height: 100%;
   width: 100%;
+  color: white;
 }
 
 .DICOMVideoViewport .error {
@@ -14,6 +14,12 @@
   font-size: 18px;
 }
 
+.src {
+  width: 100%;
+  height:15%;
+  display:block;
+}
+
 .DICOMVideoViewport video {
   height: 100%;
   width: 100%;

diff --git a/extensions/dicom-video/src/DICOMVideoViewport.js b/extensions/dicom-video/src/DICOMVideoViewport.js
@@ -110,6 +110,8 @@ const DICOMVideoViewport = ({
       {state.isLoading && <LoadingIndicator />}
       {!state.isLoading && !state.errorMessage && (
         <video
+          id={state.src}
+          key={state.src}
           controls
           controlsList="nodownload"
           preload="auto"

diff --git a/extensions/vtk/CHANGELOG.md b/extensions/vtk/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.12.5](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2021-10-26)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.12.4](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2021-10-15)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
 ## [1.12.3](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2021-10-04)
 
 **Note:** Version bump only for package @ohif/extension-vtk

diff --git a/extensions/vtk/package.json b/extensions/vtk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-vtk",
-  "version": "1.12.3",
+  "version": "1.12.5",
   "description": "OHIF extension for VTK.js",
   "author": "OHIF",
   "license": "MIT",
@@ -53,8 +53,8 @@
     "react-vtkjs-viewport": "^0.14.4"
   },
   "devDependencies": {
-    "@ohif/core": "^2.16.0",
-    "@ohif/ui": "^1.10.2",
+    "@ohif/core": "^2.16.1",
+    "@ohif/ui": "^1.10.4",
     "cornerstone-tools": "^6.0.0",
     "cornerstone-wado-image-loader": "^4.0.3",
     "dicom-parser": "^1.8.9",

diff --git a/package.json b/package.json
@@ -44,7 +44,8 @@
   "dependencies": {
     "@babel/runtime": "^7.5.5",
     "core-js": "^3.2.1",
-    "dcmjs": "0.18.11",
+    "cornerstone-tools": "^6.0.5",
+    "dcmjs": "^0.19.0",
     "ol": "6.7.0"
   },
   "devDependencies": {