@ohif/app 3.8.0-beta.63 → 3.8.0-beta.64

package/dist/{121.bundle.f6c25e845985d96c423c.js → 121.bundle.5399d807995157d368b7.js}

@@ -17,10 +17,10 @@ var react = __webpack_require__(41766);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(11374);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// EXTERNAL MODULE: ../../core/src/index.ts + 66 modules
-var src = __webpack_require__(14283);
-// EXTERNAL MODULE: ../../ui/src/index.js + 489 modules
-var ui_src = __webpack_require__(6804);
+// EXTERNAL MODULE: ../../core/src/index.ts + 67 modules
+var src = __webpack_require__(78198);
+// EXTERNAL MODULE: ../../ui/src/index.js + 495 modules
+var ui_src = __webpack_require__(65967);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/utils/promptHydrateRT.ts
 
 const RESPONSE = {

package/dist/{155.bundle.9e3dd18c9a3961232504.js → 155.bundle.55fa02bfc411cc91e261.js}

@@ -20,8 +20,8 @@ var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 var es = __webpack_require__(57593);
 // EXTERNAL MODULE: ../../../node_modules/@xstate/react/es/index.js + 8 modules
 var react_es = __webpack_require__(6835);
-// EXTERNAL MODULE: ../../ui/src/index.js + 489 modules
-var src = __webpack_require__(6804);
+// EXTERNAL MODULE: ../../ui/src/index.js + 495 modules
+var src = __webpack_require__(65967);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/measurementTrackingMachine.js
 
 const RESPONSE = {
@@ -629,7 +629,7 @@ function promptTrackNewStudy_askSaveDiscardOrCancel(UIViewportDialogService, vie
 }
 /* harmony default export */ const TrackedMeasurementsContext_promptTrackNewStudy = (promptTrackNewStudy);
 // EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 78 modules
-var default_src = __webpack_require__(49704);
+var default_src = __webpack_require__(54090);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/_shared/getNextSRSeriesNumber.js
 const MIN_SR_SERIES_NUMBER = 4700;
 function getNextSRSeriesNumber(displaySetService) {
@@ -1102,10 +1102,10 @@ var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 var dist = __webpack_require__(37396);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
 var es = __webpack_require__(80619);
-// EXTERNAL MODULE: ../../core/src/index.ts + 66 modules
-var src = __webpack_require__(14283);
-// EXTERNAL MODULE: ../../ui/src/index.js + 489 modules
-var ui_src = __webpack_require__(6804);
+// EXTERNAL MODULE: ../../core/src/index.ts + 67 modules
+var src = __webpack_require__(78198);
+// EXTERNAL MODULE: ../../ui/src/index.js + 495 modules
+var ui_src = __webpack_require__(65967);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.tsx
 
 
@@ -1652,6 +1652,11 @@ function _findTabAndStudyOfDisplaySet(displaySetInstanceUID, tabs) {
 function getImageSrcFromImageId(cornerstone, imageId) {
   return new Promise((resolve, reject) => {
     const canvas = document.createElement('canvas');
+    // Note: the default width and height of the canvas is 300x150
+    // but we need to set the width and height to the same number since
+    // the thumbnails are usually square and we want to maintain the aspect ratio
+    canvas.width = 128 / window.devicePixelRatio;
+    canvas.height = 128 / window.devicePixelRatio;
     cornerstone.utilities.loadImageToCanvas({
       canvas,
       imageId

package/dist/{188.bundle.528e9ad81159c776affa.js → 188.bundle.ec979013d89d90831c58.js}

@@ -22,8 +22,8 @@ const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
 var react = __webpack_require__(41766);
-// EXTERNAL MODULE: ../../core/src/index.ts + 66 modules
-var src = __webpack_require__(14283);
+// EXTERNAL MODULE: ../../core/src/index.ts + 67 modules
+var src = __webpack_require__(78198);
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
 var dcmjs_es = __webpack_require__(31426);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-rt/src/loadRTStruct.js

package/dist/{270.bundle.fd387adff5b064fca506.js → 270.bundle.58c74e58ad67b5069718.js}

@@ -20,10 +20,10 @@ const id = package_namespaceObject.UU;
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
 var react = __webpack_require__(41766);
-// EXTERNAL MODULE: ../../ui/src/index.js + 489 modules
-var src = __webpack_require__(6804);
-// EXTERNAL MODULE: ../../core/src/index.ts + 66 modules
-var core_src = __webpack_require__(14283);
+// EXTERNAL MODULE: ../../ui/src/index.js + 495 modules
+var src = __webpack_require__(65967);
+// EXTERNAL MODULE: ../../core/src/index.ts + 67 modules
+var core_src = __webpack_require__(78198);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
 var es = __webpack_require__(80619);
 // EXTERNAL MODULE: ../../../node_modules/mathjs/lib/esm/index.js + 996 modules
@@ -1294,6 +1294,9 @@ class MicroscopyService extends core_src/* PubSubService */.Rc {
     this.managedViewers.forEach(mv => mv.activateInteractions(interactions));
     this.activeInteractions = interactions;
   }
+  getActiveInteractions() {
+    return this.activeInteractions;
+  }
 
   /**
    * Triggers the relabelling process for the given RoiAnnotation instance, by
@@ -2128,8 +2131,7 @@ function getCommandsModule({
 
       // overview
       const {
-        activeViewportId,
-        viewports
+        activeViewportId
       } = viewportGridService.getState();
       microscopyService.toggleOverviewMap(activeViewportId);
     },
@@ -2139,29 +2141,19 @@ function getCommandsModule({
   };
   const definitions = {
     deleteMeasurement: {
-      commandFn: actions.deleteMeasurement,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.deleteMeasurement
     },
     setLabel: {
-      commandFn: actions.setLabel,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.setLabel
     },
     setToolActive: {
-      commandFn: actions.setToolActive,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.setToolActive
     },
     toggleOverlays: {
-      commandFn: actions.toggleOverlays,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.toggleOverlays
     },
     toggleAnnotations: {
-      commandFn: actions.toggleAnnotations,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.toggleAnnotations
     }
   };
   return {
@@ -2577,7 +2569,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 const Component = /*#__PURE__*/react.lazy(() => {
-  return Promise.all(/* import() */[__webpack_require__.e(504), __webpack_require__.e(191), __webpack_require__.e(644), __webpack_require__.e(931), __webpack_require__.e(704), __webpack_require__.e(544)]).then(__webpack_require__.bind(__webpack_require__, 17919));
+  return Promise.all(/* import() */[__webpack_require__.e(504), __webpack_require__.e(191), __webpack_require__.e(644), __webpack_require__.e(931), __webpack_require__.e(90), __webpack_require__.e(544)]).then(__webpack_require__.bind(__webpack_require__, 17919));
 });
 const MicroscopyViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {
@@ -2588,17 +2580,14 @@ const MicroscopyViewport = props => {
 /**
  * You can remove any of the following modules if you don't need them.
  */
-/* harmony default export */ const dicom_microscopy_src = ({
+const extension = {
   /**
    * Only required property. Should be a unique value across all extensions.
    * You ID can be anything you want, but it should be unique.
    */
   id: id,
   async preRegistration({
-    servicesManager,
-    commandsManager,
-    configuration = {},
-    appConfig
+    servicesManager
   }) {
     servicesManager.registerService(MicroscopyService.REGISTRATION(servicesManager));
   },
@@ -2657,6 +2646,39 @@ const MicroscopyViewport = props => {
       component: ExtendedMicroscopyViewport
     }];
   },
+  getToolbarModule({
+    servicesManager
+  }) {
+    return [{
+      name: 'evaluate.microscopyTool',
+      evaluate: ({
+        button
+      }) => {
+        const {
+          microscopyService
+        } = servicesManager.services;
+        const activeInteractions = microscopyService.getActiveInteractions();
+        const isPrimaryActive = activeInteractions.find(interactions => {
+          const sameMouseButton = interactions[1].bindings.mouseButtons.includes('left');
+          if (!sameMouseButton) {
+            return false;
+          }
+          const notDraw = interactions[0] !== 'draw';
+
+          // there seems to be a custom logic for draw tool for some reason
+          return notDraw ? interactions[0] === button.id : interactions[1].geometryType === button.id;
+        });
+        return {
+          disabled: false,
+          className: isPrimaryActive ? '!text-black bg-primary-light' : '!text-common-bright hover:!bg-primary-dark hover:!text-primary-light',
+          // Todo: isActive right now is used for nested buttons where the primary
+          // button needs to be fully rounded (vs partial rounded) when active
+          // otherwise it does not have any other use
+          isActive: isPrimaryActive
+        };
+      }
+    }];
+  },
   /**
    * SopClassHandlerModule should provide a list of sop class handlers that will be
    * available in OHIF for Modes to consume and use to create displaySets from Series.
@@ -2678,7 +2700,8 @@ const MicroscopyViewport = props => {
   },
   getPanelModule: getPanelModule,
   getCommandsModule: getCommandsModule
-});
+};
+/* harmony default export */ const dicom_microscopy_src = (extension);
 
 /***/ })
 

package/dist/{295.bundle.c132f53e1397ef9d432a.js → 295.bundle.c0a29ff64d86f707fc20.js}

@@ -19,10 +19,10 @@ var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 var react = __webpack_require__(41766);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
 var es = __webpack_require__(80619);
-// EXTERNAL MODULE: ../../core/src/index.ts + 66 modules
-var src = __webpack_require__(14283);
-// EXTERNAL MODULE: ../../ui/src/index.js + 489 modules
-var ui_src = __webpack_require__(6804);
+// EXTERNAL MODULE: ../../core/src/index.ts + 67 modules
+var src = __webpack_require__(78198);
+// EXTERNAL MODULE: ../../ui/src/index.js + 495 modules
+var ui_src = __webpack_require__(65967);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/initSEGToolGroup.ts
 function createSEGToolGroupAndAddTools(ToolGroupService, customizationService, toolGroupId) {
   const {

package/dist/{339.bundle.591a0a6075220b14c249.js → 339.bundle.e31c81c7179d3d24f3dd.js}

@@ -693,10 +693,10 @@ var react = __webpack_require__(41766);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(11374);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// EXTERNAL MODULE: ../../ui/src/index.js + 489 modules
-var src = __webpack_require__(6804);
-// EXTERNAL MODULE: ../../core/src/index.ts + 66 modules
-var core_src = __webpack_require__(14283);
+// EXTERNAL MODULE: ../../ui/src/index.js + 495 modules
+var src = __webpack_require__(65967);
+// EXTERNAL MODULE: ../../core/src/index.ts + 67 modules
+var core_src = __webpack_require__(78198);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
 var es = __webpack_require__(80619);
 ;// CONCATENATED MODULE: ../../../extensions/tmtv/src/Panels/PanelPetSUV.tsx
@@ -817,27 +817,18 @@ function PanelPetSUV({
     if (!ptDisplaySet) {
       throw new Error('No ptDisplaySet found');
     }
-    const toolGroupIds = toolGroupService.getToolGroupIds();
-
-    // Todo: we don't have a proper way to perform a toggle command and update the
-    // state for the toolbar, so here, we manually toggle the toolbar
-
-    // Todo: Crosshairs have bugs for the camera reset currently, so we need to
-    // force turn it off before we update the metadata
-    toolGroupIds.forEach(toolGroupId => {
-      commandsManager.runCommand('toggleCrosshairs', {
-        toolGroupId,
-        toggledState: false
-      });
-    });
-    toolbarService.state.toggles['Crosshairs'] = false;
-    toolbarService._broadcastEvent(toolbarService.EVENTS.TOOL_BAR_STATE_MODIFIED);
 
     // metadata should be dcmjs naturalized
     core_src.DicomMetadataStore.updateMetadataForSeries(ptDisplaySet.StudyInstanceUID, ptDisplaySet.SeriesInstanceUID, metadata);
 
     // update the displaySets
     displaySetService.setDisplaySetMetadataInvalidated(ptDisplaySet.displaySetInstanceUID);
+
+    // Crosshair position depends on the metadata values such as the positioning interaction
+    // between series, so when the metadata is updated, the crosshairs need to be reset.
+    setTimeout(() => {
+      commandsManager.runCommand('resetCrosshairs');
+    }, 0);
   }
   return /*#__PURE__*/react.createElement("div", {
     className: "invisible-scrollbar overflow-y-auto overflow-x-hidden"
@@ -1685,8 +1676,7 @@ const CORNERSTONE_3D_TOOLS_SOURCE_VERSION = '0.1';
  * @param {Object|Array} configuration.csToolsConfig
  */
 function init({
-  servicesManager,
-  extensionManager
+  servicesManager
 }) {
   const {
     measurementService,
@@ -2497,84 +2487,52 @@ const commandsModule = ({
   };
   const definitions = {
     setEndSliceForROIThresholdTool: {
-      commandFn: actions.setEndSliceForROIThresholdTool,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.setEndSliceForROIThresholdTool
     },
     setStartSliceForROIThresholdTool: {
-      commandFn: actions.setStartSliceForROIThresholdTool,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.setStartSliceForROIThresholdTool
     },
     getMatchingPTDisplaySet: {
-      commandFn: actions.getMatchingPTDisplaySet,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.getMatchingPTDisplaySet
     },
     getPTMetadata: {
-      commandFn: actions.getPTMetadata,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.getPTMetadata
     },
     createNewLabelmapFromPT: {
-      commandFn: actions.createNewLabelmapFromPT,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.createNewLabelmapFromPT
     },
     setSegmentationActiveForToolGroups: {
-      commandFn: actions.setSegmentationActiveForToolGroups,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.setSegmentationActiveForToolGroups
     },
     thresholdSegmentationByRectangleROITool: {
-      commandFn: actions.thresholdSegmentationByRectangleROITool,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.thresholdSegmentationByRectangleROITool
     },
     getTotalLesionGlycolysis: {
-      commandFn: actions.getTotalLesionGlycolysis,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.getTotalLesionGlycolysis
     },
     calculateSuvPeak: {
-      commandFn: actions.calculateSuvPeak,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.calculateSuvPeak
     },
     getLesionStats: {
-      commandFn: actions.getLesionStats,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.getLesionStats
     },
     calculateTMTV: {
-      commandFn: actions.calculateTMTV,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.calculateTMTV
     },
     exportTMTVReportCSV: {
-      commandFn: actions.exportTMTVReportCSV,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.exportTMTVReportCSV
     },
     createTMTVRTReport: {
-      commandFn: actions.createTMTVRTReport,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.createTMTVRTReport
     },
     getSegmentationCSVReport: {
-      commandFn: actions.getSegmentationCSVReport,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.getSegmentationCSVReport
     },
     exportRTReportForAnnotations: {
-      commandFn: actions.exportRTReportForAnnotations,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.exportRTReportForAnnotations
     },
     setFusionPTColormap: {
-      commandFn: actions.setFusionPTColormap,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.setFusionPTColormap
     }
   };
   return {