chore(release): publish [skip ci]

- @ohif/extension-vtk@1.7.15
 - @ohif/ui@1.5.7
 - @ohif/viewer@4.5.23

extensions/vtk/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.7.15](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.7.14...@ohif/extension-vtk@1.7.15) (2020-11-02)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.7.14](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.7.13...@ohif/extension-vtk@1.7.14) (2020-10-20)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.7.13](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.7.12...@ohif/extension-vtk@1.7.13) (2020-10-15)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.7.12](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.7.11...@ohif/extension-vtk@1.7.12) (2020-10-13)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
 ## [1.7.11](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.7.10...@ohif/extension-vtk@1.7.11) (2020-10-13)
 
 **Note:** Version bump only for package @ohif/extension-vtk

extensions/vtk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-vtk",
-  "version": "1.7.11",
+  "version": "1.7.15",
   "description": "OHIF extension for VTK.js",
   "author": "OHIF",
   "license": "MIT",
@@ -50,11 +50,11 @@
   "dependencies": {
     "@babel/runtime": "^7.5.5",
     "lodash.throttle": "^4.1.1",
-    "react-vtkjs-viewport": "^0.13.1"
+    "react-vtkjs-viewport": "^0.14.1"
   },
   "devDependencies": {
     "@ohif/core": "^2.10.7",
-    "@ohif/ui": "^1.5.6",
+    "@ohif/ui": "^1.5.7",
     "cornerstone-tools": "^4.20.1",
     "cornerstone-wado-image-loader": "^3.1.0",
     "dicom-parser": "^1.8.3",

extensions/vtk/src/commandsModule.js

@@ -14,7 +14,7 @@ import OHIFVTKViewport from './OHIFVTKViewport';
 
 const { BlendMode } = Constants;
 
-const commandsModule = ({ commandsManager }) => {
+const commandsModule = ({ commandsManager, UINotificationService }) => {
   // TODO: Put this somewhere else
   let apis = {};
 
@@ -270,7 +270,10 @@ const commandsModule = ({ commandsManager }) => {
       apis.forEach((api, apiIndex) => {
         const istyle = vtkInteractorStyleMPRRotate.newInstance();
 
-        api.setInteractorStyle({ istyle, configuration: { apis, apiIndex } });
+        api.setInteractorStyle({
+          istyle,
+          configuration: { apis, apiIndex, uid: api.uid },
+        });
       });
     },
     enableCrosshairsTool: () => {
@@ -318,10 +321,14 @@ const commandsModule = ({ commandsManager }) => {
         },
       };
 
-      apis.forEach(api => {
+      apis.forEach((api, apiIndex) => {
         const istyle = vtkInteractorStyleMPRWindowLevel.newInstance();
 
-        api.setInteractorStyle({ istyle, callbacks });
+        api.setInteractorStyle({
+          istyle,
+          callbacks,
+          configuration: { apis, apiIndex, uid: api.uid },
+        });
       });
     },
     setSlabThickness: ({ slabThickness }) => {
@@ -434,8 +441,43 @@ const commandsModule = ({ commandsManager }) => {
         api.svgWidgets.rotatableCrosshairsWidget.setApis(apis);
       });
 
+      const firstApi = apis[0];
+
       // Initialise crosshairs
       apis[0].svgWidgets.rotatableCrosshairsWidget.resetCrosshairs(apis, 0);
+
+      // Check if we have full WebGL 2 support
+      const openGLRenderWindow = apis[0].genericRenderWindow.getOpenGLRenderWindow();
+
+      if (!openGLRenderWindow.getWebgl2()) {
+        // Throw a warning if we don't have WebGL 2 support,
+        // And the volume is too big to fit in a 2D texture
+
+        const openGLContext = openGLRenderWindow.getContext();
+        const maxTextureSizeInBytes = openGLContext.getParameter(
+          openGLContext.MAX_TEXTURE_SIZE
+        );
+
+        const maxBufferLengthFloat32 =
+          (maxTextureSizeInBytes * maxTextureSizeInBytes) / 4;
+
+        const dimensions = firstApi.volumes[0]
+          .getMapper()
+          .getInputData()
+          .getDimensions();
+
+        const volumeLength = dimensions[0] * dimensions[1] * dimensions[2];
+
+        if (volumeLength > maxBufferLengthFloat32) {
+          UINotificationService.show({
+            title: 'Browser does not support WebGL 2',
+            message:
+              'This volume is too large to fit in WebGL 1 textures and will display incorrectly. Please use a different browser to view this data',
+            type: 'error',
+            autoClose: false,
+          });
+        }
+      }
     },
   };
 

extensions/vtk/src/index.js

@@ -27,8 +27,9 @@ const vtkExtension = {
   getToolbarModule() {
     return toolbarModule;
   },
-  getCommandsModule({ commandsManager }) {
-    return commandsModule({ commandsManager });
+  getCommandsModule({ commandsManager, servicesManager }) {
+    const { UINotificationService } = servicesManager.services;
+    return commandsModule({ commandsManager, UINotificationService });
   },
 };
 

extensions/vtk/src/toolbarModule.js

@@ -34,6 +34,7 @@ const definitions = [
     commandName: 'resetMPRView',
     commandOptions: {},
   },
+  /*
   {
     id: 'Rotate',
     label: 'Rotate',
@@ -43,6 +44,7 @@ const definitions = [
     commandName: 'enableRotateTool',
     commandOptions: {},
   },
+  */
   /*
   {
     id: 'setBlendModeToComposite',

platform/ui/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.
 
+## [1.5.7](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.5.6...@ohif/ui@1.5.7) (2020-11-02)
+
+
+### Bug Fixes
+
+* Reordered definitions in providers to prevent uninitialized var access ([#2108](https://github.com/OHIF/Viewers/issues/2108)) ([619f361](https://github.com/OHIF/Viewers/commit/619f3615109d6cc4c69ff2f9fedbf83bd9309719))
+
+
+
+
+
 ## [1.5.6](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.5.5...@ohif/ui@1.5.6) (2020-10-06)
 
 **Note:** Version bump only for package @ohif/ui

platform/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/ui",
-  "version": "1.5.6",
+  "version": "1.5.7",
   "description": "A set of React components for Medical Imaging Viewers",
   "author": "OHIF Contributors",
   "license": "MIT",

platform/ui/src/contextProviders/DialogProvider.js

@@ -45,36 +45,6 @@ const DialogProvider = ({ children, service }) => {
     };
   };
 
-  /**
-   * Sets the implementation of a dialog service that can be used by extensions.
-   *
-   * @returns void
-   */
-  useEffect(() => {
-    if (service) {
-      service.setServiceImplementation({ create, dismiss, dismissAll });
-    }
-  }, [create, dismiss, service]);
-
-  /**
-   * UI Dialog
-   *
-   * @typedef {Object} DialogProps
-   * @property {string} id The dialog id.
-   * @property {DialogContent} content The dialog content.
-   * @property {Object} contentProps The dialog content props.
-   * @property {boolean} isDraggable Controls if dialog content is draggable or not.
-   * @property {boolean} showOverlay Controls dialog overlay.
-   * @property {boolean} centralize Center the dialog on the screen.
-   * @property {boolean} preservePosition Use last position instead of default.
-   * @property {ElementPosition} defaultPosition Specifies the `x` and `y` that the dragged item should start at.
-   * @property {Function} onStart Called when dragging starts. If `false` is returned any handler, the action will cancel.
-   * @property {Function} onStop Called when dragging stops.
-   * @property {Function} onDrag Called while dragging.
-   */
-
-  useEffect(() => _bringToFront(lastDialogId), [_bringToFront, lastDialogId]);
-
   /**
    * Creates a new dialog and return its id.
    *
@@ -109,20 +79,15 @@ const DialogProvider = ({ children, service }) => {
   );
 
   /**
-   * Dismisses all dialogs.
+   * Sets the implementation of a dialog service that can be used by extensions.
    *
    * @returns void
    */
-  const dismissAll = () => {
-    setDialogs([]);
-  };
-
-  /**
-   * Indicate if there are no dialogs present.
-   *
-   * @returns True if no dialogs are present.
-   */
-  const isEmpty = () => dialogs && dialogs.length < 1;
+  useEffect(() => {
+    if (service) {
+      service.setServiceImplementation({ create, dismiss, dismissAll });
+    }
+  }, [create, dismiss, service]);
 
   /**
    * Moves the dialog to the foreground if clicked.
@@ -139,6 +104,41 @@ const DialogProvider = ({ children, service }) => {
     });
   }, []);
 
+  /**
+   * UI Dialog
+   *
+   * @typedef {Object} DialogProps
+   * @property {string} id The dialog id.
+   * @property {DialogContent} content The dialog content.
+   * @property {Object} contentProps The dialog content props.
+   * @property {boolean} isDraggable Controls if dialog content is draggable or not.
+   * @property {boolean} showOverlay Controls dialog overlay.
+   * @property {boolean} centralize Center the dialog on the screen.
+   * @property {boolean} preservePosition Use last position instead of default.
+   * @property {ElementPosition} defaultPosition Specifies the `x` and `y` that the dragged item should start at.
+   * @property {Function} onStart Called when dragging starts. If `false` is returned any handler, the action will cancel.
+   * @property {Function} onStop Called when dragging stops.
+   * @property {Function} onDrag Called while dragging.
+   */
+
+  useEffect(() => _bringToFront(lastDialogId), [_bringToFront, lastDialogId]);
+
+  /**
+   * Dismisses all dialogs.
+   *
+   * @returns void
+   */
+  const dismissAll = () => {
+    setDialogs([]);
+  };
+
+  /**
+   * Indicate if there are no dialogs present.
+   *
+   * @returns True if no dialogs are present.
+   */
+  const isEmpty = () => dialogs && dialogs.length < 1;
+
   const renderDialogs = () =>
     dialogs.map(dialog => {
       const {
@@ -219,14 +219,12 @@ const DialogProvider = ({ children, service }) => {
         </Draggable>
       );
 
-      return (
-        showOverlay ? (
-          <div className="Overlay" key={id}>
-            {dragableItem()}
-          </div>
-        ) : (
-            dragableItem()
-          )
+      return showOverlay ? (
+        <div className="Overlay" key={id}>
+          {dragableItem()}
+        </div>
+      ) : (
+        dragableItem()
       );
     });
 
@@ -249,11 +247,7 @@ const DialogProvider = ({ children, service }) => {
 
   return (
     <DialogContext.Provider value={{ create, dismiss, dismissAll, isEmpty }}>
-      {!isEmpty() &&
-        <div className="DraggableArea">
-          {renderDialogs()}
-        </div>
-      }
+      {!isEmpty() && <div className="DraggableArea">{renderDialogs()}</div>}
       {children}
     </DialogContext.Provider>
   );

platform/ui/src/contextProviders/ModalProvider.js

@@ -41,17 +41,6 @@ const ModalProvider = ({ children, modal: Modal, service }) => {
 
   const [options, setOptions] = useState(DEFAULT_OPTIONS);
 
-  /**
-   * Sets the implementation of a modal service that can be used by extensions.
-   *
-   * @returns void
-   */
-  useEffect(() => {
-    if (service) {
-      service.setServiceImplementation({ hide, show });
-    }
-  }, [hide, service, show]);
-
   /**
    * Show the modal and override its configuration props.
    *
@@ -71,6 +60,17 @@ const ModalProvider = ({ children, modal: Modal, service }) => {
     DEFAULT_OPTIONS,
   ]);
 
+  /**
+   * Sets the implementation of a modal service that can be used by extensions.
+   *
+   * @returns void
+   */
+  useEffect(() => {
+    if (service) {
+      service.setServiceImplementation({ hide, show });
+    }
+  }, [hide, service, show]);
+
   const {
     content: ModalContent,
     contentProps,

platform/ui/src/contextProviders/SnackbarProvider.js

@@ -27,17 +27,6 @@ const SnackbarProvider = ({ children, service }) => {
   const [count, setCount] = useState(1);
   const [snackbarItems, setSnackbarItems] = useState([]);
 
-  /**
-   * Sets the implementation of a notification service that can be used by extensions.
-   *
-   * @returns void
-   */
-  useEffect(() => {
-    if (service) {
-      service.setServiceImplementation({ hide, show });
-    }
-  }, [service, hide, show]);
-
   const show = useCallback(
     options => {
       if (!options || (!options.title && !options.message)) {
@@ -92,6 +81,17 @@ const SnackbarProvider = ({ children, service }) => {
     setSnackbarItems(() => []);
   };
 
+  /**
+   * Sets the implementation of a notification service that can be used by extensions.
+   *
+   * @returns void
+   */
+  useEffect(() => {
+    if (service) {
+      service.setServiceImplementation({ hide, show });
+    }
+  }, [service, hide, show]);
+
   /**
    * expose snackbar methods to window for debug purposes
    * TODO: Check if it's really necessary

platform/viewer/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.5.23](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.5.22...@ohif/viewer@4.5.23) (2020-11-02)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.5.22](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.5.21...@ohif/viewer@4.5.22) (2020-10-20)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.5.21](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.5.20...@ohif/viewer@4.5.21) (2020-10-15)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.5.20](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.5.19...@ohif/viewer@4.5.20) (2020-10-13)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
 ## [4.5.19](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.5.18...@ohif/viewer@4.5.19) (2020-10-13)
 
 **Note:** Version bump only for package @ohif/viewer

platform/viewer/cypress/integration/pwa/OHIFExtensionVTK.spec.js

@@ -36,9 +36,6 @@ describe('OHIF VTK Extension', () => {
     cy.get('@wwwcBtn')
       .should('be.visible')
       .contains('WWWC');
-    cy.get('@rotateBtn')
-      .should('be.visible')
-      .contains('Rotate');
     cy.get('@slabSlider')
       .should('be.visible')
       .contains('Slab Thickness');
@@ -90,23 +87,4 @@ describe('OHIF VTK Extension', () => {
         );
       });
   });
-
-  it('checks Rotate tool', () => {
-    cy.get('@rotateBtn').click();
-
-    // Click and Move the mouse inside the viewport
-    cy.get('[data-cy="viewport-container-0"]')
-      .trigger('mousedown', 'center', {
-        which: 1,
-      })
-      .trigger('mousemove', 'top', { which: 1 })
-      .trigger('mousedown', 'center', {
-        which: 1,
-      })
-      .trigger('mousemove', 'top', { which: 1 })
-      .trigger('mouseup', { which: 1 });
-
-    //Take Screenshot
-    cy.screenshot('VTK Rotate tool - Should rotate image');
-  });
 });

platform/viewer/cypress/support/aliases.js

@@ -47,7 +47,6 @@ export function initVTKToolsAliases() {
   cy.get('[data-cy="exit 2d mpr"]').as('exit2dmprBtn');
   cy.get('[data-cy="crosshairs"]').as('crosshairsBtn');
   cy.get('[data-cy="wwwc"]').as('wwwcBtn');
-  cy.get('[data-cy="rotate"]').as('rotateBtn');
   cy.get('.slab-thickness').as('slabSlider');
   cy.get('.select-ohif').as('modeDropdown');
   cy.get('.ohif-check-label').as('modeCheckbox');

platform/viewer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/viewer",
-  "version": "4.5.19",
+  "version": "4.5.23",
   "description": "OHIF Viewer",
   "author": "OHIF Contributors",
   "license": "MIT",
@@ -57,9 +57,9 @@
     "@ohif/extension-dicom-rt": "^0.4.9",
     "@ohif/extension-dicom-segmentation": "^0.4.7",
     "@ohif/extension-lesion-tracker": "^0.2.1",
-    "@ohif/extension-vtk": "^1.7.11",
+    "@ohif/extension-vtk": "^1.7.15",
     "@ohif/i18n": "^0.52.8",
-    "@ohif/ui": "^1.5.6",
+    "@ohif/ui": "^1.5.7",
     "@tanem/react-nprogress": "^1.1.25",
     "classnames": "^2.2.6",
     "core-js": "^3.2.1",

yarn.lock

@@ -16061,10 +16061,10 @@ react-transition-group@^4.1.1:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react-vtkjs-viewport@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/react-vtkjs-viewport/-/react-vtkjs-viewport-0.13.1.tgz#11b69873377cd66b6522079eb05d54317c2e8903"
-  integrity sha512-P2jmv0rZtas9+pZCzVBr0R/EqmXpWqPP8JA1DScwKgFoYj4ApqnQeLXSVz2VHXi58q87k2uay9k7xcchLiStrQ==
+react-vtkjs-viewport@^0.14.1:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/react-vtkjs-viewport/-/react-vtkjs-viewport-0.14.1.tgz#32ecdbbe0e61066d8cbaa211933184d3ebda6603"
+  integrity sha512-DAAF1yyEjq75BFYj/p/eO3/h6DiiGtEHJj/mbuk83LTgpcXlKNsYvQoh2oWWCyNVFo5hjBy8zlHUlRyKbu8GOg==
   dependencies:
     date-fns "^2.2.1"
     gl-matrix "^3.1.0"