@ohif/app 3.7.0-beta.79 → 3.7.0-beta.80

package/dist/{128.bundle.d4536952e6eda267cb5a.js → 128.bundle.5198a2266456afecd420.js}

@@ -14,8 +14,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../core/src/index.ts + 75 modules
 var src = __webpack_require__(34491);
-// EXTERNAL MODULE: ../../ui/src/index.js + 458 modules
-var ui_src = __webpack_require__(88344);
+// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
+var ui_src = __webpack_require__(71783);
 ;// CONCATENATED MODULE: ../../../modes/basic-test-mode/src/toolbarButtons.js
 // TODO: torn, can either bake this here; or have to create a whole new button type
 // Only ways that you can pass in a custom React component for render :l
@@ -481,7 +481,18 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
     passive: [{
       toolName: toolNames.Length
     }, {
-      toolName: toolNames.ArrowAnnotate
+      toolName: toolNames.ArrowAnnotate,
+      configuration: {
+        getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          eventDetails
+        }),
+        changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          data,
+          eventDetails
+        })
+      }
     }, {
       toolName: toolNames.Bidirectional
     }, {
@@ -507,20 +518,7 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
       toolName: toolNames.ReferenceLines
     }]
   };
-  const toolsConfig = {
-    [toolNames.ArrowAnnotate]: {
-      getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        eventDetails
-      }),
-      changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        data,
-        eventDetails
-      })
-    }
-  };
-  toolGroupService.createToolGroupAndAddTools(toolGroupId, tools, toolsConfig);
+  toolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
 }
 function initSRToolGroup(extensionManager, toolGroupService, commandsManager) {
   const SRUtilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone-dicom-sr.utilityModule.tools');
@@ -570,21 +568,8 @@ function initSRToolGroup(extensionManager, toolGroupService, commandsManager) {
     // disabled
   };
 
-  const toolsConfig = {
-    [toolNames.ArrowAnnotate]: {
-      getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        eventDetails
-      }),
-      changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        data,
-        eventDetails
-      })
-    }
-  };
   const toolGroupId = 'SRToolGroup';
-  toolGroupService.createToolGroupAndAddTools(toolGroupId, tools, toolsConfig);
+  toolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
 }
 function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
   const utilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.tools');
@@ -615,7 +600,18 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
     passive: [{
       toolName: toolNames.Length
     }, {
-      toolName: toolNames.ArrowAnnotate
+      toolName: toolNames.ArrowAnnotate,
+      configuration: {
+        getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          eventDetails
+        }),
+        changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
+          callback,
+          data,
+          eventDetails
+        })
+      }
     }, {
       toolName: toolNames.Bidirectional
     }, {
@@ -634,7 +630,14 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
       toolName: toolNames.SegmentationDisplay
     }],
     disabled: [{
-      toolName: toolNames.Crosshairs
+      toolName: toolNames.Crosshairs,
+      configuration: {
+        viewportIndicators: false,
+        autoPan: {
+          enabled: false,
+          panSize: 10
+        }
+      }
     }, {
       toolName: toolNames.ReferenceLines
     }]
@@ -643,27 +646,7 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
     // disabled
   };
 
-  const toolsConfig = {
-    [toolNames.Crosshairs]: {
-      viewportIndicators: false,
-      autoPan: {
-        enabled: false,
-        panSize: 10
-      }
-    },
-    [toolNames.ArrowAnnotate]: {
-      getTextCallback: (callback, eventDetails) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        eventDetails
-      }),
-      changeTextCallback: (data, eventDetails, callback) => commandsManager.runCommand('arrowTextCallback', {
-        callback,
-        data,
-        eventDetails
-      })
-    }
-  };
-  toolGroupService.createToolGroupAndAddTools('mpr', tools, toolsConfig);
+  toolGroupService.createToolGroupAndAddTools('mpr', tools);
 }
 function initToolGroups(extensionManager, toolGroupService, commandsManager) {
   initDefaultToolGroup(extensionManager, toolGroupService, commandsManager, 'default');
@@ -751,7 +734,6 @@ function modeFactory() {
       const activateTool = () => {
         toolbarService.recordInteraction({
           groupId: 'WindowLevel',
-          itemId: 'WindowLevel',
           interactionType: 'tool',
           commands: [{
             commandName: 'setToolActive',

package/dist/{181.bundle.9a76ce585a7139d4862f.js → 181.bundle.fa57199595cf28f44c7b.js}

@@ -25,8 +25,8 @@ var esm = __webpack_require__(99777);
 var dist_esm = __webpack_require__(45754);
 // EXTERNAL MODULE: ../../core/src/index.ts + 75 modules
 var src = __webpack_require__(34491);
-// EXTERNAL MODULE: ../../ui/src/index.js + 458 modules
-var ui_src = __webpack_require__(88344);
+// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
+var ui_src = __webpack_require__(71783);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/state.ts
 var state = __webpack_require__(73704);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/Viewport/OHIFCornerstoneViewport.css
@@ -989,11 +989,11 @@ function WrappedCinePlayer(_ref) {
   const handleCineClose = () => {
     toolbarService.recordInteraction({
       groupId: 'MoreTools',
-      itemId: 'cine',
       interactionType: 'toggle',
       commands: [{
         commandName: 'toggleCine',
         commandOptions: {},
+        toolName: 'cine',
         context: 'CORNERSTONE'
       }]
     });