@ohif/app 3.8.0-beta.65 → 3.8.0-beta.66

package/dist/{191.bundle.4850ab82949bb6f0eb73.js → 191.bundle.509480b6972209d2567c.js}

@@ -9784,6 +9784,26 @@ class TrackballRotateTool extends base/* BaseTool */.oS {
         },
     }) {
         super(toolProps, defaultToolProps);
+        this.preMouseDownCallback = (evt) => {
+            const eventDetail = evt.detail;
+            const { element } = eventDetail;
+            const enabledElement = (0,esm.getEnabledElement)(element);
+            const { viewport } = enabledElement;
+            const actorEntry = viewport.getDefaultActor();
+            const actor = actorEntry.actor;
+            const mapper = actor.getMapper();
+            const originalSampleDistance = mapper.getSampleDistance();
+            mapper.setSampleDistance(originalSampleDistance * 2);
+            if (this.cleanUp !== null) {
+                element.removeEventListener('mouseup', this.cleanUp);
+            }
+            this.cleanUp = () => {
+                mapper.setSampleDistance(originalSampleDistance);
+                viewport.render();
+            };
+            element.addEventListener('mouseup', this.cleanUp, { once: true });
+            return true;
+        };
         this.rotateCamera = (viewport, centerWorld, axis, angle) => {
             const vtkCamera = viewport.getVtkActiveCamera();
             const viewUp = vtkCamera.getViewUp();
@@ -24581,7 +24601,6 @@ function getToolStateByViewportId(viewportId) {
 const { ViewportStatus } = esm.Enums;
 const { triggerEvent } = esm.utilities;
 const debounced = true;
-const loop = true;
 const dynamicVolumesPlayingMap = new Map();
 function playClip(element, playClipOptions) {
     let playClipTimeouts;
@@ -24642,7 +24661,7 @@ function playClip(element, playClipOptions) {
         const { numScrollSteps, currentStepIndex } = playClipContext;
         let newStepIndex = currentStepIndex + (playClipData.reverse ? -1 : 1);
         const newStepIndexOutOfRange = newStepIndex < 0 || newStepIndex >= numScrollSteps;
-        if (!loop && newStepIndexOutOfRange) {
+        if (!playClipData.loop && newStepIndexOutOfRange) {
             _stopClip(element, {
                 stopDynamicCine: !isDynamicCinePlaying,
                 viewportId: viewport.id,
@@ -28270,6 +28289,7 @@ __webpack_require__.d(__webpack_exports__, {
   floodFill: () => (/* reexport */ floodFill/* default */.A),
   getBrushSizeForToolGroup: () => (/* reexport */ getBrushSizeForToolGroup),
   getBrushThresholdForToolGroup: () => (/* reexport */ getBrushThresholdForToolGroup),
+  getBrushToolInstances: () => (/* reexport */ segmentation_utilities/* getBrushToolInstances */.n7),
   getDefaultRepresentationConfig: () => (/* reexport */ getDefaultRepresentationConfig),
   getHoveredContourSegmentationAnnotation: () => (/* reexport */ getHoveredContourSegmentationAnnotation),
   getSegmentAtLabelmapBorder: () => (/* reexport */ getSegmentAtLabelmapBorder),
@@ -28522,7 +28542,7 @@ function setBrushSizeForToolGroup(toolGroupId, brushSize, toolName) {
     if (toolGroup === undefined) {
         return;
     }
-    const brushBasedToolInstances = (0,segmentation_utilities/* default */.Ay)(toolGroupId, toolName);
+    const brushBasedToolInstances = (0,segmentation_utilities/* getBrushToolInstances */.n7)(toolGroupId, toolName);
     brushBasedToolInstances.forEach((tool) => {
         tool.configuration.brushSize = brushSize;
         tool.invalidateBrushCursor();
@@ -28546,7 +28566,7 @@ function getBrushSizeForToolGroup(toolGroupId, toolName) {
     if (!Object.keys(toolInstances).length) {
         return;
     }
-    const brushBasedToolInstances = (0,segmentation_utilities/* default */.Ay)(toolGroupId, toolName);
+    const brushBasedToolInstances = (0,segmentation_utilities/* getBrushToolInstances */.n7)(toolGroupId, toolName);
     const brushToolInstance = brushBasedToolInstances[0];
     if (!brushToolInstance) {
         return;
@@ -28564,7 +28584,7 @@ function setBrushThresholdForToolGroup(toolGroupId, threshold, otherArgs = { isD
     if (toolGroup === undefined) {
         return;
     }
-    const brushBasedToolInstances = (0,segmentation_utilities/* default */.Ay)(toolGroupId);
+    const brushBasedToolInstances = (0,segmentation_utilities/* getBrushToolInstances */.n7)(toolGroupId);
     const configuration = {
         ...otherArgs,
         ...(threshold !== undefined && { threshold }),
@@ -28593,7 +28613,7 @@ function getBrushThresholdForToolGroup(toolGroupId) {
     if (!Object.keys(toolInstances).length) {
         return;
     }
-    const brushBasedToolInstances = (0,segmentation_utilities/* default */.Ay)(toolGroupId);
+    const brushBasedToolInstances = (0,segmentation_utilities/* getBrushToolInstances */.n7)(toolGroupId);
     const brushToolInstance = brushBasedToolInstances[0];
     if (!brushToolInstance) {
         return;
@@ -28992,7 +29012,7 @@ function invalidateBrushCursor(toolGroupId) {
     if (toolGroup === undefined) {
         return;
     }
-    const brushBasedToolInstances = (0,segmentation_utilities/* default */.Ay)(toolGroupId);
+    const brushBasedToolInstances = (0,segmentation_utilities/* getBrushToolInstances */.n7)(toolGroupId);
     brushBasedToolInstances.forEach((tool) => {
         tool.invalidateBrushCursor();
     });
@@ -29208,6 +29228,7 @@ function getHoveredContourSegmentationAnnotation(segmentationId) {
 
 
 
+
 
 
 /***/ }),
@@ -29340,8 +29361,8 @@ function triggerSegmentationRender(toolGroupId) {
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   Ay: () => (/* binding */ getBrushToolInstances),
 /* harmony export */   Q5: () => (/* binding */ getVoxelOverlap),
+/* harmony export */   n7: () => (/* binding */ getBrushToolInstances),
 /* harmony export */   zf: () => (/* binding */ processVolumes)
 /* harmony export */ });
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(50719);

package/dist/{41.bundle.58b85dd990fb6fac615e.js → 41.bundle.b7bf03502ac3e2ddca35.js}

@@ -424,9 +424,7 @@ const toolbarButtons = [{
   props: {
     icon: 'tool-capture',
     label: 'Capture',
-    commands: [{
-      commandName: 'showDownloadViewportModal'
-    }],
+    commands: 'showDownloadViewportModal',
     evaluate: 'evaluate.action'
   }
 }, {
@@ -435,10 +433,7 @@ const toolbarButtons = [{
   props: {
     rows: 3,
     columns: 4,
-    evaluate: 'evaluate.action',
-    commands: [{
-      commandName: 'setViewportGridLayout'
-    }]
+    evaluate: 'evaluate.action'
   }
 }, {
   id: 'Crosshairs',

package/dist/{448.bundle.d195aba3aef25ec286d1.js → 448.bundle.0061f5280490e1a1aa88.js}

@@ -175,13 +175,7 @@ const toolbarButtons = [{
     type: 'tool',
     icon: 'tool-3d-rotate',
     label: '3D Rotate',
-    commands: [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'TrackBallRotate'
-      },
-      context: 'CORNERSTONE'
-    }]
+    commands: setToolActiveToolbar
   }
 }, {
   id: 'Capture',
@@ -189,9 +183,7 @@ const toolbarButtons = [{
   props: {
     icon: 'tool-capture',
     label: 'Capture',
-    commands: [{
-      commandName: 'showDownloadViewportModal'
-    }],
+    commands: 'showDownloadViewportModal',
     evaluate: 'evaluate.action'
   }
 }, {

package/dist/{701.bundle.bc40f1a7d5d6b1a4dd38.js → 701.bundle.285943aebfc0efe2b4f1.js}

@@ -4614,7 +4614,7 @@ const CornerstoneViewportDownloadForm = ({
             console.warn('Unable to set properties', e);
           }
         });
-      } else if (downloadViewport instanceof esm.VolumeViewport) {
+      } else if (downloadViewport instanceof esm.BaseVolumeViewport) {
         const actors = viewport.getActors();
         // downloadViewport.setActors(actors);
         actors.forEach(actor => {
@@ -5675,9 +5675,6 @@ function commandsModule({
     setViewportColormap: {
       commandFn: actions.setViewportColormap
     },
-    toggleImageSliceSync: {
-      commandFn: actions.toggleImageSliceSync
-    },
     setSourceViewportForReferenceLinesTool: {
       commandFn: actions.setSourceViewportForReferenceLinesTool
     },
@@ -9844,18 +9841,21 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
       });
     }
     this.viewportsDisplaySets.set(viewport.id, displaySetInstanceUIDs);
-    if (hangingProtocolService.getShouldPerformCustomImageLoad()) {
-      // delegate the volume loading to the hanging protocol service if it has a custom image load strategy
-      return hangingProtocolService.runImageLoadStrategy({
-        viewportId: viewport.id,
-        volumeInputArray
+    const volumesNotLoaded = volumeToLoad.filter(volume => !volume.loadStatus.loaded);
+    if (volumesNotLoaded.length) {
+      if (hangingProtocolService.getShouldPerformCustomImageLoad()) {
+        // delegate the volume loading to the hanging protocol service if it has a custom image load strategy
+        return hangingProtocolService.runImageLoadStrategy({
+          viewportId: viewport.id,
+          volumeInputArray
+        });
+      }
+      volumesNotLoaded.forEach(volume => {
+        if (!volume.loadStatus.loading) {
+          volume.load();
+        }
       });
     }
-    volumeToLoad.forEach(volume => {
-      if (!volume.loadStatus.loaded && !volume.loadStatus.loading) {
-        volume.load();
-      }
-    });
 
     // This returns the async continuation only
     return this.setVolumesForViewport(viewport, volumeInputArray, presentations);

package/dist/{90.bundle.abde898ebd3c74f521f9.js → 90.bundle.49b20161b4f864100085.js}

@@ -2604,8 +2604,8 @@ function ViewerHeader({
     hotkeyDefinitions,
     hotkeyDefaults
   } = hotkeysManager;
-  const versionNumber = "3.8.0-beta.65";
-  const commitHash = "617043fe0da5de91fbea4ac33a27f1df16ae1ca6";
+  const versionNumber = "3.8.0-beta.66";
+  const commitHash = "158a1816703e0ad66cae08cb9bd1ffb93bbd8d43";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',
@@ -4493,40 +4493,32 @@ const generateAdvancedPresets = hangingProtocolService => {
   }).filter(preset => preset !== null);
 };
 function ToolbarLayoutSelectorWithServices({
+  commandsManager,
   servicesManager,
   ...props
 }) {
-  const {
-    toolbarService
-  } = servicesManager.services;
   const [isDisabled, setIsDisabled] = (0,react.useState)(false);
   const handleMouseEnter = () => {
     setIsDisabled(false);
   };
   const onSelection = (0,react.useCallback)(props => {
-    toolbarService.recordInteraction({
-      interactionType: 'action',
-      commands: [{
-        commandName: 'setViewportGridLayout',
-        commandOptions: {
-          ...props
-        }
-      }]
+    commandsManager.run({
+      commandName: 'setViewportGridLayout',
+      commandOptions: {
+        ...props
+      }
     });
     setIsDisabled(true);
-  }, [toolbarService]);
+  }, []);
   const onSelectionPreset = (0,react.useCallback)(props => {
-    toolbarService.recordInteraction({
-      interactionType: 'action',
-      commands: [{
-        commandName: 'setHangingProtocol',
-        commandOptions: {
-          ...props
-        }
-      }]
+    commandsManager.run({
+      commandName: 'setHangingProtocol',
+      commandOptions: {
+        ...props
+      }
     });
     setIsDisabled(true);
-  }, [toolbarService]);
+  }, []);
   return /*#__PURE__*/react.createElement("div", {
     onMouseEnter: handleMouseEnter
   }, /*#__PURE__*/react.createElement(LayoutSelector, ToolbarLayoutSelector_extends({}, props, {
@@ -4577,7 +4569,7 @@ function LayoutSelector({
     rounded: rest.rounded,
     disableToolTip: tooltipDisabled,
     dropdownContent: DropdownContent !== null && /*#__PURE__*/react.createElement("div", {
-      className: "flex"
+      className: "flex "
     }, /*#__PURE__*/react.createElement("div", {
       className: "bg-secondary-dark flex flex-col gap-2.5 p-2"
     }, /*#__PURE__*/react.createElement("div", {
@@ -4586,7 +4578,7 @@ function LayoutSelector({
       className: "flex gap-4"
     }, commonPresets.map((preset, index) => /*#__PURE__*/react.createElement(ui_src/* LayoutPreset */.qu, {
       key: index,
-      classNames: "hover:bg-primary-dark group p-1",
+      classNames: "hover:bg-primary-dark group p-1 cursor-pointer",
       icon: preset.icon,
       commandOptions: preset.commandOptions,
       onSelection: onSelection
@@ -4598,7 +4590,7 @@ function LayoutSelector({
       className: "flex flex-col gap-2.5"
     }, advancedPresets.map((preset, index) => /*#__PURE__*/react.createElement(ui_src/* LayoutPreset */.qu, {
       key: index + commonPresets.length,
-      classNames: "hover:bg-primary-dark group flex gap-2 p-1",
+      classNames: "hover:bg-primary-dark group flex gap-2 p-1 cursor-pointer",
       icon: preset.icon,
       title: preset.title,
       commandOptions: preset.commandOptions,
@@ -4772,7 +4764,11 @@ function getToolbarModule({
     defaultComponent: Toolbar_ToolbarSplitButtonWithServices
   }, {
     name: 'ohif.layoutSelector',
-    defaultComponent: ToolbarLayoutSelector
+    defaultComponent: props => ToolbarLayoutSelector({
+      ...props,
+      commandsManager,
+      servicesManager
+    })
   }, {
     name: 'ohif.buttonGroup',
     defaultComponent: Toolbar_ToolbarButtonGroupWithServices
@@ -5801,6 +5797,13 @@ const findViewportsByPosition_findOrCreateViewport = (hangingProtocolService, vi
       }
     };
   }
+
+  // and lastly if there is no default viewport, then we see if we can grab the
+  // viewportsByPosition at the position index and use that
+  // const candidate = Object.values(viewportsByPosition)[position];
+
+  // // if it has something to display, then we can use it
+  // return candidate?.displaySetInstanceUIDs ? candidate : {};
   return {};
 };
 

package/dist/{987.bundle.91d4867efedd5b4d84cb.js → 987.bundle.6bdfb3cd8762b8889632.js}

@@ -45594,7 +45594,7 @@ class Viewport {
     getCurrentImageIdIndex() {
         throw new Error('Not implemented');
     }
-    getReferenceId(specifier) {
+    getReferenceId(_specifier) {
         return null;
     }
     setPan(pan, storeAsInitialCamera = false) {
@@ -50913,7 +50913,7 @@ class StackViewport extends RenderingEngine_Viewport {
             const colonIndex = imageId.indexOf(':');
             imageURI = imageId.substring(colonIndex + 1);
         }
-        return referencedImageId.endsWith(imageURI);
+        return referencedImageId?.endsWith(imageURI);
     }
     getViewReference(viewRefSpecifier = {}) {
         const { sliceIndex: sliceIndex = this.currentImageIdIndex } = viewRefSpecifier;
@@ -70283,6 +70283,26 @@ class TrackballRotateTool extends base/* BaseTool */.oS {
         },
     }) {
         super(toolProps, defaultToolProps);
+        this.preMouseDownCallback = (evt) => {
+            const eventDetail = evt.detail;
+            const { element } = eventDetail;
+            const enabledElement = (0,esm.getEnabledElement)(element);
+            const { viewport } = enabledElement;
+            const actorEntry = viewport.getDefaultActor();
+            const actor = actorEntry.actor;
+            const mapper = actor.getMapper();
+            const originalSampleDistance = mapper.getSampleDistance();
+            mapper.setSampleDistance(originalSampleDistance * 2);
+            if (this.cleanUp !== null) {
+                element.removeEventListener('mouseup', this.cleanUp);
+            }
+            this.cleanUp = () => {
+                mapper.setSampleDistance(originalSampleDistance);
+                viewport.render();
+            };
+            element.addEventListener('mouseup', this.cleanUp, { once: true });
+            return true;
+        };
         this.rotateCamera = (viewport, centerWorld, axis, angle) => {
             const vtkCamera = viewport.getVtkActiveCamera();
             const viewUp = vtkCamera.getViewUp();
@@ -84987,7 +85007,6 @@ function state_getToolStateByViewportId(viewportId) {
 const { ViewportStatus } = esm.Enums;
 const { triggerEvent } = esm.utilities;
 const debounced = true;
-const loop = true;
 const dynamicVolumesPlayingMap = new Map();
 function playClip(element, playClipOptions) {
     let playClipTimeouts;
@@ -85048,7 +85067,7 @@ function playClip(element, playClipOptions) {
         const { numScrollSteps, currentStepIndex } = playClipContext;
         let newStepIndex = currentStepIndex + (playClipData.reverse ? -1 : 1);
         const newStepIndexOutOfRange = newStepIndex < 0 || newStepIndex >= numScrollSteps;
-        if (!loop && newStepIndexOutOfRange) {
+        if (!playClipData.loop && newStepIndexOutOfRange) {
             _stopClip(element, {
                 stopDynamicCine: !isDynamicCinePlaying,
                 viewportId: viewport.id,
@@ -88674,7 +88693,7 @@ __webpack_require__.d(__webpack_exports__, {
   triggerSegmentationRender: () => (/* reexport */ triggerSegmentationRender/* triggerSegmentationRender */.h6)
 });
 
-// UNUSED EXPORTS: contourAndFindLargestBidirectional, createBidirectionalToolData, createLabelmapVolumeForViewport, createMergedLabelmapForIndex, floodFill, getBrushSizeForToolGroup, getBrushThresholdForToolGroup, getDefaultRepresentationConfig, isValidRepresentationConfig, rectangleROIThresholdVolumeByRange, segmentContourAction, setBrushSizeForToolGroup, setBrushThresholdForToolGroup, thresholdSegmentationByRange, thresholdVolumeByRange
+// UNUSED EXPORTS: contourAndFindLargestBidirectional, createBidirectionalToolData, createLabelmapVolumeForViewport, createMergedLabelmapForIndex, floodFill, getBrushSizeForToolGroup, getBrushThresholdForToolGroup, getBrushToolInstances, getDefaultRepresentationConfig, isValidRepresentationConfig, rectangleROIThresholdVolumeByRange, segmentContourAction, setBrushSizeForToolGroup, setBrushThresholdForToolGroup, thresholdSegmentationByRange, thresholdVolumeByRange
 
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/index.js + 25 modules
 var utilities = __webpack_require__(21013);
@@ -89382,7 +89401,7 @@ function invalidateBrushCursor(toolGroupId) {
     if (toolGroup === undefined) {
         return;
     }
-    const brushBasedToolInstances = (0,segmentation_utilities/* default */.Ay)(toolGroupId);
+    const brushBasedToolInstances = (0,segmentation_utilities/* getBrushToolInstances */.n7)(toolGroupId);
     brushBasedToolInstances.forEach((tool) => {
         tool.invalidateBrushCursor();
     });
@@ -89598,6 +89617,7 @@ function getHoveredContourSegmentationAnnotation(segmentationId) {
 
 
 
+
 
 
 /***/ }),
@@ -89732,7 +89752,7 @@ function triggerSegmentationRender(toolGroupId) {
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   Ay: () => (/* binding */ getBrushToolInstances)
+/* harmony export */   n7: () => (/* binding */ getBrushToolInstances)
 /* harmony export */ });
 /* unused harmony exports getVoxelOverlap, processVolumes */
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(50719);