@ohif/app 3.12.0-beta.77 → 3.12.0-beta.78

package/dist/{8815.bundle.75f4d45eedb9c28c2181.js → 6725.bundle.75f59fc21a7fbecb9bce.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[8815],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[6725],{
 
-/***/ 28815:
+/***/ 46725:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -176,16 +176,28 @@ const toolbarButtons = [{
     buttonSection: true
   }
 },
-// Section containers for the nested toolbox
+// Section containers for the nested toolboxes and toolbars.
 {
-  id: 'SegmentationUtilities',
-  uiType: 'ohif.toolBoxButton',
+  id: 'LabelMapUtilities',
+  uiType: 'ohif.Toolbar',
   props: {
     buttonSection: true
   }
 }, {
-  id: 'SegmentationTools',
-  uiType: 'ohif.toolBoxButton',
+  id: 'ContourUtilities',
+  uiType: 'ohif.Toolbar',
+  props: {
+    buttonSection: true
+  }
+}, {
+  id: 'LabelMapTools',
+  uiType: 'ohif.toolBoxButtonGroup',
+  props: {
+    buttonSection: true
+  }
+}, {
+  id: 'ContourTools',
+  uiType: 'ohif.toolBoxButtonGroup',
   props: {
     buttonSection: true
   }
@@ -374,16 +386,212 @@ const toolbarButtons = [{
     tooltip: i18next/* default */.A.t('Buttons:Dicom Tag Browser'),
     commands: 'openDICOMTagViewer'
   }
+}, {
+  id: 'PlanarFreehandContourSegmentationTool',
+  uiType: 'ohif.toolBoxButton',
+  props: {
+    icon: 'icon-tool-freehand-roi',
+    label: 'Freehand Segmentation',
+    tooltip: 'Freehand Segmentation',
+    evaluate: [{
+      name: 'evaluate.cornerstone.segmentation',
+      toolNames: ['PlanarFreehandContourSegmentationTool'],
+      disabledText: 'Create new segmentation to enable this tool.'
+    }, {
+      name: 'evaluate.cornerstone.hasSegmentationOfType',
+      segmentationRepresentationType: 'Contour'
+    }],
+    commands: [{
+      commandName: 'setToolActiveToolbar',
+      commandOptions: {
+        bindings: [{
+          mouseButton: 1 // Left Click
+        }, {
+          mouseButton: 1,
+          // Left Click+Shift to create a hole
+          modifierKey: 16 // Shift
+        }]
+      }
+    }, {
+      commandName: 'activateSelectedSegmentationOfType',
+      commandOptions: {
+        segmentationRepresentationType: 'Contour'
+      }
+    }],
+    options: [{
+      name: 'Interpolate Contours',
+      type: 'switch',
+      id: 'planarFreehandInterpolateContours',
+      value: false,
+      commands: {
+        commandName: 'setInterpolationToolConfiguration'
+      }
+    }]
+  }
+}, {
+  id: 'LivewireContourSegmentationTool',
+  uiType: 'ohif.toolBoxButton',
+  props: {
+    icon: 'icon-tool-livewire',
+    label: 'Livewire Contour',
+    tooltip: 'Livewire Contour',
+    evaluate: [{
+      name: 'evaluate.cornerstone.segmentation',
+      toolNames: ['LivewireContourSegmentationTool'],
+      disabledText: 'Create new segmentation to enable this tool.'
+    }, {
+      name: 'evaluate.cornerstone.hasSegmentationOfType',
+      segmentationRepresentationType: 'Contour'
+    }],
+    commands: [{
+      commandName: 'setToolActiveToolbar',
+      commandOptions: {
+        bindings: [{
+          mouseButton: 1 // Left Click
+        }, {
+          mouseButton: 1,
+          // Left Click+Shift to create a hole
+          modifierKey: 16 // Shift
+        }]
+      }
+    }, {
+      commandName: 'activateSelectedSegmentationOfType',
+      commandOptions: {
+        segmentationRepresentationType: 'Contour'
+      }
+    }],
+    options: [{
+      name: 'Interpolate Contours',
+      type: 'switch',
+      id: 'livewireInterpolateContours',
+      value: false,
+      commands: {
+        commandName: 'setInterpolationToolConfiguration'
+      }
+    }]
+  }
+}, {
+  id: 'SplineContourSegmentationTool',
+  uiType: 'ohif.toolBoxButton',
+  props: {
+    icon: 'icon-tool-spline-roi',
+    label: 'Spline Contour Segmentation Tool',
+    tooltip: 'Spline Contour Segmentation Tool',
+    evaluate: [{
+      name: 'evaluate.cornerstone.segmentation',
+      toolNames: ['CatmullRomSplineROI', 'LinearSplineROI', 'BSplineROI'],
+      disabledText: 'Create new segmentation to enable this tool.'
+    }, {
+      name: 'evaluate.cornerstone.hasSegmentationOfType',
+      segmentationRepresentationType: 'Contour'
+    }],
+    commands: [{
+      commandName: 'activateSelectedSegmentationOfType',
+      commandOptions: {
+        segmentationRepresentationType: 'Contour'
+      }
+    }],
+    options: [{
+      name: 'Spline Type',
+      type: 'select',
+      id: 'splineTypeSelect',
+      value: 'CatmullRomSplineROI',
+      values: [{
+        id: 'CatmullRomSplineROI',
+        value: 'CatmullRomSplineROI',
+        label: 'Catmull Rom Spline'
+      }, {
+        id: 'LinearSplineROI',
+        value: 'LinearSplineROI',
+        label: 'Linear Spline'
+      }, {
+        id: 'BSplineROI',
+        value: 'BSplineROI',
+        label: 'B-Spline'
+      }],
+      commands: {
+        commandName: 'setToolActiveToolbar',
+        commandOptions: {
+          bindings: [{
+            mouseButton: 1 // Left Click
+          }, {
+            mouseButton: 1,
+            // Left Click+Shift to create a hole
+            modifierKey: 16 // Shift
+          }]
+        }
+      }
+    }, {
+      name: 'Simplified Spline',
+      type: 'switch',
+      id: 'simplifiedSpline',
+      value: true,
+      commands: {
+        commandName: 'setSimplifiedSplineForSplineContourSegmentationTool'
+      }
+    }, {
+      name: 'Interpolate Contours',
+      type: 'switch',
+      id: 'splineInterpolateContours',
+      value: false,
+      commands: {
+        commandName: 'setInterpolationToolConfiguration',
+        commandOptions: {
+          toolNames: ['CatmullRomSplineROI', 'LinearSplineROI', 'BSplineROI']
+        }
+      }
+    }]
+  }
+}, {
+  id: 'SculptorTool',
+  uiType: 'ohif.toolBoxButton',
+  props: {
+    icon: 'icon-tool-sculptor',
+    label: 'Sculptor Tool',
+    tooltip: 'Sculptor Tool',
+    evaluate: [{
+      name: 'evaluate.cornerstone.segmentation',
+      toolNames: ['SculptorTool'],
+      disabledText: 'Create new segmentation to enable this tool.'
+    }, {
+      name: 'evaluate.cornerstone.hasSegmentationOfType',
+      segmentationRepresentationType: 'Contour'
+    }],
+    commands: ['setToolActiveToolbar', {
+      commandName: 'activateSelectedSegmentationOfType',
+      commandOptions: {
+        segmentationRepresentationType: 'Contour'
+      }
+    }],
+    options: [{
+      name: 'Dynamic Cursor Size',
+      type: 'switch',
+      id: 'dynamicCursorSize',
+      value: true,
+      commands: {
+        commandName: 'setDynamicCursorSizeForSculptorTool'
+      }
+    }]
+  }
 }, {
   id: 'Brush',
   uiType: 'ohif.toolBoxButton',
   props: {
     icon: 'icon-tool-brush',
     label: i18next/* default */.A.t('Buttons:Brush'),
-    evaluate: {
+    evaluate: [{
       name: 'evaluate.cornerstone.segmentation',
       toolNames: ['CircularBrush', 'SphereBrush'],
       disabledText: i18next/* default */.A.t('Buttons:Create new segmentation to enable this tool.')
+    }, {
+      name: 'evaluate.cornerstone.hasSegmentationOfType',
+      segmentationRepresentationType: 'Labelmap'
+    }],
+    commands: {
+      commandName: 'activateSelectedSegmentationOfType',
+      commandOptions: {
+        segmentationRepresentationType: 'Labelmap'
+      }
     },
     options: [{
       name: 'Radius (mm)',
@@ -393,12 +601,12 @@ const toolbarButtons = [{
       max: 99.5,
       step: 0.5,
       value: 25,
-      commands: {
+      commands: [{
         commandName: 'setBrushSize',
         commandOptions: {
           toolNames: ['CircularBrush', 'SphereBrush']
         }
-      }
+      }]
     }, {
       name: 'Shape',
       type: 'radio',
@@ -411,34 +619,52 @@ const toolbarButtons = [{
         value: 'SphereBrush',
         label: 'Sphere'
       }],
-      commands: 'setToolActiveToolbar'
+      commands: ['setToolActiveToolbar']
     }]
   }
 }, {
   id: 'InterpolateLabelmap',
-  uiType: 'ohif.toolBoxButton',
+  uiType: 'ohif.toolButton',
   props: {
-    icon: 'icon-tool-interpolation',
+    icon: 'actions-interpolate',
     label: i18next/* default */.A.t('Buttons:Interpolate Labelmap'),
     tooltip: i18next/* default */.A.t('Buttons:Automatically fill in missing slices between drawn segments. Use brush or threshold tools on at least two slices, then click to interpolate across slices. Works in any direction. Volume must be reconstructable.'),
-    evaluate: ['evaluate.cornerstone.segmentation', {
+    evaluate: [{
+      name: 'evaluate.cornerstone.segmentation'
+    }, {
+      name: 'evaluate.cornerstone.hasSegmentationOfType',
+      segmentationRepresentationType: 'Labelmap'
+    }, {
       name: 'evaluate.displaySetIsReconstructable',
       disabledText: i18next/* default */.A.t('Buttons:The current viewport cannot handle interpolation.')
     }],
-    commands: 'interpolateLabelmap'
+    commands: [{
+      commandName: 'activateSelectedSegmentationOfType',
+      commandOptions: {
+        segmentationRepresentationType: 'Labelmap'
+      }
+    }, 'interpolateLabelmap']
   }
 }, {
   id: 'SegmentBidirectional',
-  uiType: 'ohif.toolBoxButton',
+  uiType: 'ohif.toolButton',
   props: {
-    icon: 'icon-tool-bidirectional-segment',
+    icon: 'actions-bidirectional',
     label: i18next/* default */.A.t('Buttons:Segment Bidirectional'),
     tooltip: i18next/* default */.A.t('Buttons:Automatically detects the largest length and width across slices for the selected segment and displays a bidirectional measurement.'),
-    evaluate: {
+    evaluate: [{
       name: 'evaluate.cornerstone.segmentation',
       disabledText: i18next/* default */.A.t('Buttons:Create new segmentation to enable this tool.')
-    },
-    commands: 'runSegmentBidirectional'
+    }, {
+      name: 'evaluate.cornerstone.hasSegmentationOfType',
+      segmentationRepresentationType: 'Labelmap'
+    }],
+    commands: [{
+      commandName: 'activateSelectedSegmentationOfType',
+      commandOptions: {
+        segmentationRepresentationType: 'Labelmap'
+      }
+    }, 'runSegmentBidirectional']
   }
 }, {
   id: 'RegionSegmentPlus',
@@ -447,12 +673,20 @@ const toolbarButtons = [{
     icon: 'icon-tool-click-segment',
     label: i18next/* default */.A.t('Buttons:One Click Segment'),
     tooltip: i18next/* default */.A.t('Buttons:Detects segmentable regions with one click. Hover for visual feedback—click when a plus sign appears to auto-segment the lesion.'),
-    evaluate: {
+    evaluate: [{
       name: 'evaluate.cornerstone.segmentation',
       toolNames: ['RegionSegmentPlus'],
       disabledText: i18next/* default */.A.t('Buttons:Create new segmentation to enable this tool.')
-    },
-    commands: 'setToolActiveToolbar'
+    }, {
+      name: 'evaluate.cornerstone.hasSegmentationOfType',
+      segmentationRepresentationType: 'Labelmap'
+    }],
+    commands: ['setToolActiveToolbar', {
+      commandName: 'activateSelectedSegmentationOfType',
+      commandOptions: {
+        segmentationRepresentationType: 'Labelmap'
+      }
+    }]
   }
 }, {
   id: 'LabelmapSlicePropagation',
@@ -462,13 +696,19 @@ const toolbarButtons = [{
     label: i18next/* default */.A.t('Buttons:Labelmap Assist'),
     tooltip: i18next/* default */.A.t('Buttons:Toggle AI assistance for segmenting nearby slices. After drawing on a slice, scroll to preview predictions. Press Enter to accept or Esc to skip.'),
     evaluate: ['evaluate.cornerstoneTool.toggle', {
-      name: 'evaluate.cornerstone.hasSegmentation'
+      name: 'evaluate.cornerstone.hasSegmentationOfType',
+      segmentationRepresentationType: 'Labelmap'
     }],
     listeners: {
       [src/* ViewportGridService */.sI.EVENTS.ACTIVE_VIEWPORT_ID_CHANGED]: callbacks('LabelmapSlicePropagation'),
       [src/* ViewportGridService */.sI.EVENTS.VIEWPORTS_READY]: callbacks('LabelmapSlicePropagation')
     },
-    commands: 'toggleEnabledDisabledToolbar'
+    commands: [{
+      commandName: 'activateSelectedSegmentationOfType',
+      commandOptions: {
+        segmentationRepresentationType: 'Labelmap'
+      }
+    }, 'toggleEnabledDisabledToolbar']
   }
 }, {
   id: 'MarkerLabelmap',
@@ -480,8 +720,16 @@ const toolbarButtons = [{
     evaluate: [{
       name: 'evaluate.cornerstone.segmentation',
       toolNames: ['MarkerLabelmap', 'MarkerInclude', 'MarkerExclude']
+    }, {
+      name: 'evaluate.cornerstone.hasSegmentationOfType',
+      segmentationRepresentationType: 'Labelmap'
+    }],
+    commands: ['setToolActiveToolbar', {
+      commandName: 'activateSelectedSegmentationOfType',
+      commandOptions: {
+        segmentationRepresentationType: 'Labelmap'
+      }
     }],
-    commands: 'setToolActiveToolbar',
     listeners: {
       [src/* ViewportGridService */.sI.EVENTS.ACTIVE_VIEWPORT_ID_CHANGED]: callbacks('MarkerLabelmap'),
       [src/* ViewportGridService */.sI.EVENTS.VIEWPORTS_READY]: callbacks('MarkerLabelmap')
@@ -526,10 +774,13 @@ const toolbarButtons = [{
   props: {
     icon: 'icon-tool-eraser',
     label: i18next/* default */.A.t('Buttons:Eraser'),
-    evaluate: {
+    evaluate: [{
       name: 'evaluate.cornerstone.segmentation',
       toolNames: ['CircularEraser', 'SphereEraser']
-    },
+    }, {
+      name: 'evaluate.cornerstone.hasSegmentationOfType',
+      segmentationRepresentationType: 'Labelmap'
+    }],
     options: [{
       name: 'Radius (mm)',
       id: 'eraser-radius',
@@ -557,7 +808,13 @@ const toolbarButtons = [{
         label: 'Sphere'
       }],
       commands: 'setToolActiveToolbar'
-    }]
+    }],
+    commands: {
+      commandName: 'activateSelectedSegmentationOfType',
+      commandOptions: {
+        segmentationRepresentationType: 'Labelmap'
+      }
+    }
   }
 }, {
   id: 'Threshold',
@@ -565,9 +822,18 @@ const toolbarButtons = [{
   props: {
     icon: 'icon-tool-threshold',
     label: 'Threshold Tool',
-    evaluate: {
+    evaluate: [{
       name: 'evaluate.cornerstone.segmentation',
       toolNames: ['ThresholdCircularBrush', 'ThresholdSphereBrush', 'ThresholdCircularBrushDynamic', 'ThresholdSphereBrushDynamic']
+    }, {
+      name: 'evaluate.cornerstone.hasSegmentationOfType',
+      segmentationRepresentationType: 'Labelmap'
+    }],
+    commands: {
+      commandName: 'activateSelectedSegmentationOfType',
+      commandOptions: {
+        segmentationRepresentationType: 'Labelmap'
+      }
     },
     options: [{
       name: 'Radius (mm)',
@@ -669,10 +935,19 @@ const toolbarButtons = [{
   props: {
     icon: 'icon-tool-shape',
     label: i18next/* default */.A.t('Buttons:Shapes'),
-    evaluate: {
+    evaluate: [{
       name: 'evaluate.cornerstone.segmentation',
       toolNames: ['CircleScissor', 'SphereScissor', 'RectangleScissor'],
       disabledText: i18next/* default */.A.t('Buttons:Create new segmentation to enable shapes tool.')
+    }, {
+      name: 'evaluate.cornerstone.hasSegmentationOfType',
+      segmentationRepresentationType: 'Labelmap'
+    }],
+    commands: {
+      commandName: 'activateSelectedSegmentationOfType',
+      commandOptions: {
+        segmentationRepresentationType: 'Labelmap'
+      }
     },
     options: [{
       name: 'Shape',
@@ -692,6 +967,67 @@ const toolbarButtons = [{
       commands: 'setToolActiveToolbar'
     }]
   }
+}, {
+  id: 'SimplifyContours',
+  uiType: 'ohif.toolButton',
+  props: {
+    icon: 'actions-simplify',
+    label: 'Simplify Contours',
+    tooltip: 'Simplify Contours',
+    commands: ['toggleActiveSegmentationUtility'],
+    evaluate: [{
+      name: 'cornerstone.isActiveSegmentationUtility'
+    }],
+    options: 'cornerstone.SimplifyContourOptions'
+  }
+}, {
+  id: 'SmoothContours',
+  uiType: 'ohif.toolButton',
+  props: {
+    icon: 'actions-smooth',
+    label: 'Smooth Contours',
+    tooltip: 'Smooth Contours',
+    commands: ['toggleActiveSegmentationUtility'],
+    evaluate: [{
+      name: 'cornerstone.isActiveSegmentationUtility'
+    }],
+    options: 'cornerstone.SmoothContoursOptions'
+  }
+}, {
+  id: 'LogicalContourOperations',
+  uiType: 'ohif.toolButton',
+  props: {
+    icon: 'actions-combine',
+    label: 'Combine Contours',
+    tooltip: 'Combine Contours',
+    commands: ['toggleActiveSegmentationUtility'],
+    evaluate: [{
+      name: 'cornerstone.isActiveSegmentationUtility'
+    }],
+    options: 'cornerstone.LogicalContourOperationsOptions'
+  }
+}, {
+  id: 'LabelMapEditWithContour',
+  uiType: 'ohif.toolBoxButton',
+  props: {
+    icon: 'tool-labelmap-edit-with-contour',
+    label: 'Labelmap Edit with Contour Tool',
+    tooltip: 'Labelmap Edit with Contour Tool',
+    commands: ['setToolActiveToolbar', {
+      commandName: 'activateSelectedSegmentationOfType',
+      commandOptions: {
+        segmentationRepresentationType: 'Labelmap'
+      }
+    }],
+    evaluate: [{
+      name: 'evaluate.cornerstone.segmentation',
+      toolNames: ['LabelMapEditWithContour'],
+      disabledText: 'Create new segmentation to enable this tool.'
+    }, {
+      name: 'evaluate.cornerstone.hasSegmentationOfType',
+      segmentationRepresentationType: 'Labelmap'
+    }]
+  }
 }];
 /* harmony default export */ const src_toolbarButtons = (toolbarButtons);
 ;// ../../../modes/segmentation/src/initToolGroups.ts
@@ -805,6 +1141,8 @@ function createTools({
           dynamicRadius: 3
         }
       }
+    }, {
+      toolName: toolNames.LabelMapEditWithContourTool
     }, {
       toolName: toolNames.CircleScissors
     }, {
@@ -819,6 +1157,41 @@ function createTools({
       toolName: toolNames.WindowLevelRegion
     }, {
       toolName: toolNames.UltrasoundDirectional
+    }, {
+      toolName: toolNames.PlanarFreehandContourSegmentation
+    }, {
+      toolName: toolNames.LivewireContourSegmentation
+    }, {
+      toolName: toolNames.SculptorTool
+    }, {
+      toolName: toolNames.PlanarFreehandROI
+    }, {
+      toolName: 'CatmullRomSplineROI',
+      parentTool: toolNames.SplineContourSegmentation,
+      configuration: {
+        spline: {
+          type: 'CATMULLROM',
+          enableTwoPointPreview: true
+        }
+      }
+    }, {
+      toolName: 'LinearSplineROI',
+      parentTool: toolNames.SplineContourSegmentation,
+      configuration: {
+        spline: {
+          type: 'LINEAR',
+          enableTwoPointPreview: true
+        }
+      }
+    }, {
+      toolName: 'BSplineROI',
+      parentTool: toolNames.SplineContourSegmentation,
+      configuration: {
+        spline: {
+          type: 'BSPLINE',
+          enableTwoPointPreview: true
+        }
+      }
     }],
     disabled: [{
       toolName: toolNames.ReferenceLines
@@ -913,10 +1286,49 @@ function initToolGroups(extensionManager, toolGroupService, commandsManager) {
   initVolume3DToolGroup(extensionManager, toolGroupService);
 }
 /* harmony default export */ const src_initToolGroups = (initToolGroups);
+;// ../../../modes/segmentation/src/utils/setUpAutoTabSwitchHandler.ts
+/**
+ * Sets up auto tab switching for when the first segmentation is added into the viewer.
+ */
+function setUpAutoTabSwitchHandler({
+  segmentationService,
+  viewportGridService,
+  panelService
+}) {
+  const autoTabSwitchEvents = [segmentationService.EVENTS.SEGMENTATION_MODIFIED, segmentationService.EVENTS.SEGMENTATION_REPRESENTATION_MODIFIED];
+
+  // Initially there are no segmentations, so we should switch the tab whenever the first segmentation is added.
+  let shouldSwitchTab = true;
+  const unsubscribeAutoTabSwitchEvents = autoTabSwitchEvents.map(eventName => segmentationService.subscribe(eventName, () => {
+    const segmentations = segmentationService.getSegmentations();
+    if (!segmentations.length) {
+      // If all the segmentations are removed, then the next time a segmentation is added, we should switch the tab.
+      shouldSwitchTab = true;
+      return;
+    }
+    const activeViewportId = viewportGridService.getActiveViewportId();
+    const activeRepresentation = segmentationService.getSegmentationRepresentations(activeViewportId)?.find(representation => representation.active);
+    if (activeRepresentation && shouldSwitchTab) {
+      shouldSwitchTab = false;
+      switch (activeRepresentation.type) {
+        case 'Labelmap':
+          panelService.activatePanel('@ohif/extension-cornerstone.panelModule.panelSegmentationWithToolsLabelMap', true);
+          break;
+        case 'Contour':
+          panelService.activatePanel('@ohif/extension-cornerstone.panelModule.panelSegmentationWithToolsContour', true);
+          break;
+      }
+    }
+  })).map(subscription => subscription.unsubscribe);
+  return {
+    unsubscribeAutoTabSwitchEvents
+  };
+}
 ;// ../../../modes/segmentation/src/index.tsx
 
 
 
+
 const ohif = {
   layout: '@ohif/extension-default.layoutTemplateModule.viewerLayout',
   sopClassHandler: '@ohif/extension-default.sopClassHandlerModule.stack',
@@ -925,7 +1337,8 @@ const ohif = {
 };
 const cornerstone = {
   viewport: '@ohif/extension-cornerstone.viewportModule.cornerstone',
-  panelTool: '@ohif/extension-cornerstone.panelModule.panelSegmentationWithTools',
+  labelMapSegmentationPanel: '@ohif/extension-cornerstone.panelModule.panelSegmentationWithToolsLabelMap',
+  contourSegmentationPanel: '@ohif/extension-cornerstone.panelModule.panelSegmentationWithToolsContour',
   measurements: '@ohif/extension-cornerstone.panelModule.panelMeasurement'
 };
 const segmentation = {
@@ -949,6 +1362,7 @@ const extensionDependencies = {
 function modeFactory({
   modeConfiguration
 }) {
+  const _unsubscriptions = [];
   return {
     /**
      * Mode ID, which should be unique among modes used by the viewer. This ID
@@ -974,7 +1388,9 @@ function modeFactory({
         measurementService,
         toolbarService,
         toolGroupService,
-        customizationService
+        segmentationService,
+        viewportGridService,
+        panelService
       } = servicesManager.services;
       measurementService.clearMeasurements();
 
@@ -988,10 +1404,23 @@ function modeFactory({
       toolbarService.updateSection(toolbarService.sections.viewportActionMenu.topRight, ['modalityLoadBadge', 'trackingStatus', 'navigationComponent']);
       toolbarService.updateSection(toolbarService.sections.viewportActionMenu.bottomLeft, ['windowLevelMenu']);
       toolbarService.updateSection('MoreTools', ['Reset', 'rotate-right', 'flipHorizontal', 'ReferenceLines', 'ImageOverlayViewer', 'StackScroll', 'invert', 'Cine', 'Magnify', 'TagBrowser']);
-      toolbarService.updateSection(toolbarService.sections.segmentationToolbox, ['SegmentationUtilities', 'SegmentationTools']);
-      toolbarService.updateSection('SegmentationUtilities', ['LabelmapSlicePropagation', 'InterpolateLabelmap', 'SegmentBidirectional']);
-      toolbarService.updateSection('SegmentationTools', ['BrushTools', 'MarkerLabelmap', 'RegionSegmentPlus', 'Shapes']);
+      toolbarService.updateSection(toolbarService.sections.labelMapSegmentationToolbox, ['LabelMapTools']);
+      toolbarService.updateSection(toolbarService.sections.contourSegmentationToolbox, ['ContourTools']);
+      toolbarService.updateSection('LabelMapTools', ['LabelmapSlicePropagation', 'BrushTools', 'MarkerLabelmap', 'RegionSegmentPlus', 'Shapes', 'LabelMapEditWithContour']);
+      toolbarService.updateSection('ContourTools', ['PlanarFreehandContourSegmentationTool', 'SculptorTool', 'SplineContourSegmentationTool', 'LivewireContourSegmentationTool']);
+      toolbarService.updateSection(toolbarService.sections.labelMapSegmentationUtilities, ['LabelMapUtilities']);
+      toolbarService.updateSection(toolbarService.sections.contourSegmentationUtilities, ['ContourUtilities']);
+      toolbarService.updateSection('LabelMapUtilities', ['InterpolateLabelmap', 'SegmentBidirectional']);
+      toolbarService.updateSection('ContourUtilities', ['LogicalContourOperations', 'SimplifyContours', 'SmoothContours']);
       toolbarService.updateSection('BrushTools', ['Brush', 'Eraser', 'Threshold']);
+      const {
+        unsubscribeAutoTabSwitchEvents
+      } = setUpAutoTabSwitchHandler({
+        segmentationService,
+        viewportGridService,
+        panelService
+      });
+      _unsubscriptions.push(...unsubscribeAutoTabSwitchEvents);
     },
     onModeExit: ({
       servicesManager
@@ -1004,6 +1433,8 @@ function modeFactory({
         uiDialogService,
         uiModalService
       } = servicesManager.services;
+      _unsubscriptions.forEach(unsubscribe => unsubscribe());
+      _unsubscriptions.length = 0;
       uiDialogService.hideAll();
       uiModalService.hide();
       toolGroupService.destroy();
@@ -1055,7 +1486,7 @@ function modeFactory({
           props: {
             leftPanels: [ohif.leftPanel],
             leftPanelResizable: true,
-            rightPanels: [cornerstone.panelTool],
+            rightPanels: [cornerstone.contourSegmentationPanel, cornerstone.labelMapSegmentationPanel],
             rightPanelResizable: true,
             // leftPanelClosed: true,
             viewports: [{