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

package/dist/{250.bundle.d8b502b7ef6afc79a87e.js → 448.bundle.d195aba3aef25ec286d1.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[250],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[448],{
 
-/***/ 11250:
+/***/ 14448:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -12,10 +12,10 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ basic_test_mode_src)
 });
 
-// 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 + 497 modules
+var ui_src = __webpack_require__(58046);
 ;// CONCATENATED MODULE: ../../../modes/basic-test-mode/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
@@ -24,6 +24,9 @@ var ui_src = __webpack_require__(6804);
 const {
   windowLevelPresets
 } = src.defaults;
+const {
+  createButton
+} = src.ToolbarService;
 
 /**
  *
@@ -36,7 +39,6 @@ function _createWwwcPreset(preset, title, subtitle) {
     id: preset.toString(),
     title,
     subtitle,
-    type: 'action',
     commands: [{
       commandName: 'setWindowLevel',
       commandOptions: {
@@ -46,144 +48,97 @@ function _createWwwcPreset(preset, title, subtitle) {
     }]
   };
 }
-const toolbarButtons = [
-// Measurement
-{
+const setToolActiveToolbar = {
+  commandName: 'setToolActiveToolbar',
+  commandOptions: {
+    toolGroupIds: ['default', 'mpr', 'SRToolGroup']
+  }
+};
+const toolbarButtons = [{
   id: 'MeasurementTools',
-  type: 'ohif.splitButton',
+  uiType: 'ohif.splitButton',
   props: {
     groupId: 'MeasurementTools',
-    isRadio: true,
-    // ?
-    // Switch?
-    primary: src/* ToolbarService */.hx._createToolButton('Length', 'tool-length', 'Length', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'Length'
-      },
-      context: 'CORNERSTONE'
-    }, {
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'SRLength',
-        toolGroupId: 'SRToolGroup'
-      },
-      // we can use the setToolActive command for this from Cornerstone commandsModule
-      context: 'CORNERSTONE'
-    }], 'Length'),
+    // group evaluate to determine which item should move to the top
+    evaluate: 'evaluate.group.promoteToPrimaryIfCornerstoneToolNotActiveInTheList',
+    primary: createButton({
+      id: 'Length',
+      icon: 'tool-length',
+      label: 'Length',
+      tooltip: 'Length Tool',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }),
     secondary: {
       icon: 'chevron-down',
-      label: '',
-      isActive: true,
       tooltip: 'More Measure Tools'
     },
-    items: [src/* ToolbarService */.hx._createToolButton('Length', 'tool-length', 'Length', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'Length'
-      },
-      context: 'CORNERSTONE'
-    }, {
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'SRLength',
-        toolGroupId: 'SRToolGroup'
-      },
-      // we can use the setToolActive command for this from Cornerstone commandsModule
-      context: 'CORNERSTONE'
-    }], 'Length Tool'), src/* ToolbarService */.hx._createToolButton('Bidirectional', 'tool-bidirectional', 'Bidirectional', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'Bidirectional'
-      },
-      context: 'CORNERSTONE'
-    }, {
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'SRBidirectional',
-        toolGroupId: 'SRToolGroup'
-      },
-      context: 'CORNERSTONE'
-    }], 'Bidirectional Tool'), src/* ToolbarService */.hx._createToolButton('ArrowAnnotate', 'tool-annotate', 'Annotation', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'ArrowAnnotate'
-      },
-      context: 'CORNERSTONE'
-    }, {
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'SRArrowAnnotate',
-        toolGroupId: 'SRToolGroup'
-      },
-      context: 'CORNERSTONE'
-    }], 'Arrow Annotate'), src/* ToolbarService */.hx._createToolButton('EllipticalROI', 'tool-elipse', 'Ellipse', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'EllipticalROI'
-      },
-      context: 'CORNERSTONE'
-    }, {
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'SREllipticalROI',
-        toolGroupId: 'SRToolGroup'
-      },
-      context: 'CORNERSTONE'
-    }], 'Ellipse Tool'), src/* ToolbarService */.hx._createToolButton('CircleROI', 'tool-circle', 'Circle', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'CircleROI'
-      },
-      context: 'CORNERSTONE'
-    }, {
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'SRCircleROI',
-        toolGroupId: 'SRToolGroup'
-      },
-      context: 'CORNERSTONE'
-    }], 'Circle Tool')]
+    items: [createButton({
+      id: 'Length',
+      icon: 'tool-length',
+      label: 'Length',
+      tooltip: 'Length Tool',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'Bidirectional',
+      icon: 'tool-bidirectional',
+      label: 'Bidirectional',
+      tooltip: 'Bidirectional Tool',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'ArrowAnnotate',
+      icon: 'tool-annotate',
+      label: 'Annotation',
+      tooltip: 'Arrow Annotate',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'EllipticalROI',
+      icon: 'tool-ellipse',
+      label: 'Ellipse',
+      tooltip: 'Ellipse ROI',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'CircleROI',
+      icon: 'tool-circle',
+      label: 'Circle',
+      tooltip: 'Circle Tool',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    })]
   }
-},
-// Zoom..
-{
+}, {
   id: 'Zoom',
-  type: 'ohif.radioGroup',
+  uiType: 'ohif.radioGroup',
   props: {
-    type: 'tool',
     icon: 'tool-zoom',
     label: 'Zoom',
-    commands: [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'Zoom'
-      },
-      context: 'CORNERSTONE'
-    }]
+    commands: setToolActiveToolbar,
+    evaluate: 'evaluate.cornerstoneTool'
   }
 },
 // Window Level + Presets...
 {
   id: 'WindowLevel',
-  type: 'ohif.splitButton',
+  uiType: 'ohif.splitButton',
   props: {
     groupId: 'WindowLevel',
-    primary: src/* ToolbarService */.hx._createToolButton('WindowLevel', 'tool-window-level', 'Window Level', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'WindowLevel'
-      },
-      context: 'CORNERSTONE'
-    }], 'Window Level'),
+    primary: createButton({
+      id: 'WindowLevel',
+      icon: 'tool-window-level',
+      label: 'Window Level',
+      tooltip: 'Window Level',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }),
     secondary: {
       icon: 'chevron-down',
       label: 'W/L Manual',
-      isActive: true,
       tooltip: 'W/L Presets'
     },
-    isAction: true,
-    // ?
     renderer: ui_src/* WindowLevelMenuItem */.d4,
     items: [_createWwwcPreset(1, 'Soft tissue', '400 / 40'), _createWwwcPreset(2, 'Lung', '1500 / -600'), _createWwwcPreset(3, 'Liver', '150 / 90'), _createWwwcPreset(4, 'Bone', '2500 / 480'), _createWwwcPreset(5, 'Brain', '80 / 40')]
   }
@@ -191,138 +146,77 @@ const toolbarButtons = [
 // Pan...
 {
   id: 'Pan',
-  type: 'ohif.radioGroup',
+  uiType: 'ohif.radioGroup',
   props: {
     type: 'tool',
     icon: 'tool-move',
     label: 'Pan',
+    commands: setToolActiveToolbar,
+    evaluate: 'evaluate.cornerstoneTool'
+  }
+}, {
+  id: 'MPR',
+  uiType: 'ohif.radioGroup',
+  props: {
+    icon: 'icon-mpr',
+    label: 'MPR',
+    commands: [{
+      commandName: 'toggleHangingProtocol',
+      commandOptions: {
+        protocolId: 'mpr'
+      }
+    }],
+    evaluate: 'evaluate.mpr'
+  }
+}, {
+  id: 'TrackBallRotate',
+  type: 'ohif.radioGroup',
+  props: {
+    type: 'tool',
+    icon: 'tool-3d-rotate',
+    label: '3D Rotate',
     commands: [{
       commandName: 'setToolActive',
       commandOptions: {
-        toolName: 'Pan'
+        toolName: 'TrackBallRotate'
       },
       context: 'CORNERSTONE'
     }]
   }
 }, {
   id: 'Capture',
-  type: 'ohif.action',
+  uiType: 'ohif.radioGroup',
   props: {
     icon: 'tool-capture',
     label: 'Capture',
-    type: 'action',
     commands: [{
-      commandName: 'showDownloadViewportModal',
-      commandOptions: {},
-      context: 'CORNERSTONE'
-    }]
+      commandName: 'showDownloadViewportModal'
+    }],
+    evaluate: 'evaluate.action'
   }
 }, {
   id: 'Layout',
-  type: 'ohif.splitButton',
+  uiType: 'ohif.layoutSelector',
   props: {
-    groupId: 'LayoutTools',
-    isRadio: false,
-    primary: {
-      id: 'Layout',
-      type: 'action',
-      uiType: 'ohif.layoutSelector',
-      icon: 'tool-layout',
-      label: 'Grid Layout',
-      props: {
-        rows: 4,
-        columns: 4,
-        commands: [{
-          commandName: 'setLayout',
-          commandOptions: {},
-          context: 'CORNERSTONE'
-        }]
-      }
-    },
-    secondary: {
-      icon: 'chevron-down',
-      label: '',
-      isActive: true,
-      tooltip: 'Hanging Protocols'
-    },
-    items: [{
-      id: '2x2',
-      type: 'action',
-      label: '2x2',
-      commands: [{
-        commandName: 'setHangingProtocol',
-        commandOptions: {
-          protocolId: '@ohif/mnGrid',
-          stageId: '2x2'
-        },
-        context: 'DEFAULT'
-      }]
-    }, {
-      id: '3x1',
-      type: 'action',
-      label: '3x1',
-      commands: [{
-        commandName: 'setHangingProtocol',
-        commandOptions: {
-          protocolId: '@ohif/mnGrid',
-          stageId: '3x1'
-        },
-        context: 'DEFAULT'
-      }]
-    }, {
-      id: '2x1',
-      type: 'action',
-      label: '2x1',
-      commands: [{
-        commandName: 'setHangingProtocol',
-        commandOptions: {
-          protocolId: '@ohif/mnGrid',
-          stageId: '2x1'
-        },
-        context: 'DEFAULT'
-      }]
-    }, {
-      id: '1x1',
-      type: 'action',
-      label: '1x1',
-      commands: [{
-        commandName: 'setHangingProtocol',
-        commandOptions: {
-          protocolId: '@ohif/mnGrid',
-          stageId: '1x1'
-        },
-        context: 'DEFAULT'
-      }]
-    }]
-  }
-}, {
-  id: 'MPR',
-  type: 'ohif.action',
-  props: {
-    type: 'toggle',
-    icon: 'icon-mpr',
-    label: 'MPR',
-    commands: [{
-      commandName: 'toggleHangingProtocol',
-      commandOptions: {
-        protocolId: 'mpr'
-      }
-    }]
+    rows: 3,
+    columns: 4,
+    evaluate: 'evaluate.action',
+    commands: 'setViewportGridLayout'
   }
 }, {
   id: 'Crosshairs',
-  type: 'ohif.radioGroup',
+  uiType: 'ohif.radioGroup',
   props: {
     type: 'tool',
     icon: 'tool-crosshair',
     label: 'Crosshairs',
-    commands: [{
-      commandName: 'setToolActive',
+    commands: {
+      commandName: 'setToolActiveToolbar',
       commandOptions: {
-        toolGroupId: 'mpr',
-        toolName: 'Crosshairs'
+        toolGroupIds: ['mpr']
       }
-    }]
+    },
+    evaluate: 'evaluate.cornerstoneTool'
   }
 }];
 /* harmony default export */ const src_toolbarButtons = (toolbarButtons);
@@ -530,10 +424,37 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
   };
   toolGroupService.createToolGroupAndAddTools('mpr', tools);
 }
+function initVolume3DToolGroup(extensionManager, toolGroupService) {
+  const utilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.tools');
+  const {
+    toolNames,
+    Enums
+  } = utilityModule.exports;
+  const tools = {
+    active: [{
+      toolName: toolNames.TrackballRotateTool,
+      bindings: [{
+        mouseButton: Enums.MouseBindings.Primary
+      }]
+    }, {
+      toolName: toolNames.Zoom,
+      bindings: [{
+        mouseButton: Enums.MouseBindings.Secondary
+      }]
+    }, {
+      toolName: toolNames.Pan,
+      bindings: [{
+        mouseButton: Enums.MouseBindings.Auxiliary
+      }]
+    }]
+  };
+  toolGroupService.createToolGroupAndAddTools('volume3d', tools);
+}
 function initToolGroups(extensionManager, toolGroupService, commandsManager) {
   initDefaultToolGroup(extensionManager, toolGroupService, commandsManager, 'default');
   initSRToolGroup(extensionManager, toolGroupService, commandsManager);
   initMPRToolGroup(extensionManager, toolGroupService, commandsManager);
+  initVolume3DToolGroup(extensionManager, toolGroupService);
 }
 /* harmony default export */ const src_initToolGroups = (initToolGroups);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 383 modules
@@ -541,45 +462,65 @@ var esm = __webpack_require__(50719);
 ;// CONCATENATED MODULE: ../../../modes/basic-test-mode/src/moreTools.ts
 
 
-const ReferenceLinesCommands = [{
+
+const {
+  createButton: moreTools_createButton
+} = src.ToolbarService;
+const ReferenceLinesListeners = [{
   commandName: 'setSourceViewportForReferenceLinesTool',
   context: 'CORNERSTONE'
-}, {
-  commandName: 'setToolActive',
-  commandOptions: {
-    toolName: 'ReferenceLines'
-  },
-  context: 'CORNERSTONE'
 }];
 const moreTools = [{
   id: 'MoreTools',
-  type: 'ohif.splitButton',
+  uiType: 'ohif.splitButton',
   props: {
-    isRadio: true,
-    // ?
     groupId: 'MoreTools',
-    primary: src/* ToolbarService */.hx._createActionButton('Reset', 'tool-reset', 'Reset View', [{
-      commandName: 'resetViewport'
-    }], 'Reset'),
+    evaluate: 'evaluate.group.promoteToPrimaryIfCornerstoneToolNotActiveInTheList',
+    primary: moreTools_createButton({
+      id: 'Reset',
+      icon: 'tool-reset',
+      tooltip: 'Reset View',
+      label: 'Reset',
+      commands: 'resetViewport',
+      evaluate: 'evaluate.action'
+    }),
     secondary: {
       icon: 'chevron-down',
       label: '',
-      isActive: true,
       tooltip: 'More Tools'
     },
-    items: [src/* ToolbarService */.hx._createActionButton('Reset', 'tool-reset', 'Reset View', [{
-      commandName: 'resetViewport'
-    }], 'Reset'), src/* ToolbarService */.hx._createActionButton('rotate-right', 'tool-rotate-right', 'Rotate Right', [{
-      commandName: 'rotateViewportCW',
-      commandOptions: {},
-      context: 'CORNERSTONE'
-    }], 'Rotate +90'), src/* ToolbarService */.hx._createActionButton('flip-horizontal', 'tool-flip-horizontal', 'Flip Horizontally', [{
-      commandName: 'flipViewportHorizontal',
-      commandOptions: {},
-      context: 'CORNERSTONE'
-    }], 'Flip Horizontally'), src/* ToolbarService */.hx._createToggleButton('ImageSliceSync', 'link', 'Image Slice Sync', [{
-      commandName: 'toggleImageSliceSync'
-    }], 'Enable position synchronization on stack viewports', {
+    items: [moreTools_createButton({
+      id: 'Reset',
+      icon: 'tool-reset',
+      label: 'Reset View',
+      tooltip: 'Reset View',
+      commands: 'resetViewport',
+      evaluate: 'evaluate.action'
+    }), moreTools_createButton({
+      id: 'rotate-right',
+      icon: 'tool-rotate-right',
+      label: 'Rotate Right',
+      tooltip: 'Rotate +90',
+      commands: 'rotateViewportCW',
+      evaluate: 'evaluate.action'
+    }), moreTools_createButton({
+      id: 'flipHorizontal',
+      icon: 'tool-flip-horizontal',
+      label: 'Flip Horizontal',
+      tooltip: 'Flip Horizontally',
+      commands: 'flipViewportHorizontal',
+      evaluate: 'evaluate.viewportProperties.toggle'
+    }), moreTools_createButton({
+      id: 'ImageSliceSync',
+      icon: 'link',
+      label: 'Image Slice Sync',
+      tooltip: 'Enable position synchronization on stack viewports',
+      commands: {
+        commandName: 'toggleSynchronizer',
+        commandOptions: {
+          type: 'imageSlice'
+        }
+      },
       listeners: {
         [esm.EVENTS.STACK_VIEWPORT_NEW_STACK]: {
           commandName: 'toggleImageSliceSync',
@@ -587,118 +528,104 @@ const moreTools = [{
             toggledState: true
           }
         }
-      }
-    }), src/* ToolbarService */.hx._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 */.hx._createToolButton('StackScroll', 'tool-stack-scroll', 'Stack Scroll', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'StackScroll'
       },
-      context: 'CORNERSTONE'
-    }], 'Stack Scroll'), src/* ToolbarService */.hx._createActionButton('invert', 'tool-invert', 'Invert', [{
-      commandName: 'invertViewport',
-      commandOptions: {},
-      context: 'CORNERSTONE'
-    }], 'Invert Colors'), src/* ToolbarService */.hx._createToolButton('Probe', 'tool-probe', 'Probe', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'DragProbe'
-      },
-      context: 'CORNERSTONE'
-    }], 'Probe'), src/* ToolbarService */.hx._createToggleButton('cine', 'tool-cine', 'Cine', [{
-      commandName: 'toggleCine',
-      context: 'CORNERSTONE'
-    }], 'Cine'), src/* ToolbarService */.hx._createToolButton('Angle', 'tool-angle', 'Angle', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'Angle'
+      evaluate: 'evaluate.cornerstone.synchronizer'
+    }), moreTools_createButton({
+      id: 'ReferenceLines',
+      icon: 'tool-referenceLines',
+      label: 'Reference Lines',
+      tooltip: 'Show Reference Lines',
+      commands: {
+        commandName: 'setToolEnabled',
+        commandOptions: {
+          toolName: 'ReferenceLines',
+          toggle: true
+        }
       },
-      context: 'CORNERSTONE'
-    }], 'Angle'), src/* ToolbarService */.hx._createToolButton('Magnify', 'tool-magnify', 'Magnify', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'Magnify'
+      listeners: {
+        [src/* ViewportGridService */.sI.EVENTS.ACTIVE_VIEWPORT_ID_CHANGED]: ReferenceLinesListeners,
+        [src/* ViewportGridService */.sI.EVENTS.VIEWPORTS_READY]: ReferenceLinesListeners
       },
-      context: 'CORNERSTONE'
-    }], 'Magnify'), src/* ToolbarService */.hx._createToolButton('Rectangle', 'tool-rectangle', 'Rectangle', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'RectangleROI'
+      evaluate: 'evaluate.cornerstoneTool.toggle'
+    }), moreTools_createButton({
+      id: 'ImageOverlay',
+      icon: 'toggle-dicom-overlay',
+      label: 'Image Overlay',
+      tooltip: 'Toggle Image Overlay',
+      commands: {
+        commandName: 'setToolEnabled',
+        commandOptions: {
+          toolName: 'ImageOverlayViewer',
+          toggle: true
+        }
       },
-      context: 'CORNERSTONE'
-    }], 'Rectangle'), src/* ToolbarService */.hx._createActionButton('TagBrowser', 'list-bullets', 'Dicom Tag Browser', [{
-      commandName: 'openDICOMTagViewer',
-      commandOptions: {},
-      context: 'DEFAULT'
-    }], 'Dicom Tag Browser')]
+      evaluate: 'evaluate.cornerstoneTool.toggle'
+    }), moreTools_createButton({
+      id: 'StackScroll',
+      icon: 'tool-stack-scroll',
+      label: 'Stack Scroll',
+      tooltip: 'Stack Scroll',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), moreTools_createButton({
+      id: 'invert',
+      icon: 'tool-invert',
+      label: 'Invert',
+      tooltip: 'Invert Colors',
+      commands: 'invertViewport',
+      evaluate: 'evaluate.viewportProperties.toggle'
+    }), moreTools_createButton({
+      id: 'Probe',
+      icon: 'tool-probe',
+      label: 'Probe',
+      tooltip: 'Probe',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), moreTools_createButton({
+      id: 'Cine',
+      icon: 'tool-cine',
+      label: 'Cine',
+      tooltip: 'Cine',
+      commands: 'toggleCine',
+      evaluate: 'evaluate.cine'
+    }), moreTools_createButton({
+      id: 'Angle',
+      icon: 'tool-angle',
+      label: 'Angle',
+      tooltip: 'Angle',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), moreTools_createButton({
+      id: 'Magnify',
+      icon: 'tool-magnify',
+      label: 'Magnify',
+      tooltip: 'Magnify',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), moreTools_createButton({
+      id: 'RectangleROI',
+      icon: 'tool-rectangle',
+      label: 'Rectangle',
+      tooltip: 'Rectangle',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), moreTools_createButton({
+      id: 'CalibrationLine',
+      icon: 'tool-calibration',
+      label: 'Calibration',
+      tooltip: 'Calibration Line',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), moreTools_createButton({
+      id: 'TagBrowser',
+      icon: 'list-bullets',
+      label: 'Dicom Tag Browser',
+      tooltip: 'Dicom Tag Browser',
+      commands: 'openDICOMTagViewer'
+    })]
   }
 }];
 /* harmony default export */ const src_moreTools = (moreTools);
-;// CONCATENATED MODULE: ../../../modes/basic-test-mode/src/moreToolsMpr.ts
-
-const moreToolsMpr = [{
-  id: 'MoreToolsMpr',
-  type: 'ohif.splitButton',
-  props: {
-    isRadio: true,
-    // ?
-    groupId: 'MoreTools',
-    primary: src/* ToolbarService */.hx._createActionButton('Reset', 'tool-reset', 'Reset View', [{
-      commandName: 'resetViewport'
-    }], 'Reset'),
-    secondary: {
-      icon: 'chevron-down',
-      label: '',
-      isActive: true,
-      tooltip: 'More Tools'
-    },
-    items: [src/* ToolbarService */.hx._createActionButton('Reset', 'tool-reset', 'Reset View', [{
-      commandName: 'resetViewport'
-    }], 'Reset'), src/* ToolbarService */.hx._createToolButton('StackScroll', 'tool-stack-scroll', 'Stack Scroll', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'StackScroll'
-      },
-      context: 'CORNERSTONE'
-    }], 'Stack Scroll'), src/* ToolbarService */.hx._createActionButton('invert', 'tool-invert', 'Invert', [{
-      commandName: 'invertViewport',
-      commandOptions: {},
-      context: 'CORNERSTONE'
-    }], 'Invert Colors'), src/* ToolbarService */.hx._createToolButton('Probe', 'tool-probe', 'Probe', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'DragProbe'
-      },
-      context: 'CORNERSTONE'
-    }], 'Probe'), src/* ToolbarService */.hx._createToggleButton('cine', 'tool-cine', 'Cine', [{
-      commandName: 'toggleCine',
-      context: 'CORNERSTONE'
-    }], 'Cine'), src/* ToolbarService */.hx._createToolButton('Angle', 'tool-angle', 'Angle', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'Angle'
-      },
-      context: 'CORNERSTONE'
-    }], 'Angle'), src/* ToolbarService */.hx._createToolButton('Rectangle', 'tool-rectangle', 'Rectangle', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'RectangleROI'
-      },
-      context: 'CORNERSTONE'
-    }], 'Rectangle'), src/* ToolbarService */.hx._createActionButton('TagBrowser', 'list-bullets', 'Dicom Tag Browser', [{
-      commandName: 'openDICOMTagViewer',
-      commandOptions: {},
-      context: 'DEFAULT'
-    }], 'Dicom Tag Browser')]
-  }
-}];
-/* harmony default export */ const src_moreToolsMpr = (moreToolsMpr);
 // EXTERNAL MODULE: ../../../node_modules/i18next/dist/esm/i18next.js
 var i18next = __webpack_require__(92344);
 ;// CONCATENATED MODULE: ../../../modes/basic-test-mode/src/index.ts
@@ -709,12 +636,9 @@ var i18next = __webpack_require__(92344);
 
 
 
-
 // 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'];
-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',
@@ -781,36 +705,8 @@ function modeFactory() {
 
       // init customizations
       customizationService.addModeCustomizations(['@ohif/extension-test.customizationModule.custom-context-menu']);
-      let unsubscribe;
-      toolbarService.setDefaultTool({
-        groupId: 'WindowLevel',
-        itemId: 'WindowLevel',
-        interactionType: 'tool',
-        commands: [{
-          commandName: 'setToolActive',
-          commandOptions: {
-            toolName: 'WindowLevel'
-          },
-          context: 'CORNERSTONE'
-        }]
-      });
-      const activateTool = () => {
-        toolbarService.recordInteraction(toolbarService.getDefaultTool());
-
-        // We don't need to reset the active tool whenever a viewport is getting
-        // added to the toolGroup.
-        unsubscribe();
-      };
-
-      // Since we only have one viewport for the basic cs3d mode and it has
-      // only one hanging protocol, we can just use the first viewport
-      ({
-        unsubscribe
-      } = toolGroupService.subscribe(toolGroupService.EVENTS.VIEWPORT_ADDED, activateTool));
-      toolbarService.init(extensionManager);
-      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']);
+      toolbarService.addButtons([...src_toolbarButtons, ...src_moreTools]);
+      toolbarService.createButtonSection('primary', ['MeasurementTools', 'Zoom', 'WindowLevel', 'Pan', 'Capture', 'Layout', 'MPR', 'Crosshairs', 'MoreTools']);
     },
     onModeExit: ({
       servicesManager