chore(release): publish [skip ci]

- @ohif/extension-cornerstone@2.10.6 - @ohif/viewer@4.9.7
Merge pull request #2335 from OHIF/idc-2334
2021-03-26 18:38:58 +00:00 · 2021-03-26 15:36:07 -03:00 · 2021-03-26 13:27:51 -03:00 · 2021-03-26 10:35:50 +00:00 · 2021-03-26 11:32:10 +01:00 · 2021-03-25 16:16:14 +00:00
23 changed files with 474 additions and 202 deletions
@@ -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.10.6](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.10.5...@ohif/extension-cornerstone@2.10.6) (2021-03-26)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone
+
+
+
+
+
 ## [2.10.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.10.4...@ohif/extension-cornerstone@2.10.5) (2021-03-15)

 **Note:** Version bump only for package @ohif/extension-cornerstone
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-cornerstone",
-  "version": "2.10.5",
+  "version": "2.10.6",
  "description": "OHIF extension for Cornerstone",
  "author": "OHIF",
  "license": "MIT",
@@ -179,7 +179,7 @@ class OHIFCornerstoneViewport extends Component {

    if (
      displaySet.displaySetInstanceUID !==
-      prevDisplaySet.displaySetInstanceUID ||
+        prevDisplaySet.displaySetInstanceUID ||
      displaySet.SOPInstanceUID !== prevDisplaySet.SOPInstanceUID ||
      displaySet.frameIndex !== prevDisplaySet.frameIndex
    ) {
@@ -235,8 +235,8 @@ class OHIFCornerstoneViewport extends Component {
          viewportIndex={viewportIndex}
          imageIds={imageIds}
          imageIdIndex={currentImageIdIndex}
-          onNewImage={newImageHandler}
-          onNewImageDebounceTime={700}
+          onNewImageDebounced={newImageHandler}
+          onNewImageDebounceTime={300}
          // ~~ Connected (From REDUX)
          // frameRate={frameRate}
          // isPlaying={false}
@@ -268,6 +268,7 @@ const commandsModule = ({ servicesManager }) => {
      SOPInstanceUID,
      frameIndex,
      activeViewportIndex,
+      refreshViewports = true,
    }) => {
      const study = studyMetadataManager.get(StudyInstanceUID);

@@ -278,6 +279,10 @@ const commandsModule = ({ servicesManager }) => {
        );
      });

+      if (!displaySet) {
+        return;
+      }
+
      displaySet.SOPInstanceUID = SOPInstanceUID;
      displaySet.frameIndex = frameIndex;

@@ -285,7 +290,9 @@ const commandsModule = ({ servicesManager }) => {
        setViewportSpecificData(activeViewportIndex, displaySet)
      );

-      refreshCornerstoneViewports();
+      if (refreshViewports) {
+        refreshCornerstoneViewports();
+      }
    },
  };

@@ -38,7 +38,14 @@ export default {
  },
  getViewportModule({ commandsManager }) {
    const ExtendedOHIFCornerstoneViewport = props => {
+      /**
+       * TODO: This appears to be used to set the redux parameters for
+       * the viewport when new images are loaded. It's very ugly
+       * and we should remove it.
+       */
      const onNewImageHandler = jumpData => {
+        /** Do not trigger all viewports to render unnecessarily */
+        jumpData.refreshViewports = false;
        commandsManager.runCommand('jumpToImage', jumpData);
      };
      return (
@@ -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.11.4](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.11.3...@ohif/extension-vtk@1.11.4) (2021-03-26)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.11.3](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.11.2...@ohif/extension-vtk@1.11.3) (2021-03-25)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
 ## [1.11.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.11.1...@ohif/extension-vtk@1.11.2) (2021-03-09)

 **Note:** Version bump only for package @ohif/extension-vtk
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-vtk",
-  "version": "1.11.2",
+  "version": "1.11.4",
  "description": "OHIF extension for VTK.js",
  "author": "OHIF",
  "license": "MIT",
@@ -53,8 +53,8 @@
    "react-vtkjs-viewport": "^0.14.2"
  },
  "devDependencies": {
-    "@ohif/core": "^2.13.1",
-    "@ohif/ui": "^1.9.0",
+    "@ohif/core": "^2.13.3",
+    "@ohif/ui": "^1.9.1",
    "cornerstone-tools": "^4.20.1",
    "cornerstone-wado-image-loader": "^3.1.0",
    "dicom-parser": "^1.8.3",
@@ -1,18 +1,21 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import { ToolbarButton } from '@ohif/ui';
 import { utils } from '@ohif/core';
-import { createSelector } from 'reselect';
+
 const { studyMetadataManager } = utils;

-const _isDisplaySetReconstructable = (
-  displaySetInstanceUID = '',
-  StudyInstanceUID = ''
-) => {
-  if (displaySetInstanceUID == '' || StudyInstanceUID == '') {
+let isVisible = true;
+
+const _isDisplaySetReconstructable = (viewportSpecificData = {}, activeViewportIndex) => {
+  if (!viewportSpecificData[activeViewportIndex]) {
    return false;
-  }
+  };
+
+  const { displaySetInstanceUID, StudyInstanceUID } = viewportSpecificData[
+    activeViewportIndex
+  ];

  const studies = studyMetadataManager.all();

@@ -24,132 +27,38 @@ const _isDisplaySetReconstructable = (
    return false;
  }

-  const displaySet = study._displaySets.find(
-    set => set.displaySetInstanceUID === displaySetInstanceUID
-  );
+  const displaySet = study._displaySets.find(set => set.displaySetInstanceUID === displaySetInstanceUID);

  if (!displaySet) {
    return false;
-  }
-
-  // 2D MPR is not currently available for 4D datasets.
-
-  // Assuming that slices at different time have the same position, here we just check if
-  // there are multiple slices for the same ImagePositionPatient and disable MPR.
-
-  // A better heuristic would be checking 4D tags, e.g. the presence of multiple TemporalPositionIdentifier values.
-  // However, some studies (e.g. https://github.com/OHIF/Viewers/issues/2113) do not have such tags.
-
-  for (let ii = 0; ii < displaySet.numImageFrames; ++ii) {
-    const image = displaySet.images[ii];
-    if (!image) continue;
-
-    const imageIdControl = image.getImageId();
-    const instanceMetadataControl = cornerstone.metaData.get(
-      'instance',
-      imageIdControl
-    );
-
-    if (
-      !instanceMetadataControl ||
-      instanceMetadataControl === undefined ||
-      !instanceMetadataControl.ImagePositionPatient ||
-      instanceMetadataControl.ImagePositionPatient === undefined
-    ) {
-      // if ImagePositionPatient is missing, skip the 4D datasets check.
-      // do not return false, because it could be a 3D dataset.
-      continue;
-    }
-
-    let xImagePositionPatientControl =
-      instanceMetadataControl.ImagePositionPatient[0];
-    let yImagePositionPatientControl =
-      instanceMetadataControl.ImagePositionPatient[1];
-    let zImagePositionPatientControl =
-      instanceMetadataControl.ImagePositionPatient[2];
-
-    for (let jj = ii + 1; jj < displaySet.numImageFrames; ++jj) {
-      const image = displaySet.images[jj];
-      if (!image) continue;
-
-      const imageId = image.getImageId();
-      const instanceMetadata = cornerstone.metaData.get('instance', imageId);
-
-      if (
-        !instanceMetadata ||
-        instanceMetadata === undefined ||
-        !instanceMetadata.ImagePositionPatient ||
-        instanceMetadata.ImagePositionPatient === undefined
-      ) {
-        // if ImagePositionPatient is missing, skip the 4D datasets check.
-        // do not return false, because it could be a 3D dataset.
-        continue;
-      }
-
-      let xImagePositionPatient = instanceMetadata.ImagePositionPatient[0];
-      let yImagePositionPatient = instanceMetadata.ImagePositionPatient[1];
-      let zImagePositionPatient = instanceMetadata.ImagePositionPatient[2];
-
-      // ImagePositionPatient is float
-      if (
-        Math.abs( xImagePositionPatientControl - xImagePositionPatient ) < 1e-6 &&
-        Math.abs( yImagePositionPatientControl - yImagePositionPatient ) < 1e-6 &&
-        Math.abs( zImagePositionPatientControl - zImagePositionPatient ) < 1e-6
-      ) {
-        return false;
-      }
-    }
-  }
+  };

  return displaySet.isReconstructable;
 };

-const selectDisplaySetInstanceUID = state => {
-  if (
-    state.viewports.viewportSpecificData[state.viewports.activeViewportIndex]
-  ) {
-    return state.viewports.viewportSpecificData[
-      state.viewports.activeViewportIndex
-    ].displaySetInstanceUID;
-  } else {
-    return '';
-  }
-};
-
-const selectStudyInstanceUID = state => {
-  if (
-    state.viewports.viewportSpecificData[state.viewports.activeViewportIndex]
-  ) {
-    return state.viewports.viewportSpecificData[
-      state.viewports.activeViewportIndex
-    ].StudyInstanceUID;
-  } else {
-    return '';
-  }
-};
-
-const stateSelector = createSelector(
-  [selectDisplaySetInstanceUID, selectStudyInstanceUID],
-  (displaySetInstanceUID, StudyInstanceUID) => {
-    return {
-      displaySetInstanceUID,
-      StudyInstanceUID,
-    };
-  }
-);
-
-function VTKMPRToolbarButton({ toolbarClickCallback, button, isActive }) {
+function VTKMPRToolbarButton({
+  parentContext,
+  toolbarClickCallback,
+  button,
+  activeButtons,
+  isActive,
+  className,
+}) {
  const { id, label, icon } = button;
-  const { displaySetInstanceUID, StudyInstanceUID } = useSelector(
-    stateSelector
-  );
+  const { viewportSpecificData, activeViewportIndex } = useSelector(state => {
+    const { viewports = {} } = state;
+    const { viewportSpecificData, activeViewportIndex } = viewports;

-  const isVisible = useMemo(() => {
-    return _isDisplaySetReconstructable(
-      displaySetInstanceUID,
-      StudyInstanceUID
-    );
-  }, [displaySetInstanceUID, StudyInstanceUID]);
+    return {
+      viewportSpecificData,
+      activeViewportIndex,
+    }
+  });
+
+  isVisible = _isDisplaySetReconstructable(
+    viewportSpecificData,
+    activeViewportIndex,
+  );

  return (
    <React.Fragment>
@@ -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.

+## [2.13.3](https://github.com/OHIF/Viewers/compare/@ohif/core@2.13.2...@ohif/core@2.13.3) (2021-03-26)
+
+**Note:** Version bump only for package @ohif/core
+
+
+
+
+
+## [2.13.2](https://github.com/OHIF/Viewers/compare/@ohif/core@2.13.1...@ohif/core@2.13.2) (2021-03-25)
+
+
+### Bug Fixes
+
+* IDC-2288: Update toolbar tabs after derived displayset loaded ([#2307](https://github.com/OHIF/Viewers/issues/2307)) ([6e723eb](https://github.com/OHIF/Viewers/commit/6e723ebced58852007ca553792c740976cfc4201))
+
+
+
+
+
 ## [2.13.1](https://github.com/OHIF/Viewers/compare/@ohif/core@2.13.0...@ohif/core@2.13.1) (2021-03-09)

 **Note:** Version bump only for package @ohif/core
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/core",
-  "version": "2.13.1",
+  "version": "2.13.3",
  "description": "Generic business logic for web-based medical imaging applications",
  "author": "OHIF Core Team",
  "license": "MIT",
@@ -767,6 +767,16 @@ const isMultiFrame = instance => {
  return instance.getTagValue('NumberOfFrames') > 1;
 };

+/**
+ * Creates a display set for a series.
+ * Checks if a series is reconstructable to a 3D volume.
+ * If reconstructable, the frames are sorted.
+ *
+ * @param {SeriesMetadata} series The series metadata object from which the display sets will be created
+ * @param {Object[]} instances An array of `OHIFInstanceMetadata` objects.
+ *
+ * @returns {Object} imageSet.
+ */
 const makeDisplaySet = (series, instances) => {
  const instance = instances[0];
  const imageSet = new ImageSet(instances);
@@ -804,18 +814,22 @@ const makeDisplaySet = (series, instances) => {
    imageSet.getImage(0).getTagValue('InstanceNumber')
  );

-  const isReconstructable = isDisplaySetReconstructable(instances);
-
-  imageSet.isReconstructable = isReconstructable.value;
+  const displayReconstructableInfo = isDisplaySetReconstructable(instances);
+  imageSet.isReconstructable = displayReconstructableInfo.value;

  if (shallSort && imageSet.isReconstructable) {
    imageSet.sortByImagePositionPatient();
  }

-  if (isReconstructable.missingFrames) {
+  if (displayReconstructableInfo.missingFrames) {
    // TODO -> This is currently unused, but may be used for reconstructing
    // Volumes with gaps later on.
-    imageSet.missingFrames = isReconstructable.missingFrames;
+    imageSet.missingFrames = displayReconstructableInfo.missingFrames;
+  }
+
+  if (!imageSet.displayReconstructableInfo) {
+    // It is not reconstrabale Save type of warning
+    imageSet.warningIssues = displayReconstructableInfo.warningIssues;
  }

  return imageSet;
@@ -0,0 +1,11 @@
+const ReconstructionIssues = {
+  DATASET_4D: 'datasetis4D',
+  VARYING_IMAGESDIMENSIONS: 'imagesdimensionsvarying',
+  VARYING_IMAGESCOMPONENTS: 'imagescomponentsvarying',
+  VARYING_IMAGESORIENTATION: 'imagesorientationvarying',
+  MISSING_FRAMES: 'missingframes',
+  IRREGULAR_SPACING: 'irregularspacing',
+  MULTIFFRAMES: 'multiframe',
+};
+
+export {ReconstructionIssues};
@@ -1,7 +1,12 @@
+import { ReconstructionIssues } from './../enums.js';
+
+
 /**
 * Checks if a series is reconstructable to a 3D volume.
 *
 * @param {Object[]} instances An array of `OHIFInstanceMetadata` objects.
+ *
+ * @returns {Object} reconstructable value, missingFrames and warningIssues.
 */
 export default function isDisplaySetReconstructable(instances) {
  if (!instances.length) {
@@ -29,12 +34,28 @@ export default function isDisplaySetReconstructable(instances) {
  }
 }

+/**
+ * Process reconstructable multiframes checks
+ * TODO: deal with multriframe checks! return false for now as can't reconstruct.
+ *
+ * @param {Object} instanceof `OHIFInstanceMetadata` objects. Currently not used.
+ *
+ * @returns {Object} reconstructable value and warningIssues.
+ */
 function processMultiframe(instance) {
-  //TODO: deal with multriframe checks! return false for now as can't reconstruct.
-  return { value: false };
+  const warningIssues = [ReconstructionIssues.MULTIFRAMES];
+  return { value: false, warningIssues };
 }

+/**
+ * Process reconstructable single frame checks
+ *
+ * @param {Object[]} instances An array of `OHIFInstanceMetadata` objects.
+ *
+ * @returns {Object} reconstructable value, missingFrames and warningIssues.
+ */
 function processSingleframe(instances) {
+  const n = instances.length;
  const firstImage = instances[0].getData().metadata;
  const firstImageRows = firstImage.Rows;
  const firstImageColumns = firstImage.Columns;
@@ -42,12 +63,13 @@ function processSingleframe(instances) {
  const firstImageOrientationPatient = firstImage.ImageOrientationPatient;
  const firstImagePositionPatient = firstImage.ImagePositionPatient;

+  const warningIssues = [];
  // Can't reconstruct if we:
  // -- Have a different dimensions within a displaySet.
  // -- Have a different number of components within a displaySet.
  // -- Have different orientations within a displaySet.
-  for (let i = 1; i < instances.length; i++) {
-    const instance = instances[i].getData().metadata;
+  for (let ii = 1; ii < n; ++ii) {
+    const instance = instances[ii].getData().metadata;
    const {
      Rows,
      Columns,
@@ -55,13 +77,16 @@ function processSingleframe(instances) {
      ImageOrientationPatient,
    } = instance;

-    if (
-      Rows !== firstImageRows ||
-      Columns !== firstImageColumns ||
-      SamplesPerPixel !== firstImageSamplesPerPixel ||
-      !_isSameOrientation(ImageOrientationPatient, firstImageOrientationPatient)
-    ) {
-      return { value: false };
+    if (Rows !== firstImageRows || Columns !== firstImageColumns) {
+      warningIssues.push(ReconstructionIssues.VARYING_IMAGESDIMENSIONS);
+    } else if (SamplesPerPixel !== firstImageSamplesPerPixel) {
+      warningIssues.push(ReconstructionIssues.VARYING_IMAGESCOMPONENTS);
+    } else if (!_isSameArray(ImageOrientationPatient, firstImageOrientationPatient)) {
+      warningIssues.push(ReconstructionIssues.VARYING_IMAGESORIENTATION);
+    }
+
+    if (warningIssues.length !== 0) {
+      break;
    }
  }

@@ -70,52 +95,101 @@ function processSingleframe(instances) {
  // Check if frame spacing is approximately equal within a spacingTolerance.
  // If spacing is on a uniform grid but we are missing frames,
  // Allow reconstruction, but pass back the number of missing frames.
-  if (instances.length > 2) {
-    const lastIpp = instances[instances.length - 1].getData().metadata
+  if (n > 2) {
+    const lastIpp = instances[n - 1].getData().metadata
      .ImagePositionPatient;

    // We can't reconstruct if we are missing ImagePositionPatient values
-    if (!firstImagePositionPatient || !lastIpp) {
-      return { value: false };
-    }
+    if (firstImagePositionPatient && lastIpp) {
+      const averageSpacingBetweenFrames =
+        _getPerpendicularDistance(firstImagePositionPatient, lastIpp) /
+        (n - 1);

-    const averageSpacingBetweenFrames =
-      _getPerpendicularDistance(firstImagePositionPatient, lastIpp) /
-      (instances.length - 1);
+      let previousImagePositionPatient = firstImagePositionPatient;

-    let previousImagePositionPatient = firstImagePositionPatient;
+      for (let ii = 1; ii < n; ++ii) {
+        const instance = instances[ii].getData().metadata;
+        const { ImagePositionPatient } = instance;

-    for (let i = 1; i < instances.length; i++) {
-      const instance = instances[i].getData().metadata;
-      const { ImagePositionPatient } = instance;
+        const spacingBetweenFrames = _getPerpendicularDistance(
+          ImagePositionPatient,
+          previousImagePositionPatient
+        );
+        const spacingIssue = _getSpacingIssue(
+          spacingBetweenFrames,
+          averageSpacingBetweenFrames
+        );

-      const spacingBetweenFrames = _getPerpendicularDistance(
-        ImagePositionPatient,
-        previousImagePositionPatient
-      );
-      const spacingIssue = _getSpacingIssue(
-        spacingBetweenFrames,
-        averageSpacingBetweenFrames
-      );
+        if (spacingIssue) {
+          const issue = spacingIssue.issue;

-      if (spacingIssue) {
-        const issue = spacingIssue.issue;
-
-        if (issue === reconstructionIssues.MISSING_FRAMES) {
-          missingFrames += spacingIssue.missingFrames;
-        } else if (issue === reconstructionIssues.IRREGULAR_SPACING) {
-          return { value: false };
+          if (issue === ReconstructionIssues.MISSING_FRAMES) {
+            missingFrames += spacingIssue.missingFrames;
+          } else if (issue === ReconstructionIssues.IRREGULAR_SPACING) {
+            warningIssues.push(issue);
+            break;
+          }
        }
-      }

-      previousImagePositionPatient = ImagePositionPatient;
+        previousImagePositionPatient = ImagePositionPatient;
+      }
    }
  }

-  return { value: true, missingFrames };
+  // check if dataset is 4D
+  if (_isDataset4D(instances)) {
+    warningIssues.push(ReconstructionIssues.DATASET_4D);
+  }
+
+  return { value: warningIssues.length === 0 ? true : false, missingFrames, warningIssues };
 }

-function _isSameOrientation(iop1, iop2) {
+/**
+ *  Check if 4D dataset.
+ *
+ *  Assuming that slices at different time have the same position, here we just check if
+ *  there are multiple slices for the same ImagePositionPatient and disable MPR.
+ *
+ *  A better heuristic would be checking 4D tags, e.g. the presence of multiple TemporalPositionIdentifier values.
+ *  However, some studies (e.g. https://github.com/OHIF/Viewers/issues/2113) do not have such tags.
+ *
+ * @param {Object[]} instances An array of `OHIFInstanceMetadata` objects.
+ *
+ * @returns {boolean} reconstructable value.
+ */
+ function _isDataset4D(instances) {
+  const n = instances.length;
+  for (let ii = 0; ii < n; ++ii) {
+    const instanceMetadataControl = instances[ii].getData().metadata;
+    if (
+      !instanceMetadataControl ||
+      instanceMetadataControl === undefined ||
+      !instanceMetadataControl.ImagePositionPatient ||
+      instanceMetadataControl.ImagePositionPatient === undefined
+    ) {
+      continue;
+    }
+    for (let jj = ii + 1; jj < n; ++jj) {
+      const instanceMetadata = instances[jj].getData().metadata;
+      if (
+        !instanceMetadata ||
+        instanceMetadata === undefined ||
+        !instanceMetadata.ImagePositionPatient ||
+        instanceMetadata.ImagePositionPatient === undefined
+      ) {
+        continue;
+      }
+
+      if (_isSameArray(instanceMetadataControl.ImagePositionPatient, instanceMetadata.ImagePositionPatient)) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+function _isSameArray(iop1, iop2) {
  if (iop1 === undefined || !iop2 === undefined) {
    return;
  }
@@ -156,12 +230,12 @@ function _getSpacingIssue(spacing, averageSpacing) {

  if (errorForEachSpacing < spacingTolerance * averageSpacing) {
    return {
-      issue: reconstructionIssues.MISSING_FRAMES,
+      issue: ReconstructionIssues.MISSING_FRAMES,
      missingFrames: numberOfSpacings - 1,
    };
  }

-  return { issue: reconstructionIssues.IRREGULAR_SPACING };
+  return { issue: ReconstructionIssues.IRREGULAR_SPACING };
 }

 function _getPerpendicularDistance(a, b) {
@@ -173,7 +247,3 @@ function _getPerpendicularDistance(a, b) {
 }

 const constructableModalities = ['MR', 'CT', 'PT', 'NM'];
-const reconstructionIssues = {
-  MISSING_FRAMES: 'missingframes',
-  IRREGULAR_SPACING: 'irregularspacing',
-};
@@ -49,9 +49,7 @@ import studyMetadataManager from './studyMetadataManager';
 */
 const loadAndCacheDerivedDisplaySets = (referencedDisplaySet, studies) => {
  const { StudyInstanceUID, SeriesInstanceUID } = referencedDisplaySet;
-
  const promises = [];
-
  const studyMetadata = studyMetadataManager.get(StudyInstanceUID);

  if (!studyMetadata) {
@@ -112,6 +110,16 @@ const loadAndCacheDerivedDisplaySets = (referencedDisplaySet, studies) => {
    promises.push(recentDisplaySet.load(referencedDisplaySet, studies));
  });

+  Promise.all(promises).then(() => {
+    /*
+     * TODO: Improve the way we notify parts of the app
+     * that depends on derived display sets to be loaded.
+     * (Implement pubsub for better tracking of derived display sets)
+     */
+    const event = new CustomEvent('deriveddisplaysetsloadedandcached');
+    document.dispatchEvent(event);
+  });
+
  return promises;
 };

@@ -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.9.1](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.9.0...@ohif/ui@1.9.1) (2021-03-26)
+
+**Note:** Version bump only for package @ohif/ui
+
+
+
+
+
 # [1.9.0](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.8.2...@ohif/ui@1.9.0) (2021-03-04)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/ui",
-  "version": "1.9.0",
+  "version": "1.9.1",
  "description": "A set of React components for Medical Imaging Viewers",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -28,6 +28,7 @@ function StudyBrowser(props) {
                SeriesDescription,
                SeriesNumber,
                stackPercentComplete,
+                hasWarnings,
              } = thumb;

              return (
@@ -50,6 +51,7 @@ function StudyBrowser(props) {
                    numImageFrames={numImageFrames}
                    SeriesDescription={SeriesDescription}
                    SeriesNumber={SeriesNumber}
+                    hasWarnings={hasWarnings}
                    stackPercentComplete={stackPercentComplete}
                    // Events
                    onClick={onThumbnailClick.bind(
@@ -1,8 +1,11 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { useDrag } from 'react-dnd';
 import ImageThumbnail from './ImageThumbnail';
 import classNames from 'classnames';
+import { Icon } from './../../elements/Icon';
+import { Tooltip } from './../tooltip';
+import { OverlayTrigger } from './../overlayTrigger';

 import './Thumbnail.styl';

@@ -11,7 +14,22 @@ function ThumbnailFooter({
  SeriesNumber,
  InstanceNumber,
  numImageFrames,
+  hasWarnings
 }) {
+  const [warningList, warningListSet] = useState([]);
+
+  useEffect(() => {
+    let unmounted = false
+    hasWarnings.then(response => {
+      if (!unmounted) {
+        warningListSet(response)
+      }
+    })
+    return () => {
+      unmounted = true
+    }
+  }, [])
+
  const infoOnly = !SeriesDescription;

  const getInfo = (value, icon, className = '') => {
@@ -22,28 +40,73 @@ function ThumbnailFooter({
      </div>
    );
  };
+
+  const getWarningContent = (warningList) => {
+    if (Array.isArray(warningList)) {
+      const listedWarnings = warningList.map((warn, index) => {
+        return <li key={index}>{warn}</li>;
+      });
+
+      return <ol>{listedWarnings}</ol>;
+    } else {
+      return <React.Fragment>{warningList}</React.Fragment>;
+    }
+  };
+
+  const getWarningInfo = (SeriesNumber, warningList) => {
+      return(
+        <React.Fragment>
+        {warningList.length != 0 ? (
+          <OverlayTrigger
+            key={SeriesNumber}
+            placement="left"
+            overlay={
+              <Tooltip
+                placement="left"
+                className="in tooltip-warning"
+                id="tooltip-left"
+              >
+                <div className="warningTitle">Series Inconsistencies</div>
+                <div className="warningContent">{getWarningContent(warningList)}</div>
+              </Tooltip>
+            }
+          >
+            <div className={classNames('warning')}>
+              <span className="warning-icon">
+                <Icon name="exclamation-triangle" />
+              </span>
+            </div>
+          </OverlayTrigger>
+        ) : (
+          <React.Fragment></React.Fragment>
+          )}
+      </React.Fragment>
+      );
+  };
  const getSeriesInformation = (
    SeriesNumber,
    InstanceNumber,
-    numImageFrames
+    numImageFrames,
+    warningList
  ) => {
    if (!SeriesNumber && !InstanceNumber && !numImageFrames) {
      return;
    }
-
-    return (
+    const seriesInformation =
      <div className="series-information">
        {getInfo(SeriesNumber, 'S:')}
        {getInfo(InstanceNumber, 'I:')}
        {getInfo(numImageFrames, '', 'image-frames')}
+        {getWarningInfo(SeriesNumber, warningList)}
      </div>
-    );
+
+    return (seriesInformation);
  };

  return (
    <div className={classNames('series-details', { 'info-only': infoOnly })}>
      <div className="series-description">{SeriesDescription}</div>
-      {getSeriesInformation(SeriesNumber, InstanceNumber, numImageFrames)}
+      {getSeriesInformation(SeriesNumber, InstanceNumber, numImageFrames, warningList)}
    </div>
  );
 }
@@ -60,6 +123,7 @@ function Thumbnail(props) {
    numImageFrames,
    SeriesDescription,
    SeriesNumber,
+    hasWarnings,
    stackPercentComplete,
    StudyInstanceUID,
    onClick,
@@ -126,13 +190,14 @@ Thumbnail.propTypes = {
  stackPercentComplete: PropTypes.number,
  /**
  altImageText will be used when no imageId or imageSrc is provided.
-It will be displayed inside the <div>. This is useful when it is difficult
+  It will be displayed inside the <div>. This is useful when it is difficult
  to make a preview for a type of DICOM series (e.g. DICOM-SR)
  */
  altImageText: PropTypes.string,
  SeriesDescription: PropTypes.string,
  SeriesNumber: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
  InstanceNumber: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  hasWarnings: PropTypes.instanceOf(Promise),
  numImageFrames: PropTypes.number,
  onDoubleClick: PropTypes.func,
  onClick: PropTypes.func,
@@ -78,6 +78,17 @@
          height: 11px
          width: 11px

+    .warning
+      margin: auto 0;
+      opacity: 1
+      color: #e29e4a;
+
+      svg
+        width: 16px;
+        height: 14px;
+        pointer-events: inherit;
+
+
    .value
      color: var(--text-secondary-color);
      display: inline-block
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [4.9.7](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.9.6...@ohif/viewer@4.9.7) (2021-03-26)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.9.6](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.9.5...@ohif/viewer@4.9.6) (2021-03-26)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.9.5](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.9.4...@ohif/viewer@4.9.5) (2021-03-25)
+
+
+### Bug Fixes
+
+* IDC-2288: Update toolbar tabs after derived displayset loaded ([#2307](https://github.com/OHIF/Viewers/issues/2307)) ([6e723eb](https://github.com/OHIF/Viewers/commit/6e723ebced58852007ca553792c740976cfc4201))
+
+
+
+
+
 ## [4.9.4](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.9.3...@ohif/viewer@4.9.4) (2021-03-19)

 **Note:** Version bump only for package @ohif/viewer
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/viewer",
-  "version": "4.9.4",
+  "version": "4.9.7",
  "description": "OHIF Viewer",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -49,8 +49,8 @@
  },
  "dependencies": {
    "@babel/runtime": "^7.5.5",
-    "@ohif/core": "^2.13.1",
-    "@ohif/extension-cornerstone": "^2.10.5",
+    "@ohif/core": "^2.13.3",
+    "@ohif/extension-cornerstone": "^2.10.6",
    "@ohif/extension-debugging": "^0.2.1",
    "@ohif/extension-dicom-html": "^1.3.4",
    "@ohif/extension-dicom-microscopy": "^0.52.0",
@@ -58,9 +58,9 @@
    "@ohif/extension-dicom-rt": "^0.6.7",
    "@ohif/extension-dicom-segmentation": "^0.6.1",
    "@ohif/extension-lesion-tracker": "^0.2.1",
-    "@ohif/extension-vtk": "^1.11.2",
+    "@ohif/extension-vtk": "^1.11.4",
    "@ohif/i18n": "^0.53.0",
-    "@ohif/ui": "^1.9.0",
+    "@ohif/ui": "^1.9.1",
    "@tanem/react-nprogress": "^1.1.25",
    "classnames": "^2.2.6",
    "core-js": "^3.2.1",
@@ -59,6 +59,9 @@ class ToolbarRow extends Component {
    this.seriesPerStudyCount = [];

    this._handleBuiltIn = _handleBuiltIn.bind(this);
+    this._onDerivedDisplaySetsLoadedAndCached = this._onDerivedDisplaySetsLoadedAndCached.bind(
+      this
+    );

    this.updateButtonGroups();
  }
@@ -109,6 +112,32 @@ class ToolbarRow extends Component {
    });
  }

+  componentDidMount() {
+    /*
+     * TODO: Improve the way we notify parts of the app
+     * that depends on derived display sets to be loaded.
+     * (Implement pubsub for better tracking of derived display sets)
+     */
+    document.addEventListener(
+      'deriveddisplaysetsloadedandcached',
+      this._onDerivedDisplaySetsLoadedAndCached
+    );
+  }
+
+  componentWillUnmount() {
+    document.removeEventListener(
+      'deriveddisplaysetsloadedandcached',
+      this._onDerivedDisplaySetsLoadedAndCached
+    );
+  }
+
+  _onDerivedDisplaySetsLoadedAndCached() {
+    this.updateButtonGroups();
+    this.setState({
+      toolbarButtons: _getVisibleToolbarButtons.call(this),
+    });
+  }
+
  componentDidUpdate(prevProps) {
    const activeContextsChanged =
      prevProps.activeContexts !== this.props.activeContexts;
@@ -12,6 +12,7 @@ import ConnectedViewerMain from './ConnectedViewerMain.js';
 import SidePanel from './../components/SidePanel.js';
 import ErrorBoundaryDialog from './../components/ErrorBoundaryDialog';
 import { extensionManager } from './../App.js';
+import { ReconstructionIssues } from './../../../core/src/enums.js';

 // Contexts
 import WhiteLabelingContext from '../context/WhiteLabelingContext.js';
@@ -271,6 +272,7 @@ class Viewer extends Component {
            activeViewport={
              this.props.viewports[this.props.activeViewportIndex]
            }
+            isDerivedDisplaySetsLoaded={this.props.isDerivedDisplaySetsLoaded}
            isLeftSidePanelOpen={this.state.isLeftSidePanelOpen}
            isRightSidePanelOpen={this.state.isRightSidePanelOpen}
            selectedLeftSidePanel={
@@ -366,6 +368,62 @@ class Viewer extends Component {

 export default withDialog(Viewer);

+/**
+ * Async function to check if there are any inconsistences in the series
+ * (i.e. reconstructable to a 3D volume). If not reconstructable MPR is disabled.
+ * The actual computations are done in isDisplaySetReconstructable.
+ *
+ * 1) Is series multiframe?
+ * 2) Do the frames have different dimensions/numer of components/orientations?
+ * 3) Has the series any missing frames or irregular spacing?
+ * 4) Is the series 4D?
+ *
+ * @param {*object} displaySet
+ * @returns {[string]} an array of strings containing the warnings
+ */
+const _checkForSeriesInconsistencesWarnings = async function (displaySet) {
+  // NOTE: at the moment this function is async even if it does not perfom any heavy calculation.
+  //       We may add or move here some of the computations
+  //       done when creating the displaySet (see makeDisplaySet and isDisplaySetReconstructable).
+  //       the thumbnail footnotes warning react element is already set up to handle a promise.
+  const warningsList = [];
+  if (displaySet.warningIssues && displaySet.warningIssues.length !== 0) {
+    displaySet.warningIssues.forEach(warning => {
+      switch (warning) {
+        case ReconstructionIssues.DATASET_4D:
+          warningsList.push("The dataset is 4D.");
+          break;
+        case ReconstructionIssues.VARYING_IMAGESDIMENSIONS:
+          warningsList.push("The dataset frames have different dimensions (rows, columns).");
+          break;
+        case ReconstructionIssues.VARYING_IMAGESCOMPONENTS:
+          warningsList.push("The dataset frames have different components (Sample per pixel).");
+          break;
+        case ReconstructionIssues.VARYING_IMAGESORIENTATION:
+          warningsList.push("The dataset frames have different orientation.");
+          break;
+        case ReconstructionIssues.IRREGULAR_SPACING:
+          warningsList.push("The dataset frames have different pixel spacing.");
+          break;
+        case ReconstructionIssues.MULTIFFRAMES:
+          warningsList.push("The dataset is a multiframes.");
+          break;
+        default:
+          break;
+      }
+    });
+      warningsList.push('The datasets is not a reconstructable 3D volume. MPR mode is not available.');
+  }
+
+  if (displaySet.missingFrames &&
+    (!displaySet.warningIssues ||
+      (displaySet.warningIssues && !displaySet.warningIssues.find(warn => warn === ReconstructionIssues.DATASET_4D)))) {
+    warningsList.push('The datasets is missing frames: ' + displaySet.missingFrames + '.');
+  }
+
+  return warningsList
+}
+
 /**
 * What types are these? Why do we have "mapping" dropped in here instead of in
 * a mapping layer?
@@ -405,6 +463,8 @@ const _mapStudiesToThumbnails = function(studies) {
        altImageText = displaySet.Modality ? displaySet.Modality : 'UN';
      }

+      const hasWarnings = _checkForSeriesInconsistencesWarnings(displaySet)
+
      return {
        imageId,
        altImageText,
@@ -413,6 +473,7 @@ const _mapStudiesToThumbnails = function(studies) {
        InstanceNumber,
        numImageFrames,
        SeriesNumber,
+        hasWarnings,
      };
    });
Author	SHA1	Message	Date
ohif-bot	92081a097d	chore(release): publish [skip ci] - @ohif/extension-cornerstone@2.10.6 - @ohif/viewer@4.9.7	2021-03-26 18:38:58 +00:00
Igor Octaviano	ba1a33c3ac	Merge pull request #2335 from OHIF/idc-2334 IDC-2334: Resolve choppy scrolling in 2D mode	2021-03-26 15:36:07 -03:00
igoroctaviano	193ff12b6e	Fix scroll speed	2021-03-26 13:27:51 -03:00
ohif-bot	3296ffaa07	chore(release): publish [skip ci] - @ohif/extension-vtk@1.11.4 - @ohif/core@2.13.3 - @ohif/ui@1.9.1 - @ohif/viewer@4.9.6	2021-03-26 10:35:50 +00:00
Davide Punzo	0456d92462	IDC 2259: add warning UI for series inconsistencies (#2331 ) IDC 2259: add warning UI for series inconsistencies remove VTKMPRToolbarButton component memoization (it is not anymore necessary)	2021-03-26 11:32:10 +01:00
ohif-bot	db3b15e537	chore(release): publish [skip ci] - @ohif/extension-vtk@1.11.3 - @ohif/core@2.13.2 - @ohif/viewer@4.9.5	2021-03-25 16:16:14 +00:00
Igor OctavianoandDavide Punzo	6e723ebced	fix: IDC-2288: Update toolbar tabs after derived displayset loaded (#2307 ) * Update toolbar tabs after derived displayset loaded * trigger CI Co-authored-by: Davide Punzo <punzodavide@hotmail.it>	2021-03-25 17:12:20 +01:00