@ohif/app 3.8.0-beta.70 → 3.8.0-beta.72

package/dist/{155.bundle.0dabe8513b605b01ac3d.js → 155.bundle.bebcbc0ca715c7163f18.js}

@@ -791,7 +791,7 @@ function promptSaveReport({
 }
 /* harmony default export */ const TrackedMeasurementsContext_promptSaveReport = (promptSaveReport);
 // EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/index.tsx + 15 modules
-var cornerstone_dicom_sr_src = __webpack_require__(89559);
+var cornerstone_dicom_sr_src = __webpack_require__(53540);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/promptHydrateStructuredReport.js
 
 
@@ -1119,51 +1119,54 @@ function TrackedMeasurementsContextProvider({
 
   // ~~ Listen for changes to ViewportGrid for potential SRs hung in panes when idle
   (0,react.useEffect)(() => {
-    if (viewports.size > 0) {
-      const activeViewport = viewports.get(activeViewportId);
-      if (!activeViewport || !activeViewport?.displaySetInstanceUIDs?.length) {
-        return;
-      }
+    const triggerPromptHydrateFlow = async () => {
+      if (viewports.size > 0) {
+        const activeViewport = viewports.get(activeViewportId);
+        if (!activeViewport || !activeViewport?.displaySetInstanceUIDs?.length) {
+          return;
+        }
 
-      // Todo: Getting the first displaySetInstanceUID is wrong, but we don't have
-      // tracking fusion viewports yet. This should change when we do.
-      const {
-        displaySetService
-      } = servicesManager.services;
-      const displaySet = displaySetService.getDisplaySetByUID(activeViewport.displaySetInstanceUIDs[0]);
-      if (!displaySet) {
-        return;
-      }
+        // Todo: Getting the first displaySetInstanceUID is wrong, but we don't have
+        // tracking fusion viewports yet. This should change when we do.
+        const {
+          displaySetService
+        } = servicesManager.services;
+        const displaySet = displaySetService.getDisplaySetByUID(activeViewport.displaySetInstanceUIDs[0]);
+        if (!displaySet) {
+          return;
+        }
 
-      // If this is an SR produced by our SR SOPClassHandler,
-      // and it hasn't been loaded yet, do that now so we
-      // can check if it can be rehydrated or not.
-      //
-      // Note: This happens:
-      // - If the viewport is not currently an OHIFCornerstoneSRViewport
-      // - If the displaySet has never been hung
-      //
-      // Otherwise, the displaySet will be loaded by the useEffect handler
-      // listening to displaySet changes inside OHIFCornerstoneSRViewport.
-      // The issue here is that this handler in TrackedMeasurementsContext
-      // ends up occurring before the Viewport is created, so the displaySet
-      // is not loaded yet, and isRehydratable is undefined unless we call load().
-      if (displaySet.SOPClassHandlerId === SR_SOPCLASSHANDLERID && !displaySet.isLoaded && displaySet.load) {
-        displaySet.load();
-      }
+        // If this is an SR produced by our SR SOPClassHandler,
+        // and it hasn't been loaded yet, do that now so we
+        // can check if it can be rehydrated or not.
+        //
+        // Note: This happens:
+        // - If the viewport is not currently an OHIFCornerstoneSRViewport
+        // - If the displaySet has never been hung
+        //
+        // Otherwise, the displaySet will be loaded by the useEffect handler
+        // listening to displaySet changes inside OHIFCornerstoneSRViewport.
+        // The issue here is that this handler in TrackedMeasurementsContext
+        // ends up occurring before the Viewport is created, so the displaySet
+        // is not loaded yet, and isRehydratable is undefined unless we call load().
+        if (displaySet.SOPClassHandlerId === SR_SOPCLASSHANDLERID && !displaySet.isLoaded && displaySet.load) {
+          await displaySet.load();
+        }
 
-      // Magic string
-      // load function added by our sopClassHandler module
-      if (displaySet.SOPClassHandlerId === SR_SOPCLASSHANDLERID && displaySet.isRehydratable === true) {
-        console.log('sending event...', trackedMeasurements);
-        sendTrackedMeasurementsEvent('PROMPT_HYDRATE_SR', {
-          displaySetInstanceUID: displaySet.displaySetInstanceUID,
-          SeriesInstanceUID: displaySet.SeriesInstanceUID,
-          viewportId: activeViewportId
-        });
+        // Magic string
+        // load function added by our sopClassHandler module
+        if (displaySet.SOPClassHandlerId === SR_SOPCLASSHANDLERID && displaySet.isRehydratable === true) {
+          console.log('sending event...', trackedMeasurements);
+          sendTrackedMeasurementsEvent('PROMPT_HYDRATE_SR', {
+            displaySetInstanceUID: displaySet.displaySetInstanceUID,
+            SeriesInstanceUID: displaySet.SeriesInstanceUID,
+            viewportId: activeViewportId
+          });
+        }
       }
-    }
-  }, [activeViewportId, sendTrackedMeasurementsEvent, servicesManager.services, viewports]);
+    };
+    triggerPromptHydrateFlow();
+  }, [trackedMeasurements, activeViewportId, sendTrackedMeasurementsEvent, servicesManager.services, viewports]);
   return /*#__PURE__*/react.createElement(TrackedMeasurementsContext.Provider, {
     value: [trackedMeasurements, sendTrackedMeasurementsEvent]
   }, children);
@@ -1256,7 +1259,8 @@ function PanelStudyBrowserTracking({
     displaySetService,
     uiDialogService,
     hangingProtocolService,
-    uiNotificationService
+    uiNotificationService,
+    measurementService
   } = servicesManager.services;
   const navigate = (0,dist/* useNavigate */.Zp)();
   const {
@@ -1505,6 +1509,12 @@ function PanelStudyBrowserTracking({
       sendTrackedMeasurementsEvent('UNTRACK_SERIES', {
         SeriesInstanceUID: displaySet.SeriesInstanceUID
       });
+      const measurements = measurementService.getMeasurements();
+      measurements.forEach(m => {
+        if (m.referenceSeriesUID === displaySet.SeriesInstanceUID) {
+          measurementService.remove(m.uid);
+        }
+      });
     },
     onClickThumbnail: () => {},
     onDoubleClickThumbnail: onDoubleClickThumbnailHandler,

package/dist/{191.bundle.7d89c921abefd1140d50.js → 191.bundle.c0ea2d031ffddeca32c9.js}

@@ -9538,129 +9538,6 @@ async function _addLabelmapToViewport(viewport, labelmapData, segmentationRepres
 
 
 
-/***/ }),
-
-/***/ 31163:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
-/* harmony export */ });
-/* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(50719);
-/* harmony import */ var _enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(83946);
-/* harmony import */ var _stateManagement_segmentation__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(63421);
-/* harmony import */ var _stateManagement_segmentation_config_segmentationVisibility__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(23308);
-/* harmony import */ var _stateManagement_segmentation_segmentationState__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(30322);
-/* harmony import */ var _store_ToolGroupManager__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(52610);
-/* harmony import */ var _base__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(96214);
-/* harmony import */ var _Surface__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(57313);
-/* harmony import */ var _Contour__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(2884);
-/* harmony import */ var _Labelmap__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(94318);
-/* harmony import */ var _store__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(61738);
-/* harmony import */ var _annotation_PlanarFreehandContourSegmentationTool__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(20070);
-
-
-
-
-
-
-
-
-
-
-
-
-
-const planarContourToolName = _annotation_PlanarFreehandContourSegmentationTool__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .A.toolName;
-class SegmentationDisplayTool extends _base__WEBPACK_IMPORTED_MODULE_6__/* .BaseTool */ .oS {
-    constructor(toolProps = {}, defaultToolProps = {
-        configuration: {},
-    }) {
-        super(toolProps, defaultToolProps);
-        this.renderSegmentation = (toolGroupId) => {
-            const toolGroup = (0,_store_ToolGroupManager__WEBPACK_IMPORTED_MODULE_5__.getToolGroup)(toolGroupId);
-            if (!toolGroup) {
-                return;
-            }
-            const toolGroupSegmentationRepresentations = (0,_stateManagement_segmentation_segmentationState__WEBPACK_IMPORTED_MODULE_4__.getSegmentationRepresentations)(toolGroupId);
-            if (!toolGroupSegmentationRepresentations ||
-                toolGroupSegmentationRepresentations.length === 0) {
-                return;
-            }
-            const toolGroupViewports = toolGroup.viewportsInfo.map(({ renderingEngineId, viewportId }) => {
-                const enabledElement = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.getEnabledElementByIds)(viewportId, renderingEngineId);
-                if (enabledElement) {
-                    return enabledElement.viewport;
-                }
-            });
-            const segmentationRenderList = toolGroupSegmentationRepresentations.map((representation) => {
-                const config = this._getMergedRepresentationsConfig(toolGroupId);
-                const viewportsRenderList = [];
-                const renderers = {
-                    [_enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A.Labelmap]: _Labelmap__WEBPACK_IMPORTED_MODULE_9__/* .labelmapDisplay */ .Zy,
-                    [_enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A.Contour]: _Contour__WEBPACK_IMPORTED_MODULE_8__/* .contourDisplay */ .T,
-                    [_enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A.Surface]: _Surface__WEBPACK_IMPORTED_MODULE_7__/* .surfaceDisplay */ .u,
-                };
-                if (representation.type === _enums_SegmentationRepresentations__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A.Contour) {
-                    this.addPlanarFreeHandToolIfAbsent(toolGroupId);
-                }
-                const display = renderers[representation.type];
-                for (const viewport of toolGroupViewports) {
-                    const renderedViewport = display.render(viewport, representation, config);
-                    viewportsRenderList.push(renderedViewport);
-                }
-                return viewportsRenderList;
-            });
-            Promise.allSettled(segmentationRenderList).then(() => {
-                toolGroupViewports.forEach((viewport) => {
-                    viewport.render();
-                });
-            });
-        };
-    }
-    onSetToolEnabled() {
-        const toolGroupId = this.toolGroupId;
-        const toolGroupSegmentationRepresentations = (0,_stateManagement_segmentation_segmentationState__WEBPACK_IMPORTED_MODULE_4__.getSegmentationRepresentations)(toolGroupId);
-        if (!toolGroupSegmentationRepresentations ||
-            toolGroupSegmentationRepresentations.length === 0) {
-            return;
-        }
-        toolGroupSegmentationRepresentations.forEach((segmentationRepresentation) => {
-            (0,_stateManagement_segmentation_config_segmentationVisibility__WEBPACK_IMPORTED_MODULE_3__.setSegmentationVisibility)(toolGroupId, segmentationRepresentation.segmentationRepresentationUID, true);
-        });
-    }
-    onSetToolDisabled() {
-        const toolGroupId = this.toolGroupId;
-        const toolGroupSegmentationRepresentations = (0,_stateManagement_segmentation_segmentationState__WEBPACK_IMPORTED_MODULE_4__.getSegmentationRepresentations)(toolGroupId);
-        if (!toolGroupSegmentationRepresentations ||
-            toolGroupSegmentationRepresentations.length === 0) {
-            return;
-        }
-        toolGroupSegmentationRepresentations.forEach((segmentationRepresentation) => {
-            (0,_stateManagement_segmentation_config_segmentationVisibility__WEBPACK_IMPORTED_MODULE_3__.setSegmentationVisibility)(toolGroupId, segmentationRepresentation.segmentationRepresentationUID, false);
-        });
-    }
-    addPlanarFreeHandToolIfAbsent(toolGroupId) {
-        if (!(planarContourToolName in _store__WEBPACK_IMPORTED_MODULE_10__/* .state */ .wk.tools)) {
-            (0,_store__WEBPACK_IMPORTED_MODULE_10__/* .addTool */ .Gx)(_annotation_PlanarFreehandContourSegmentationTool__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .A);
-        }
-        const toolGroup = (0,_store_ToolGroupManager__WEBPACK_IMPORTED_MODULE_5__.getToolGroup)(toolGroupId);
-        if (!toolGroup.hasTool(planarContourToolName)) {
-            toolGroup.addTool(planarContourToolName);
-            toolGroup.setToolPassive(planarContourToolName);
-        }
-    }
-    _getMergedRepresentationsConfig(toolGroupId) {
-        const toolGroupConfig = _stateManagement_segmentation__WEBPACK_IMPORTED_MODULE_2__.config.getToolGroupSpecificConfig(toolGroupId);
-        const globalConfig = _stateManagement_segmentation__WEBPACK_IMPORTED_MODULE_2__.config.getGlobalConfig();
-        const mergedConfig = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.utilities.deepMerge(globalConfig, toolGroupConfig);
-        return mergedConfig;
-    }
-}
-SegmentationDisplayTool.toolName = 'SegmentationDisplay';
-/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (SegmentationDisplayTool);
-
-
 /***/ }),
 
 /***/ 94152:
@@ -20271,8 +20148,8 @@ class AnnotationEraserTool extends base/* BaseTool */.oS {
 AnnotationEraserTool.toolName = 'Eraser';
 /* harmony default export */ const tools_AnnotationEraserTool = (AnnotationEraserTool);
 
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/tools/displayTools/SegmentationDisplayTool.js
-var SegmentationDisplayTool = __webpack_require__(31163);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/tools/displayTools/SegmentationDisplayTool.js + 4 modules
+var SegmentationDisplayTool = __webpack_require__(33944);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/tools/segmentation/strategies/fillRectangle.js
 var fillRectangle = __webpack_require__(21080);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/tools/segmentation/strategies/eraseRectangle.js
@@ -23134,6 +23011,32 @@ function removeContourSegmentationAnnotation(annotation) {
 
 
 
+/***/ }),
+
+/***/ 53891:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
+/* harmony export */ });
+function calculatePerimeter(polyline, closed) {
+    let perimeter = 0;
+    for (let i = 0; i < polyline.length - 1; i++) {
+        const point1 = polyline[i];
+        const point2 = polyline[i + 1];
+        perimeter += Math.sqrt(Math.pow(point2[0] - point1[0], 2) + Math.pow(point2[1] - point1[1], 2));
+    }
+    if (closed) {
+        const firstPoint = polyline[0];
+        const lastPoint = polyline[polyline.length - 1];
+        perimeter += Math.sqrt(Math.pow(lastPoint[0] - firstPoint[0], 2) +
+            Math.pow(lastPoint[1] - firstPoint[1], 2));
+    }
+    return perimeter;
+}
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (calculatePerimeter);
+
+
 /***/ }),
 
 /***/ 84045:
@@ -23190,6 +23093,7 @@ __webpack_require__.d(__webpack_exports__, {
   AnnotationToPointData: () => (/* reexport */ contours_AnnotationToPointData),
   acceptAutogeneratedInterpolations: () => (/* reexport */ acceptAutogeneratedInterpolations),
   areCoplanarContours: () => (/* reexport */ areCoplanarContours),
+  calculatePerimeter: () => (/* reexport */ calculatePerimeter/* default */.A),
   contourFinder: () => (/* reexport */ contourFinder),
   detectContourHoles: () => (/* reexport */ detectContourHoles),
   findHandlePolylineIndex: () => (/* reexport */ findHandlePolylineIndex/* default */.A),
@@ -23608,6 +23512,8 @@ function acceptAutogeneratedInterpolations(annotationGroupSelector, selector) {
 var interpolation = __webpack_require__(69115);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/contours/findHandlePolylineIndex.js
 var findHandlePolylineIndex = __webpack_require__(84045);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/contours/calculatePerimeter.js
+var calculatePerimeter = __webpack_require__(53891);
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/contours/index.js
 
 
@@ -23624,6 +23530,7 @@ var findHandlePolylineIndex = __webpack_require__(84045);
 
 
 
+
 /***/ }),
 
 /***/ 69115:
@@ -29244,7 +29151,7 @@ function getHoveredContourSegmentationAnnotation(segmentationId) {
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(50719);
 /* harmony import */ var _enums__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(84901);
 /* harmony import */ var _store_ToolGroupManager__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(52610);
-/* harmony import */ var _tools_displayTools_SegmentationDisplayTool__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(31163);
+/* harmony import */ var _tools__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(94152);
 
 
 
@@ -29314,7 +29221,7 @@ class SegmentationRenderingEngine {
             }
         })
             .filter(Boolean);
-        const segmentationDisplayToolInstance = toolGroup.getToolInstance(_tools_displayTools_SegmentationDisplayTool__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .A.toolName);
+        const segmentationDisplayToolInstance = toolGroup.getToolInstance(_tools__WEBPACK_IMPORTED_MODULE_3__/* .SegmentationDisplayTool */ .t0.toolName);
         if (!segmentationDisplayToolInstance) {
             console.warn('No segmentation tool found inside', toolGroupId);
             return;

package/dist/{342.bundle.6e49f63ea7cea4645c0a.js → 342.bundle.521c0217f82380c0c2ad.js}

@@ -2678,8 +2678,8 @@ function _generateToolState() {
           // and over again.
           sopUIDImageIdIndexMap = imageIds.reduce(function (acc, imageId) {
             var _metadataProvider$get = metadataProvider.get("generalImageModule", imageId),
-              sopInstanceUid = _metadataProvider$get.sopInstanceUid;
-            acc[sopInstanceUid] = imageId;
+              sopInstanceUID = _metadataProvider$get.sopInstanceUID;
+            acc[sopInstanceUID] = imageId;
             return acc;
           }, {});
           overlapping = false;
@@ -4746,7 +4746,8 @@ var PlanarFreehandROI = /** @class */ (function () {
     function PlanarFreehandROI() {
     }
     PlanarFreehandROI.getMeasurementData = function (MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
-        var _a = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, PlanarFreehandROI.toolType), defaultState = _a.defaultState, SCOORDGroup = _a.SCOORDGroup, ReferencedFrameNumber = _a.ReferencedFrameNumber;
+        var _a;
+        var _b = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, PlanarFreehandROI.toolType), defaultState = _b.defaultState, NUMGroup = _b.NUMGroup, SCOORDGroup = _b.SCOORDGroup, ReferencedFrameNumber = _b.ReferencedFrameNumber;
         var referencedImageId = defaultState.annotation.metadata.referencedImageId;
         var GraphicData = SCOORDGroup.GraphicData;
         var worldCoords = [];
@@ -4770,8 +4771,7 @@ var PlanarFreehandROI = /** @class */ (function () {
         }
         var state = defaultState;
         state.annotation.data = {
-            polyline: worldCoords,
-            isOpenContour: isOpenContour,
+            contour: { polyline: worldCoords, closed: !isOpenContour },
             handles: {
                 points: points,
                 activeHandleIndex: null,
@@ -4779,13 +4779,21 @@ var PlanarFreehandROI = /** @class */ (function () {
                     hasMoved: false
                 }
             },
+            cachedStats: (_a = {},
+                _a["imageId:".concat(referencedImageId)] = {
+                    area: NUMGroup
+                        ? NUMGroup.MeasuredValueSequence.NumericValue
+                        : null
+                },
+                _a),
             frameNumber: ReferencedFrameNumber
         };
         return state;
     };
     PlanarFreehandROI.getTID300RepresentationArguments = function (tool, worldToImageCoords) {
         var data = tool.data, finding = tool.finding, findingSites = tool.findingSites, metadata = tool.metadata;
-        var isOpenContour = data.isOpenContour, polyline = data.polyline;
+        var _a = data.contour, polyline = _a.polyline, closed = _a.closed;
+        var isOpenContour = closed !== true;
         var referencedImageId = metadata.referencedImageId;
         if (!referencedImageId) {
             throw new Error("PlanarFreehandROI.getTID300RepresentationArguments: referencedImageId is not defined");
@@ -4799,12 +4807,18 @@ var PlanarFreehandROI = /** @class */ (function () {
             // Explicitly expand to avoid ciruclar references.
             points.push([firstPoint[0], firstPoint[1]]);
         }
-        var area = 0; // TODO -> The tool doesn't have these stats yet.
-        var perimeter = 0;
+        var _b = data.cachedStats["imageId:".concat(referencedImageId)] || {}, area = _b.area, areaUnit = _b.areaUnit, modalityUnit = _b.modalityUnit, perimeter = _b.perimeter, mean = _b.mean, max = _b.max, stdDev = _b.stdDev;
         return {
+            /** From cachedStats */
             points: points,
             area: area,
+            areaUnit: areaUnit,
             perimeter: perimeter,
+            modalityUnit: modalityUnit,
+            mean: mean,
+            max: max,
+            stdDev: stdDev,
+            /** Other */
             trackingIdentifierTextValue: trackingIdentifierTextValue$2,
             finding: finding,
             findingSites: findingSites || []

package/dist/{41.bundle.6ec0794a483e9a30eb94.js → 41.bundle.9db45ce95f2fd889447d.js}

@@ -93,14 +93,22 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
       toolName: toolNames.Angle
     }, {
       toolName: toolNames.CobbAngle
-    }, {
-      toolName: toolNames.PlanarFreehandROI
     }, {
       toolName: toolNames.Magnify
     }, {
       toolName: toolNames.SegmentationDisplay
     }, {
       toolName: toolNames.CalibrationLine
+    }, {
+      toolName: toolNames.AdvancedMagnify
+    }, {
+      toolName: toolNames.UltrasoundDirectional
+    }, {
+      toolName: toolNames.PlanarFreehandROI
+    }, {
+      toolName: toolNames.SplineROI
+    }, {
+      toolName: toolNames.LivewireContour
     }],
     // enabled
     enabled: [{
@@ -154,6 +162,10 @@ function initSRToolGroup(extensionManager, toolGroupService) {
       toolName: SRToolNames.SREllipticalROI
     }, {
       toolName: SRToolNames.SRCircleROI
+    }, {
+      toolName: SRToolNames.SRPlanarFreehandROI
+    }, {
+      toolName: SRToolNames.SRRectangleROI
     }],
     enabled: [{
       toolName: SRToolNames.DICOMSRDisplay,
@@ -352,6 +364,20 @@ const toolbarButtons = [{
       tooltip: 'Ellipse ROI',
       commands: setToolActiveToolbar,
       evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'PlanarFreehandROI',
+      icon: 'tool-freehand-polygon',
+      label: 'Freehand',
+      tooltip: 'Freehand ROI',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'RectangleROI',
+      icon: 'tool-rectangle',
+      label: 'Rectangle',
+      tooltip: 'Rectangle ROI',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
     }), createButton({
       id: 'CircleROI',
       icon: 'tool-circle',
@@ -359,6 +385,27 @@ const toolbarButtons = [{
       tooltip: 'Circle Tool',
       commands: setToolActiveToolbar,
       evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'PlanarFreehandROI',
+      icon: 'icon-tool-freehand-roi',
+      label: 'Freehand ROI',
+      tooltip: 'Freehand ROI',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'SplineROI',
+      icon: 'icon-tool-spline-roi',
+      label: 'Spline ROI',
+      tooltip: 'Spline ROI',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), createButton({
+      id: 'LivewireContour',
+      icon: 'icon-tool-livewire',
+      label: 'Livewire tool',
+      tooltip: 'Livewire tool',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
     })]
   }
 }, {
@@ -561,7 +608,7 @@ const moreTools = [{
       commands: 'invertViewport',
       evaluate: 'evaluate.viewportProperties.toggle'
     }), moreTools_createButton({
-      id: 'Probe',
+      id: 'DragProbe',
       icon: 'tool-probe',
       label: 'Probe',
       tooltip: 'Probe',
@@ -588,13 +635,6 @@ const moreTools = [{
       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',
@@ -604,10 +644,24 @@ const moreTools = [{
       evaluate: 'evaluate.cornerstoneTool'
     }), moreTools_createButton({
       id: 'TagBrowser',
-      icon: 'list-bullets',
+      icon: 'dicom-tag-browser',
       label: 'Dicom Tag Browser',
       tooltip: 'Dicom Tag Browser',
       commands: 'openDICOMTagViewer'
+    }), moreTools_createButton({
+      id: 'AdvancedMagnify',
+      icon: 'icon-tool-loupe',
+      label: 'Loupe',
+      tooltip: 'Loupe',
+      commands: setToolActiveToolbar,
+      evaluate: 'evaluate.cornerstoneTool'
+    }), moreTools_createButton({
+      id: 'UltrasoundDirectionalTool',
+      icon: 'icon-tool-ultrasound-bidirectional',
+      label: 'Ultrasound Directional',
+      tooltip: 'Ultrasound Directional',
+      commands: setToolActiveToolbar,
+      evaluate: ['evaluate.cornerstoneTool', 'evaluate.isUS']
     })]
   }
 }];