chore(release): publish [skip ci]

- @ohif/extension-vtk@0.52.25 - @ohif/ui@0.58.2 - @ohif/viewer@2.3.2
fix: 🐛 Limit image download size to avoid browser issues (#1112 )
2019-10-29 20:47:05 +00:00 · 2019-10-29 16:36:34 -04:00
8 changed files with 63 additions and 18 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.

+## [0.52.25](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@0.52.24...@ohif/extension-vtk@0.52.25) (2019-10-29)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
 ## [0.52.24](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@0.52.23...@ohif/extension-vtk@0.52.24) (2019-10-29)

 **Note:** Version bump only for package @ohif/extension-vtk
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-vtk",
-  "version": "0.52.24",
+  "version": "0.52.25",
  "description": "OHIF extension for VTK.js",
  "author": "OHIF",
  "license": "MIT",
@@ -53,7 +53,7 @@
  },
  "devDependencies": {
    "@ohif/core": "^1.6.0",
-    "@ohif/ui": "^0.58.1",
+    "@ohif/ui": "^0.58.2",
    "cornerstone-tools": "^4.0.9",
    "cornerstone-wado-image-loader": "^3.0.0",
    "dcmjs": "^0.6.1",
@@ -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.

+## [0.58.2](https://github.com/OHIF/Viewers/compare/@ohif/ui@0.58.1...@ohif/ui@0.58.2) (2019-10-29)
+
+
+### Bug Fixes
+
+* 🐛 Limit image download size to avoid browser issues ([#1112](https://github.com/OHIF/Viewers/issues/1112)) ([5716b71](https://github.com/OHIF/Viewers/commit/5716b71d409ee1c6f13393c8cb7f50222415e198)), closes [#1099](https://github.com/OHIF/Viewers/issues/1099)
+
+
+
+
+
 ## [0.58.1](https://github.com/OHIF/Viewers/compare/@ohif/ui@0.58.0...@ohif/ui@0.58.1) (2019-10-29)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/ui",
-  "version": "0.58.1",
+  "version": "0.58.2",
  "description": "A set of React components for Medical Imaging Viewers",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -32,6 +32,7 @@ const DownloadDialog = ({
  downloadBlob,
  defaultSize,
  minimumSize,
+  maximumSize,
  canvasClass,
 }) => {
  const [filename, setFilename] = useState(DEFAULT_FILENAME);
@@ -75,24 +76,24 @@ const DownloadDialog = ({
  }, [defaultSize, disableViewport, enableViewport, viewportElement]);

  useEffect(() => {
+    const validSize = value => (value >= minimumSize ? value : minimumSize);
    const loadAndUpdateViewports = async () => {
      const {
        image,
        width: scaledWidth,
        height: scaledHeight,
      } = await loadImage(activeViewport, viewportElement, width, height);
-
      setLastImage(image);

      toggleAnnotations(showAnnotations, viewportElement);

-      setViewportElementHeight(scaledHeight);
-      setViewportElementWidth(scaledWidth);
+      setViewportElementHeight(validSize(scaledHeight));
+      setViewportElementWidth(validSize(scaledWidth));

      setDownloadCanvas(state => ({
        ...state,
-        height: scaledHeight,
-        width: scaledWidth,
+        height: validSize(scaledHeight),
+        width: validSize(scaledWidth),
      }));

      const {
@@ -108,8 +109,8 @@ const DownloadDialog = ({
      setViewportPreview(state => ({
        ...state,
        src: dataUrl,
-        width: viewportElementWidth,
-        height: viewportElementHeight,
+        width: validSize(viewportElementWidth),
+        height: validSize(viewportElementHeight),
      }));
    };

@@ -125,10 +126,12 @@ const DownloadDialog = ({
    updateViewportPreview,
    fileType,
    downloadCanvas.ref,
+    minimumSize,
+    maximumSize,
  ]);

-  const onHeightChange = () => {
-    const newHeight = event.target.value;
+  const onHeightChange = event => {
+    const newHeight = Math.min(event.target.value, maximumSize);
    setHeight(newHeight);

    setViewportElementHeight(newHeight);
@@ -153,7 +156,7 @@ const DownloadDialog = ({
  };

  const onWidthChange = event => {
-    const newWidth = event.target.value;
+    const newWidth = Math.min(event.target.value, maximumSize);
    setWidth(newWidth);

    setViewportElementWidth(newWidth);
@@ -212,6 +215,7 @@ const DownloadDialog = ({
              <TextInput
                type="number"
                min={minimumSize}
+                max={maximumSize}
                value={width}
                label={t('Image width (px)')}
                onChange={onWidthChange}
@@ -221,6 +225,7 @@ const DownloadDialog = ({
              <TextInput
                type="number"
                min={minimumSize}
+                max={maximumSize}
                value={height}
                label={t('Image height (px)')}
                onChange={onHeightChange}
@@ -329,6 +334,7 @@ DownloadDialog.propTypes = {
  downloadBlob: PropTypes.func.isRequired,
  defaultSize: PropTypes.number.isRequired,
  minimumSize: PropTypes.number.isRequired,
+  maximumSize: PropTypes.number.isRequired,
  canvasClass: PropTypes.string.isRequired,
 };

@@ -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.3.2](https://github.com/OHIF/Viewers/compare/@ohif/viewer@2.3.1...@ohif/viewer@2.3.2) (2019-10-29)
+
+
+### Bug Fixes
+
+* 🐛 Limit image download size to avoid browser issues ([#1112](https://github.com/OHIF/Viewers/issues/1112)) ([5716b71](https://github.com/OHIF/Viewers/commit/5716b71d409ee1c6f13393c8cb7f50222415e198)), closes [#1099](https://github.com/OHIF/Viewers/issues/1099)
+
+
+
+
+
 ## [2.3.1](https://github.com/OHIF/Viewers/compare/@ohif/viewer@2.3.0...@ohif/viewer@2.3.1) (2019-10-29)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/viewer",
-  "version": "2.3.1",
+  "version": "2.3.2",
  "description": "OHIF Viewer",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -50,9 +50,9 @@
    "@ohif/extension-dicom-html": "^1.0.1",
    "@ohif/extension-dicom-microscopy": "^0.50.6",
    "@ohif/extension-dicom-pdf": "^1.0.0",
-    "@ohif/extension-vtk": "^0.52.24",
+    "@ohif/extension-vtk": "^0.52.25",
    "@ohif/i18n": "^0.51.0",
-    "@ohif/ui": "^0.58.1",
+    "@ohif/ui": "^0.58.2",
    "@tanem/react-nprogress": "^1.1.25",
    "classnames": "^2.2.6",
    "core-js": "^3.2.1",
@@ -6,6 +6,7 @@ import cornerstoneTools from 'cornerstone-tools';

 const MINIMUM_SIZE = 100;
 const DEFAULT_SIZE = 512;
+const MAX_TEXTURE_SIZE = 10000;

 const mapStateToProps = (state, ownProps) => {
  const { viewportSpecificData, activeViewportIndex } = state.viewports;
@@ -14,6 +15,7 @@ const mapStateToProps = (state, ownProps) => {

  return {
    minimumSize: MINIMUM_SIZE,
+    maximumSize: MAX_TEXTURE_SIZE,
    defaultSize: DEFAULT_SIZE,
    canvasClass: 'cornerstone-canvas',
    onClose: ownProps.toggleDownloadDialog,
@@ -74,7 +76,6 @@ const mapStateToProps = (state, ownProps) => {
            cornerstone.setViewport(viewportElement, viewport);
            cornerstone.resize(viewportElement, true);

-            const MAX_TEXTURE_SIZE = 16384;
            const newWidth = Math.min(width || image.width, MAX_TEXTURE_SIZE);
            const newHeight = Math.min(
              height || image.height,
@@ -108,7 +109,15 @@ const mapStateToProps = (state, ownProps) => {
        return window.navigator.msSaveBlob(blob, file);
      }

-      return cornerstoneTools.SaveAs(viewportElement, file, mimetype);
+      viewportElement.querySelector('canvas').toBlob(blob => {
+        const URLObj = window.URL || window.webkitURL;
+        const a = document.createElement('a');
+        a.href = URLObj.createObjectURL(blob);
+        a.download = file;
+        document.body.appendChild(a);
+        a.click();
+        document.body.removeChild(a);
+      });
    },
  };
 };