diff --git a/extensions/default/src/utils/Toolbox.tsx b/extensions/default/src/utils/Toolbox.tsx
index 404c1ca7e..fce26bb8f 100644
--- a/extensions/default/src/utils/Toolbox.tsx
+++ b/extensions/default/src/utils/Toolbox.tsx
@@ -1,7 +1,8 @@
-import React from 'react';
-import { PanelSection, ToolSettings } from '@ohif/ui-next';
+import React, { useState } from 'react';
+import { Icons, PanelSection, ToolSettings } from '@ohif/ui-next';
import { useSystem, useToolbar } from '@ohif/core';
import classnames from 'classnames';
+import { useTranslation } from 'react-i18next';
interface ButtonProps {
isActive?: boolean;
@@ -20,7 +21,10 @@ interface ButtonProps {
*/
export function Toolbox({ buttonSectionId, title }: { buttonSectionId: string; title: string }) {
const { servicesManager } = useSystem();
- const { toolbarService } = servicesManager.services;
+ const { t } = useTranslation();
+
+ const { toolbarService, customizationService } = servicesManager.services;
+ const [showConfig, setShowConfig] = useState(false);
const { toolbarButtons: toolboxSections, onInteraction } = useToolbar({
servicesManager,
@@ -72,12 +76,27 @@ export function Toolbox({ buttonSectionId, title }: { buttonSectionId: string; t
onInteraction?.({ itemId });
};
+ const CustomConfigComponent = customizationService.getCustomization(`${buttonSectionId}.config`);
+
return (
-
- {title}
+
+ {t(title)}
+ {CustomConfigComponent && (
+
+ {
+ e.stopPropagation();
+ setShowConfig(!showConfig);
+ }}
+ />
+
+ )}
+
+ {showConfig && }
{toolboxSections.map(section => {
const sectionId = section.componentProps.buttonSection;
const buttons = toolbarService.getButtonSection(sectionId) as any[];
diff --git a/extensions/measurement-tracking/package.json b/extensions/measurement-tracking/package.json
index 97c8d9116..29d2778bc 100644
--- a/extensions/measurement-tracking/package.json
+++ b/extensions/measurement-tracking/package.json
@@ -32,8 +32,8 @@
"start": "yarn run dev"
},
"peerDependencies": {
- "@cornerstonejs/core": "^3.7.1",
- "@cornerstonejs/tools": "^3.7.1",
+ "@cornerstonejs/core": "^3.7.5",
+ "@cornerstonejs/tools": "^3.7.5",
"@ohif/core": "3.10.0-beta.130",
"@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.130",
"@ohif/extension-default": "3.10.0-beta.130",
diff --git a/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/PanelROIThresholdExport.tsx b/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/PanelROIThresholdExport.tsx
index 9457adba6..8751c040f 100644
--- a/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/PanelROIThresholdExport.tsx
+++ b/extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/PanelROIThresholdExport.tsx
@@ -54,7 +54,6 @@ export default function PanelRoiThresholdSegmentation({
// Find the first segmentation with a TMTV value since all of them have the same value
const stats = segmentationService.getSegmentationGroupStats(segmentationIds);
const tmtvValue = stats?.tmtv;
- const tlgValue = stats?.tlg;
return (
@@ -65,7 +64,6 @@ export default function PanelRoiThresholdSegmentation({
{'TMTV:'}
{`${tmtvValue?.toFixed(3)} mL`}
-
{`${tlgValue?.toFixed(3)} mL`}
diff --git a/modes/preclinical-4d/src/initToolGroups.tsx b/modes/preclinical-4d/src/initToolGroups.tsx
index 6f8dd0ef8..956f3a996 100644
--- a/modes/preclinical-4d/src/initToolGroups.tsx
+++ b/modes/preclinical-4d/src/initToolGroups.tsx
@@ -40,6 +40,7 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager, se
],
passive: [
{ toolName: toolNames.Length },
+ { toolName: toolNames.SegmentBidirectional },
{ toolName: toolNames.ArrowAnnotate },
{ toolName: toolNames.Bidirectional },
{ toolName: toolNames.Probe },
diff --git a/modes/segmentation/src/initToolGroups.ts b/modes/segmentation/src/initToolGroups.ts
index 1f4de6ee4..f7ffbdbd8 100644
--- a/modes/segmentation/src/initToolGroups.ts
+++ b/modes/segmentation/src/initToolGroups.ts
@@ -67,9 +67,6 @@ function createTools(utilityModule) {
parentTool: 'Brush',
configuration: {
activeStrategy: 'THRESHOLD_INSIDE_CIRCLE',
- // preview: {
- // enabled: true,
- // },
threshold: {
isDynamic: true,
dynamicRadius: 3,
@@ -79,14 +76,14 @@ function createTools(utilityModule) {
{
toolName: toolNames.SegmentBidirectional,
},
+ {
+ toolName: toolNames.SegmentSelect,
+ },
{
toolName: 'ThresholdSphereBrushDynamic',
parentTool: 'Brush',
configuration: {
activeStrategy: 'THRESHOLD_INSIDE_SPHERE',
- // preview: {
- // enabled: true,
- // },
threshold: {
isDynamic: true,
dynamicRadius: 3,
diff --git a/modes/tmtv/src/initToolGroups.js b/modes/tmtv/src/initToolGroups.js
index 2b39c3f6a..5e64f814b 100644
--- a/modes/tmtv/src/initToolGroups.js
+++ b/modes/tmtv/src/initToolGroups.js
@@ -28,6 +28,7 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager) {
],
passive: [
{ toolName: toolNames.Length },
+ { toolName: toolNames.SegmentBidirectional },
{
toolName: toolNames.ArrowAnnotate,
configuration: {
diff --git a/platform/app/package.json b/platform/app/package.json
index 05d59730b..810dfec12 100644
--- a/platform/app/package.json
+++ b/platform/app/package.json
@@ -54,7 +54,7 @@
"@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
"@cornerstonejs/codec-openjpeg": "^1.2.4",
"@cornerstonejs/codec-openjph": "^2.4.5",
- "@cornerstonejs/dicom-image-loader": "^3.7.1",
+ "@cornerstonejs/dicom-image-loader": "^3.7.5",
"@emotion/serialize": "^1.1.3",
"@ohif/core": "3.10.0-beta.130",
"@ohif/extension-cornerstone": "3.10.0-beta.130",
diff --git a/platform/core/package.json b/platform/core/package.json
index ef75c1435..d23e36aff 100644
--- a/platform/core/package.json
+++ b/platform/core/package.json
@@ -37,7 +37,7 @@
"@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
"@cornerstonejs/codec-openjpeg": "^1.2.4",
"@cornerstonejs/codec-openjph": "^2.4.5",
- "@cornerstonejs/dicom-image-loader": "^3.7.1",
+ "@cornerstonejs/dicom-image-loader": "^3.7.5",
"@ohif/ui": "3.10.0-beta.130",
"cornerstone-math": "0.1.9",
"dicom-parser": "^1.8.21"
diff --git a/platform/core/src/defaults/hotkeyBindings.ts b/platform/core/src/defaults/hotkeyBindings.ts
index 3bc3d9236..c9b818b54 100644
--- a/platform/core/src/defaults/hotkeyBindings.ts
+++ b/platform/core/src/defaults/hotkeyBindings.ts
@@ -167,6 +167,16 @@ const bindings = [
label: 'Delete Annotation',
keys: ['backspace'],
},
+ {
+ commandName: 'acceptPreview',
+ label: 'Accept Preview',
+ keys: ['enter'],
+ },
+ {
+ commandName: 'rejectPreview',
+ label: 'Reject Preview',
+ keys: ['esc'],
+ },
// after we have the ui for undo/redo, we can add these back in
// {
// commandName: 'undo',
diff --git a/platform/ui-next/src/components/Header/Header.tsx b/platform/ui-next/src/components/Header/Header.tsx
index 02b784099..03a573836 100644
--- a/platform/ui-next/src/components/Header/Header.tsx
+++ b/platform/ui-next/src/components/Header/Header.tsx
@@ -29,6 +29,7 @@ interface HeaderProps {
};
PatientInfo?: ReactNode;
Secondary?: ReactNode;
+ UndoRedo?: ReactNode;
}
function Header({
@@ -39,11 +40,10 @@ function Header({
isSticky = false,
WhiteLabeling,
PatientInfo,
+ UndoRedo,
Secondary,
...props
}: HeaderProps): ReactNode {
- const { t } = useTranslation('Header');
-
const onClickReturn = () => {
if (isReturnEnabled && onClickReturnButton) {
onClickReturnButton();
@@ -76,6 +76,8 @@ function Header({
+ {UndoRedo}
+
{PatientInfo}
diff --git a/platform/ui-next/src/components/SegmentationTable/SegmentationTable.tsx b/platform/ui-next/src/components/SegmentationTable/SegmentationTable.tsx
index 9a6e6b2ba..24a150993 100644
--- a/platform/ui-next/src/components/SegmentationTable/SegmentationTable.tsx
+++ b/platform/ui-next/src/components/SegmentationTable/SegmentationTable.tsx
@@ -1,11 +1,7 @@
import React, { ReactNode, useState, Children, isValidElement } from 'react';
import { useTranslation } from 'react-i18next';
import { PanelSection } from '../PanelSection';
-import {
- SegmentationTableProvider,
- SegmentationTableContextType,
- ViewportSegmentationInfo,
-} from './contexts';
+import { SegmentationTableProvider, SegmentationTableContextType } from './contexts';
import { SegmentationSegments } from './SegmentationSegments';
import { SegmentStatistics } from './SegmentStatistics';
import { SegmentationTableConfig } from './SegmentationTableConfig';
diff --git a/yarn.lock b/yarn.lock
index 0a07e0528..bea9ec7a2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1393,10 +1393,10 @@
resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
-"@cornerstonejs/adapters@^3.7.1":
- version "3.7.1"
- resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-3.7.1.tgz#9d5babdd00fc08e54aa57c14a7d36d2854ebd01c"
- integrity sha512-aREkDwxmoIxBT4xJs00i7ghI9kCdKa7hmmDdCxw54lD0kI6aGLAHrwIeeYl+C19suyNH18duwuy1E/GYLfg5pA==
+"@cornerstonejs/adapters@^3.7.5":
+ version "3.7.5"
+ resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-3.7.5.tgz#d5199f8aef9f9ba176183f9d123b3a0e32622813"
+ integrity sha512-Pdrlx1dYVe/nakC7geec8QOQwqi4hJaAgTpN18y+/a7Vk3wpzj+/q+vf03lt4BhUygAu9+3t5gAUDm0kzXq02g==
dependencies:
"@babel/runtime-corejs2" "^7.17.8"
buffer "^6.0.3"
@@ -1429,20 +1429,20 @@
resolved "https://registry.yarnpkg.com/@cornerstonejs/codec-openjph/-/codec-openjph-2.4.5.tgz#8690b61a86fa53ef38a70eee9d665a79229517c0"
integrity sha512-MZCUy8VG0VG5Nl1l58+g+kH3LujAzLYTfJqkwpWI2gjSrGXnP6lgwyy4GmPRZWVoS40/B1LDNALK905cNWm+sg==
-"@cornerstonejs/core@^3.7.1":
- version "3.7.1"
- resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-3.7.1.tgz#409fad60fa933219f5b1e5757c9dbaead058338c"
- integrity sha512-+I6rCCFW+Am5GRJoaFdl2mD8R+Z0UXRZOBUE7hfTs0F6S8+45nOrlUccIK0UJdRq3bUc+h+G2tHW/i04FFs/mg==
+"@cornerstonejs/core@^3.7.5":
+ version "3.7.5"
+ resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-3.7.5.tgz#16572c18c4cdbf0ffeb6f39675025263ce2099bf"
+ integrity sha512-AMzZrl4nTTcoZejI3qomi5f9LNPr8QkHGconRnNe7aEjuUHUiT9uwX3ieoltJ2IDNmmqhK3wVzJ19EKVqfuESQ==
dependencies:
"@kitware/vtk.js" "32.12.1"
comlink "^4.4.1"
gl-matrix "^3.4.3"
loglevel "^1.9.2"
-"@cornerstonejs/dicom-image-loader@^3.7.1":
- version "3.7.1"
- resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-3.7.1.tgz#c6744624387b5a5056f416d2adebafe0fdda8a48"
- integrity sha512-mfbZ4PjLIGRh9CaMGxw0I4skI0y3sG+z0SlH40m/cwWvfKj18T5iqoLVSovSnYhqCcKdSyljM/ZTAj1t0vfRVQ==
+"@cornerstonejs/dicom-image-loader@^3.7.5":
+ version "3.7.5"
+ resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-3.7.5.tgz#ad010a5c066f4ae4c118c2ce52625d7ee3ad665e"
+ integrity sha512-bDm4hx9NagD7tTU//ls+Z+U8duYgunOfLsAiU6SvNfB2vEINOSHVSnz7pAcnzfnE21ObJYnZnmH5aa8/sa/xCg==
dependencies:
"@cornerstonejs/codec-charls" "^1.2.3"
"@cornerstonejs/codec-libjpeg-turbo-8bit" "^1.2.2"
@@ -1454,25 +1454,25 @@
pako "^2.0.4"
uuid "^9.0.0"
-"@cornerstonejs/labelmap-interpolation@^3.7.1":
- version "3.7.1"
- resolved "https://registry.yarnpkg.com/@cornerstonejs/labelmap-interpolation/-/labelmap-interpolation-3.7.1.tgz#e82c887ffb3f2c3cba77c7ad84b26812aecd6a44"
- integrity sha512-D9VwRPeWlIMfbGD9e5R+zPQLiqKmP0sz3kMN6pxEiDbHpJ6QirtgyJyzZRI3+Z68zL2mxUDNLbfw0GbYm9fhEg==
+"@cornerstonejs/labelmap-interpolation@^3.7.5":
+ version "3.7.5"
+ resolved "https://registry.yarnpkg.com/@cornerstonejs/labelmap-interpolation/-/labelmap-interpolation-3.7.5.tgz#7947d909ff667484abaa484267965c1ad6f91da9"
+ integrity sha512-mIdT8qzQpps1my6daRMAQDejhAAj6QGvkZyU4vbcqIHqqEnWezWFdKNWIlZhm6MX52Vy3Jnl7qBlQ8JtPd+5gQ==
dependencies:
"@itk-wasm/morphological-contour-interpolation" "1.1.0"
itk-wasm "1.0.0-b.165"
-"@cornerstonejs/polymorphic-segmentation@^3.7.1":
- version "3.7.1"
- resolved "https://registry.yarnpkg.com/@cornerstonejs/polymorphic-segmentation/-/polymorphic-segmentation-3.7.1.tgz#364a25cd10fba06dc1667d6a53b2ccd91250ffc2"
- integrity sha512-CRmSSgngzQqfBIiOmVFLzcM9lmDw2ueH/Co44/RDuo437J8mTG3QfDBmKoRt0VhlkiWy+C/cVMKqHwZ63Xl7Og==
+"@cornerstonejs/polymorphic-segmentation@^3.7.5":
+ version "3.7.5"
+ resolved "https://registry.yarnpkg.com/@cornerstonejs/polymorphic-segmentation/-/polymorphic-segmentation-3.7.5.tgz#6c322de19dfb55cee9ca6a813821be906bea9fbb"
+ integrity sha512-+4T5yKjfd0b4dGqy/Tj/V5biuQgjvJVkUv7qe5xU8L/0f8irvr4XtfYoeX9Hoo/iFrYKxdI5LrC35rsKWJttpQ==
dependencies:
"@icr/polyseg-wasm" "0.4.0"
-"@cornerstonejs/tools@^3.7.1":
- version "3.7.1"
- resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-3.7.1.tgz#19458b127b4570314f1a35d04081f59850af5bdc"
- integrity sha512-OVLfmGmQBuR9Ig1ZKy35EjwRLv6zNs6q4hrXf9EoIysMSH/mYB+V4n9/FQsqnlVh4IN0DuBqkwoUmBaGSPkspQ==
+"@cornerstonejs/tools@^3.7.5":
+ version "3.7.5"
+ resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-3.7.5.tgz#5ecdf5669640e0fc57cbae49650aa841decba313"
+ integrity sha512-9GcUI0meHqsO8uzePwv7k99Knr1ta6Q0OCb5AmTKGP6u6ZSEAi1aj2pBSoFZPlG/2vhcXh2NYHkNmeLTYlTP1g==
dependencies:
"@types/offscreencanvas" "2019.7.3"
comlink "^4.4.1"