@ohif/app 3.8.0-beta.2 → 3.8.0-beta.21

package/dist/{370.bundle.e6179cf74d133ce903f9.js → 563.bundle.cd25976497ad15a91e75.js}

@@ -1,6 +1,6 @@
-(self["webpackChunk"] = self["webpackChunk"] || []).push([[370],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[563],{
 
-/***/ 71522:
+/***/ 59185:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -16,22 +16,16 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
 var src = __webpack_require__(71771);
-// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
-var ui_src = __webpack_require__(71783);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 331 modules
-var esm = __webpack_require__(3743);
+// EXTERNAL MODULE: ../../ui/src/index.js + 486 modules
+var ui_src = __webpack_require__(22582);
 ;// CONCATENATED MODULE: ../../../modes/longitudinal/src/toolbarButtons.ts
 // 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
 
 
-
 const {
   windowLevelPresets
 } = src.defaults;
-const _createActionButton = src/* ToolbarService */.Ok._createButton.bind(null, 'action');
-const _createToggleButton = src/* ToolbarService */.Ok._createButton.bind(null, 'toggle');
-const _createToolButton = src/* ToolbarService */.Ok._createButton.bind(null, 'tool');
 
 /**
  *
@@ -73,16 +67,6 @@ function _createSetToolActiveCommands(toolName) {
   }));
   return temp;
 }
-const ReferenceLinesCommands = [{
-  commandName: 'setSourceViewportForReferenceLinesTool',
-  context: 'CORNERSTONE'
-}, {
-  commandName: 'setToolActive',
-  commandOptions: {
-    toolName: 'ReferenceLines'
-  },
-  context: 'CORNERSTONE'
-}];
 const toolbarButtons = [
 // Measurement
 {
@@ -93,7 +77,7 @@ const toolbarButtons = [
     isRadio: true,
     // ?
     // Switch?
-    primary: _createToolButton('Length', 'tool-length', 'Length', [{
+    primary: src/* ToolbarService */.Ok._createToolButton('Length', 'tool-length', 'Length', [{
       commandName: 'setToolActive',
       commandOptions: {
         toolName: 'Length'
@@ -114,7 +98,7 @@ const toolbarButtons = [
       isActive: true,
       tooltip: 'More Measure Tools'
     },
-    items: [_createToolButton('Length', 'tool-length', 'Length', [{
+    items: [src/* ToolbarService */.Ok._createToolButton('Length', 'tool-length', 'Length', [{
       commandName: 'setToolActive',
       commandOptions: {
         toolName: 'Length'
@@ -128,7 +112,7 @@ const toolbarButtons = [
       },
       // we can use the setToolActive command for this from Cornerstone commandsModule
       context: 'CORNERSTONE'
-    }], 'Length Tool'), _createToolButton('Bidirectional', 'tool-bidirectional', 'Bidirectional', [{
+    }], 'Length Tool'), src/* ToolbarService */.Ok._createToolButton('Bidirectional', 'tool-bidirectional', 'Bidirectional', [{
       commandName: 'setToolActive',
       commandOptions: {
         toolName: 'Bidirectional'
@@ -141,7 +125,7 @@ const toolbarButtons = [
         toolGroupId: 'SRToolGroup'
       },
       context: 'CORNERSTONE'
-    }], 'Bidirectional Tool'), _createToolButton('ArrowAnnotate', 'tool-annotate', 'Annotation', [{
+    }], 'Bidirectional Tool'), src/* ToolbarService */.Ok._createToolButton('ArrowAnnotate', 'tool-annotate', 'Annotation', [{
       commandName: 'setToolActive',
       commandOptions: {
         toolName: 'ArrowAnnotate'
@@ -154,7 +138,7 @@ const toolbarButtons = [
         toolGroupId: 'SRToolGroup'
       },
       context: 'CORNERSTONE'
-    }], 'Arrow Annotate'), _createToolButton('EllipticalROI', 'tool-elipse', 'Ellipse', [{
+    }], 'Arrow Annotate'), src/* ToolbarService */.Ok._createToolButton('EllipticalROI', 'tool-elipse', 'Ellipse', [{
       commandName: 'setToolActive',
       commandOptions: {
         toolName: 'EllipticalROI'
@@ -167,7 +151,7 @@ const toolbarButtons = [
         toolGroupId: 'SRToolGroup'
       },
       context: 'CORNERSTONE'
-    }], 'Ellipse Tool'), _createToolButton('CircleROI', 'tool-circle', 'Circle', [{
+    }], 'Ellipse Tool'), src/* ToolbarService */.Ok._createToolButton('CircleROI', 'tool-circle', 'Circle', [{
       commandName: 'setToolActive',
       commandOptions: {
         toolName: 'CircleROI'
@@ -200,7 +184,7 @@ const toolbarButtons = [
   type: 'ohif.splitButton',
   props: {
     groupId: 'WindowLevel',
-    primary: _createToolButton('WindowLevel', 'tool-window-level', 'Window Level', [{
+    primary: src/* ToolbarService */.Ok._createToolButton('WindowLevel', 'tool-window-level', 'Window Level', [{
       commandName: 'setToolActive',
       commandOptions: {
         toolName: 'WindowLevel'
@@ -280,146 +264,10 @@ const toolbarButtons = [
       context: 'CORNERSTONE'
     }]
   }
-},
+}
 // More...
-{
-  id: 'MoreTools',
-  type: 'ohif.splitButton',
-  props: {
-    isRadio: true,
-    // ?
-    groupId: 'MoreTools',
-    primary: _createActionButton('Reset', 'tool-reset', 'Reset View', [{
-      commandName: 'resetViewport',
-      commandOptions: {},
-      context: 'CORNERSTONE'
-    }], 'Reset'),
-    secondary: {
-      icon: 'chevron-down',
-      label: '',
-      isActive: true,
-      tooltip: 'More Tools'
-    },
-    items: [_createActionButton('Reset', 'tool-reset', 'Reset View', [{
-      commandName: 'resetViewport',
-      commandOptions: {},
-      context: 'CORNERSTONE'
-    }], 'Reset'), _createActionButton('rotate-right', 'tool-rotate-right', 'Rotate Right', [{
-      commandName: 'rotateViewportCW',
-      commandOptions: {},
-      context: 'CORNERSTONE'
-    }], 'Rotate +90'), _createActionButton('flip-horizontal', 'tool-flip-horizontal', 'Flip Horizontally', [{
-      commandName: 'flipViewportHorizontal',
-      commandOptions: {},
-      context: 'CORNERSTONE'
-    }], 'Flip Horizontal'), _createToggleButton('StackImageSync', 'link', 'Stack Image Sync', [{
-      commandName: 'toggleStackImageSync'
-    }], 'Enable position synchronization on stack viewports', {
-      listeners: {
-        [esm.EVENTS.STACK_VIEWPORT_NEW_STACK]: {
-          commandName: 'toggleStackImageSync',
-          commandOptions: {
-            toggledState: true
-          }
-        }
-      }
-    }), _createToggleButton('ReferenceLines', 'tool-referenceLines',
-    // change this with the new icon
-    'Reference Lines', ReferenceLinesCommands, 'Show Reference Lines', {
-      listeners: {
-        [esm.EVENTS.STACK_VIEWPORT_NEW_STACK]: ReferenceLinesCommands,
-        [esm.EVENTS.ACTIVE_VIEWPORT_ID_CHANGED]: ReferenceLinesCommands
-      }
-    }), _createToggleButton('ImageOverlayViewer', 'toggle-dicom-overlay', 'Image Overlay', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'ImageOverlayViewer'
-      },
-      context: 'CORNERSTONE'
-    }], 'Image Overlay', {
-      isActive: true
-    }), _createToolButton('StackScroll', 'tool-stack-scroll', 'Stack Scroll', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'StackScroll'
-      },
-      context: 'CORNERSTONE'
-    }], 'Stack Scroll'), _createActionButton('invert', 'tool-invert', 'Invert', [{
-      commandName: 'invertViewport',
-      commandOptions: {},
-      context: 'CORNERSTONE'
-    }], 'Invert Colors'), _createToolButton('Probe', 'tool-probe', 'Probe', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'DragProbe'
-      },
-      context: 'CORNERSTONE'
-    }], 'Probe'), _createToggleButton('cine', 'tool-cine', 'Cine', [{
-      commandName: 'toggleCine',
-      context: 'CORNERSTONE'
-    }], 'Cine'), _createToolButton('Angle', 'tool-angle', 'Angle', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'Angle'
-      },
-      context: 'CORNERSTONE'
-    }], 'Angle'),
-    // Next two tools can be added once icons are added
-    // _createToolButton(
-    //   'Cobb Angle',
-    //   'tool-cobb-angle',
-    //   'Cobb Angle',
-    //   [
-    //     {
-    //       commandName: 'setToolActive',
-    //       commandOptions: {
-    //         toolName: 'CobbAngle',
-    //       },
-    //       context: 'CORNERSTONE',
-    //     },
-    //   ],
-    //   'Cobb Angle'
-    // ),
-    // _createToolButton(
-    //   'Planar Freehand ROI',
-    //   'tool-freehand',
-    //   'PlanarFreehandROI',
-    //   [
-    //     {
-    //       commandName: 'setToolActive',
-    //       commandOptions: {
-    //         toolName: 'PlanarFreehandROI',
-    //       },
-    //       context: 'CORNERSTONE',
-    //     },
-    //   ],
-    //   'Planar Freehand ROI'
-    // ),
-    _createToolButton('Magnify', 'tool-magnify', 'Magnify', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'Magnify'
-      },
-      context: 'CORNERSTONE'
-    }], 'Magnify'), _createToolButton('Rectangle', 'tool-rectangle', 'Rectangle', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'RectangleROI'
-      },
-      context: 'CORNERSTONE'
-    }], 'Rectangle'), _createToolButton('CalibrationLine', 'tool-calibration', 'Calibration', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'CalibrationLine'
-      },
-      context: 'CORNERSTONE'
-    }], 'Calibration Line'), _createActionButton('TagBrowser', 'list-bullets', 'Dicom Tag Browser', [{
-      commandName: 'openDICOMTagViewer',
-      commandOptions: {},
-      context: 'DEFAULT'
-    }], 'Dicom Tag Browser')]
-  }
-}];
+];
+
 /* harmony default export */ const src_toolbarButtons = (toolbarButtons);
 ;// CONCATENATED MODULE: ../../../modes/longitudinal/package.json
 const package_namespaceObject = JSON.parse('{"u2":"@ohif/mode-longitudinal"}');
@@ -673,15 +521,305 @@ function initToolGroups(extensionManager, toolGroupService, commandsManager) {
   initVolume3DToolGroup(extensionManager, toolGroupService);
 }
 /* harmony default export */ const src_initToolGroups = (initToolGroups);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 344 modules
+var esm = __webpack_require__(62231);
+;// CONCATENATED MODULE: ../../../modes/longitudinal/src/moreTools.ts
+
+
+const ReferenceLinesCommands = [{
+  commandName: 'setSourceViewportForReferenceLinesTool',
+  context: 'CORNERSTONE'
+}, {
+  commandName: 'setToolActive',
+  commandOptions: {
+    toolName: 'ReferenceLines'
+  },
+  context: 'CORNERSTONE'
+}];
+const moreTools = [{
+  id: 'MoreTools',
+  type: 'ohif.splitButton',
+  props: {
+    isRadio: true,
+    // ?
+    groupId: 'MoreTools',
+    primary: src/* ToolbarService */.Ok._createActionButton('Reset', 'tool-reset', 'Reset View', [{
+      commandName: 'resetViewport',
+      commandOptions: {},
+      context: 'CORNERSTONE'
+    }], 'Reset'),
+    secondary: {
+      icon: 'chevron-down',
+      label: '',
+      isActive: true,
+      tooltip: 'More Tools'
+    },
+    items: [src/* ToolbarService */.Ok._createActionButton('Reset', 'tool-reset', 'Reset View', [{
+      commandName: 'resetViewport',
+      commandOptions: {},
+      context: 'CORNERSTONE'
+    }], 'Reset'), src/* ToolbarService */.Ok._createActionButton('rotate-right', 'tool-rotate-right', 'Rotate Right', [{
+      commandName: 'rotateViewportCW',
+      commandOptions: {},
+      context: 'CORNERSTONE'
+    }], 'Rotate +90'), src/* ToolbarService */.Ok._createActionButton('flip-horizontal', 'tool-flip-horizontal', 'Flip Horizontally', [{
+      commandName: 'flipViewportHorizontal',
+      commandOptions: {},
+      context: 'CORNERSTONE'
+    }], 'Flip Horizontal'), src/* ToolbarService */.Ok._createToggleButton('StackImageSync', 'link', 'Stack Image Sync', [{
+      commandName: 'toggleStackImageSync'
+    }], 'Enable position synchronization on stack viewports', {
+      listeners: {
+        [esm.EVENTS.STACK_VIEWPORT_NEW_STACK]: {
+          commandName: 'toggleStackImageSync',
+          commandOptions: {
+            toggledState: true
+          }
+        }
+      }
+    }), src/* ToolbarService */.Ok._createToggleButton('ReferenceLines', 'tool-referenceLines',
+    // change this with the new icon
+    'Reference Lines', ReferenceLinesCommands, 'Show Reference Lines', {
+      listeners: {
+        [esm.EVENTS.STACK_VIEWPORT_NEW_STACK]: ReferenceLinesCommands,
+        [esm.EVENTS.ACTIVE_VIEWPORT_ID_CHANGED]: ReferenceLinesCommands
+      }
+    }), src/* ToolbarService */.Ok._createToggleButton('ImageOverlayViewer', 'toggle-dicom-overlay', 'Image Overlay', [{
+      commandName: 'setToolActive',
+      commandOptions: {
+        toolName: 'ImageOverlayViewer'
+      },
+      context: 'CORNERSTONE'
+    }], 'Image Overlay', {
+      isActive: true
+    }), src/* ToolbarService */.Ok._createToolButton('StackScroll', 'tool-stack-scroll', 'Stack Scroll', [{
+      commandName: 'setToolActive',
+      commandOptions: {
+        toolName: 'StackScroll'
+      },
+      context: 'CORNERSTONE'
+    }], 'Stack Scroll'), src/* ToolbarService */.Ok._createActionButton('invert', 'tool-invert', 'Invert', [{
+      commandName: 'invertViewport',
+      commandOptions: {},
+      context: 'CORNERSTONE'
+    }], 'Invert Colors'), src/* ToolbarService */.Ok._createToolButton('Probe', 'tool-probe', 'Probe', [{
+      commandName: 'setToolActive',
+      commandOptions: {
+        toolName: 'DragProbe'
+      },
+      context: 'CORNERSTONE'
+    }], 'Probe'), src/* ToolbarService */.Ok._createToggleButton('cine', 'tool-cine', 'Cine', [{
+      commandName: 'toggleCine',
+      context: 'CORNERSTONE'
+    }], 'Cine'), src/* ToolbarService */.Ok._createToolButton('Angle', 'tool-angle', 'Angle', [{
+      commandName: 'setToolActive',
+      commandOptions: {
+        toolName: 'Angle'
+      },
+      context: 'CORNERSTONE'
+    }], 'Angle'),
+    // Next two tools can be added once icons are added
+    // ToolbarService._createToolButton(
+    //   'Cobb Angle',
+    //   'tool-cobb-angle',
+    //   'Cobb Angle',
+    //   [
+    //     {
+    //       commandName: 'setToolActive',
+    //       commandOptions: {
+    //         toolName: 'CobbAngle',
+    //       },
+    //       context: 'CORNERSTONE',
+    //     },
+    //   ],
+    //   'Cobb Angle'
+    // ),
+    // ToolbarService._createToolButton(
+    //   'Planar Freehand ROI',
+    //   'tool-freehand',
+    //   'PlanarFreehandROI',
+    //   [
+    //     {
+    //       commandName: 'setToolActive',
+    //       commandOptions: {
+    //         toolName: 'PlanarFreehandROI',
+    //       },
+    //       context: 'CORNERSTONE',
+    //     },
+    //   ],
+    //   'Planar Freehand ROI'
+    // ),
+    src/* ToolbarService */.Ok._createToolButton('Magnify', 'tool-magnify', 'Magnify', [{
+      commandName: 'setToolActive',
+      commandOptions: {
+        toolName: 'Magnify'
+      },
+      context: 'CORNERSTONE'
+    }], 'Magnify'), src/* ToolbarService */.Ok._createToolButton('Rectangle', 'tool-rectangle', 'Rectangle', [{
+      commandName: 'setToolActive',
+      commandOptions: {
+        toolName: 'RectangleROI'
+      },
+      context: 'CORNERSTONE'
+    }], 'Rectangle'), src/* ToolbarService */.Ok._createToolButton('CalibrationLine', 'tool-calibration', 'Calibration', [{
+      commandName: 'setToolActive',
+      commandOptions: {
+        toolName: 'CalibrationLine'
+      },
+      context: 'CORNERSTONE'
+    }], 'Calibration Line'), src/* ToolbarService */.Ok._createActionButton('TagBrowser', 'list-bullets', 'Dicom Tag Browser', [{
+      commandName: 'openDICOMTagViewer',
+      commandOptions: {},
+      context: 'DEFAULT'
+    }], 'Dicom Tag Browser')]
+  }
+}];
+/* harmony default export */ const src_moreTools = (moreTools);
+;// CONCATENATED MODULE: ../../../modes/longitudinal/src/moreToolsMpr.ts
+
+
+const moreToolsMpr_ReferenceLinesCommands = [{
+  commandName: 'setSourceViewportForReferenceLinesTool',
+  context: 'CORNERSTONE'
+}, {
+  commandName: 'setToolActive',
+  commandOptions: {
+    toolName: 'ReferenceLines'
+  },
+  context: 'CORNERSTONE'
+}];
+const moreToolsMpr = [{
+  id: 'MoreToolsMpr',
+  type: 'ohif.splitButton',
+  props: {
+    isRadio: true,
+    // ?
+    groupId: 'MoreTools',
+    primary: src/* ToolbarService */.Ok._createActionButton('Reset', 'tool-reset', 'Reset View', [{
+      commandName: 'resetViewport',
+      commandOptions: {},
+      context: 'CORNERSTONE'
+    }], 'Reset'),
+    secondary: {
+      icon: 'chevron-down',
+      label: '',
+      isActive: true,
+      tooltip: 'More Tools'
+    },
+    items: [src/* ToolbarService */.Ok._createActionButton('Reset', 'tool-reset', 'Reset View', [{
+      commandName: 'resetViewport',
+      commandOptions: {},
+      context: 'CORNERSTONE'
+    }], 'Reset'), src/* ToolbarService */.Ok._createToggleButton('StackImageSync', 'link', 'Stack Image Sync', [{
+      commandName: 'toggleStackImageSync'
+    }], 'Enable position synchronization on stack viewports', {
+      listeners: {
+        [esm.EVENTS.STACK_VIEWPORT_NEW_STACK]: {
+          commandName: 'toggleStackImageSync',
+          commandOptions: {
+            toggledState: true
+          }
+        }
+      }
+    }), src/* ToolbarService */.Ok._createToggleButton('ReferenceLines', 'tool-referenceLines',
+    // change this with the new icon
+    'Reference Lines', moreToolsMpr_ReferenceLinesCommands, 'Show Reference Lines', {
+      listeners: {
+        [esm.EVENTS.STACK_VIEWPORT_NEW_STACK]: moreToolsMpr_ReferenceLinesCommands,
+        [esm.EVENTS.ACTIVE_VIEWPORT_ID_CHANGED]: moreToolsMpr_ReferenceLinesCommands
+      }
+    }), src/* ToolbarService */.Ok._createToggleButton('ImageOverlayViewer', 'toggle-dicom-overlay', 'Image Overlay', [{
+      commandName: 'setToolActive',
+      commandOptions: {
+        toolName: 'ImageOverlayViewer'
+      },
+      context: 'CORNERSTONE'
+    }], 'Image Overlay', {
+      isActive: true
+    }), src/* ToolbarService */.Ok._createToolButton('StackScroll', 'tool-stack-scroll', 'Stack Scroll', [{
+      commandName: 'setToolActive',
+      commandOptions: {
+        toolName: 'StackScroll'
+      },
+      context: 'CORNERSTONE'
+    }], 'Stack Scroll'), src/* ToolbarService */.Ok._createActionButton('invert', 'tool-invert', 'Invert', [{
+      commandName: 'invertViewport',
+      commandOptions: {},
+      context: 'CORNERSTONE'
+    }], 'Invert Colors'), src/* ToolbarService */.Ok._createToolButton('Probe', 'tool-probe', 'Probe', [{
+      commandName: 'setToolActive',
+      commandOptions: {
+        toolName: 'DragProbe'
+      },
+      context: 'CORNERSTONE'
+    }], 'Probe'), src/* ToolbarService */.Ok._createToggleButton('cine', 'tool-cine', 'Cine', [{
+      commandName: 'toggleCine',
+      context: 'CORNERSTONE'
+    }], 'Cine'), src/* ToolbarService */.Ok._createToolButton('Angle', 'tool-angle', 'Angle', [{
+      commandName: 'setToolActive',
+      commandOptions: {
+        toolName: 'Angle'
+      },
+      context: 'CORNERSTONE'
+    }], 'Angle'),
+    // Next two tools can be added once icons are added
+    // ToolbarService._createToolButton(
+    //   'Cobb Angle',
+    //   'tool-cobb-angle',
+    //   'Cobb Angle',
+    //   [
+    //     {
+    //       commandName: 'setToolActive',
+    //       commandOptions: {
+    //         toolName: 'CobbAngle',
+    //       },
+    //       context: 'CORNERSTONE',
+    //     },
+    //   ],
+    //   'Cobb Angle'
+    // ),
+    // ToolbarService._createToolButton(
+    //   'Planar Freehand ROI',
+    //   'tool-freehand',
+    //   'PlanarFreehandROI',
+    //   [
+    //     {
+    //       commandName: 'setToolActive',
+    //       commandOptions: {
+    //         toolName: 'PlanarFreehandROI',
+    //       },
+    //       context: 'CORNERSTONE',
+    //     },
+    //   ],
+    //   'Planar Freehand ROI'
+    // ),
+    src/* ToolbarService */.Ok._createToolButton('Rectangle', 'tool-rectangle', 'Rectangle', [{
+      commandName: 'setToolActive',
+      commandOptions: {
+        toolName: 'RectangleROI'
+      },
+      context: 'CORNERSTONE'
+    }], 'Rectangle'), src/* ToolbarService */.Ok._createActionButton('TagBrowser', 'list-bullets', 'Dicom Tag Browser', [{
+      commandName: 'openDICOMTagViewer',
+      commandOptions: {},
+      context: 'DEFAULT'
+    }], 'Dicom Tag Browser')]
+  }
+}];
+/* harmony default export */ const src_moreToolsMpr = (moreToolsMpr);
 ;// CONCATENATED MODULE: ../../../modes/longitudinal/src/index.js
 
 
 
 
 
+
+
 // Allow this mode by excluding non-imaging modalities such as SR, SEG
 // Also, SM is not a simple imaging modalities, so exclude it.
 const NON_IMAGE_MODALITIES = ['SM', 'ECG', 'SR', 'SEG', 'RTSTRUCT'];
+const DEFAULT_TOOL_GROUP_ID = 'default';
+const MPR_TOOL_GROUP_ID = 'mpr';
 const ohif = {
   layout: '@ohif/extension-default.layoutTemplateModule.viewerLayout',
   sopClassHandler: '@ohif/extension-default.sopClassHandlerModule.stack',
@@ -756,18 +894,20 @@ function modeFactory(_ref) {
       // Init Default and SR ToolGroups
       src_initToolGroups(extensionManager, toolGroupService, commandsManager);
       let unsubscribe;
+      toolbarService.setDefaultTool({
+        groupId: 'WindowLevel',
+        itemId: 'WindowLevel',
+        interactionType: 'tool',
+        commands: [{
+          commandName: 'setToolActive',
+          commandOptions: {
+            toolName: 'WindowLevel'
+          },
+          context: 'CORNERSTONE'
+        }]
+      });
       const activateTool = () => {
-        toolbarService.recordInteraction({
-          groupId: 'WindowLevel',
-          interactionType: 'tool',
-          commands: [{
-            commandName: 'setToolActive',
-            commandOptions: {
-              toolName: 'WindowLevel'
-            },
-            context: 'CORNERSTONE'
-          }]
-        });
+        toolbarService.recordInteraction(toolbarService.getDefaultTool());
 
         // We don't need to reset the active tool whenever a viewport is getting
         // added to the toolGroup.
@@ -780,8 +920,9 @@ function modeFactory(_ref) {
         unsubscribe
       } = toolGroupService.subscribe(toolGroupService.EVENTS.VIEWPORT_ADDED, activateTool));
       toolbarService.init(extensionManager);
-      toolbarService.addButtons(src_toolbarButtons);
-      toolbarService.createButtonSection('primary', ['MeasurementTools', 'Zoom', 'WindowLevel', 'Pan', 'Capture', 'Layout', 'MPR', 'Crosshairs', 'MoreTools']);
+      toolbarService.addButtons([...src_toolbarButtons, ...src_moreTools, ...src_moreToolsMpr]);
+      toolbarService.createButtonSection(DEFAULT_TOOL_GROUP_ID, ['MeasurementTools', 'Zoom', 'WindowLevel', 'Pan', 'Capture', 'Layout', 'MPR', 'MoreTools']);
+      toolbarService.createButtonSection(MPR_TOOL_GROUP_ID, ['MeasurementTools', 'Zoom', 'WindowLevel', 'Pan', 'Capture', 'Layout', 'MPR', 'Crosshairs', 'MoreToolsMpr']);
       customizationService.addModeCustomizations([{
         id: 'segmentation.disableEditing',
         value: true