@@ -417,7 +427,7 @@ function _getStatusComponent({
case 3:
StatusIcon = () => (
);
@@ -439,7 +449,7 @@ function _getStatusComponent({
return (
-
+
SR
{state === 3 && (
diff --git a/extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.ts b/extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.ts
index bafeba2d8..2af1df704 100644
--- a/extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.ts
+++ b/extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.ts
@@ -85,7 +85,8 @@ export default function hydrateStructuredReport(
}
});
- const datasetToUse = _mapLegacyDataSet(instance);
+ // Mapping of legacy datasets is now directly handled by adapters module
+ const datasetToUse = instance;
// Use dcmjs to generate toolState.
let storedMeasurementByAnnotationType = MeasurementReport.generateToolState(
@@ -237,62 +238,3 @@ export default function hydrateStructuredReport(
SeriesInstanceUIDs,
};
}
-
-function _mapLegacyDataSet(dataset) {
- const REPORT = 'Imaging Measurements';
- const GROUP = 'Measurement Group';
- const TRACKING_IDENTIFIER = 'Tracking Identifier';
-
- // Identify the Imaging Measurements
- const imagingMeasurementContent = toArray(dataset.ContentSequence).find(
- codeMeaningEquals(REPORT)
- );
-
- // Retrieve the Measurements themselves
- const measurementGroups = toArray(imagingMeasurementContent.ContentSequence).filter(
- codeMeaningEquals(GROUP)
- );
-
- // For each of the supported measurement types, compute the measurement data
- const measurementData = {};
-
- const cornerstoneToolClasses = MeasurementReport.CORNERSTONE_TOOL_CLASSES_BY_UTILITY_TYPE;
-
- const registeredToolClasses = [];
-
- Object.keys(cornerstoneToolClasses).forEach(key => {
- registeredToolClasses.push(cornerstoneToolClasses[key]);
- measurementData[key] = [];
- });
-
- measurementGroups.forEach((measurementGroup, index) => {
- const measurementGroupContentSequence = toArray(measurementGroup.ContentSequence);
-
- const TrackingIdentifierGroup = measurementGroupContentSequence.find(
- contentItem => contentItem.ConceptNameCodeSequence.CodeMeaning === TRACKING_IDENTIFIER
- );
-
- const TrackingIdentifier = TrackingIdentifierGroup.TextValue;
-
- let [cornerstoneTag, toolName] = TrackingIdentifier.split(':');
- if (supportedLegacyCornerstoneTags.includes(cornerstoneTag)) {
- cornerstoneTag = CORNERSTONE_3D_TAG;
- }
-
- const mappedTrackingIdentifier = `${cornerstoneTag}:${toolName}`;
-
- TrackingIdentifierGroup.TextValue = mappedTrackingIdentifier;
- });
-
- return dataset;
-}
-
-const toArray = function (x) {
- return Array.isArray(x) ? x : [x];
-};
-
-const codeMeaningEquals = codeMeaningName => {
- return contentItem => {
- return contentItem.ConceptNameCodeSequence.CodeMeaning === codeMeaningName;
- };
-};
diff --git a/extensions/cornerstone-dicom-sr/src/utils/isRehydratable.js b/extensions/cornerstone-dicom-sr/src/utils/isRehydratable.js
deleted file mode 100644
index 31705c3a2..000000000
--- a/extensions/cornerstone-dicom-sr/src/utils/isRehydratable.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import { adaptersSR } from '@cornerstonejs/adapters';
-
-const cornerstoneAdapters =
- adaptersSR.Cornerstone3D.MeasurementReport.CORNERSTONE_TOOL_CLASSES_BY_UTILITY_TYPE;
-
-const supportedLegacyCornerstoneTags = ['cornerstoneTools@^4.0.0'];
-const CORNERSTONE_3D_TAG = adaptersSR.Cornerstone3D.CORNERSTONE_3D_TAG;
-
-/**
- * Checks if the given `displaySet`can be rehydrated into the `measurementService`.
- *
- * @param {object} displaySet The SR `displaySet` to check.
- * @param {object[]} mappings The CornerstoneTools 4 mappings to the `measurementService`.
- * @returns {boolean} True if the SR can be rehydrated into the `measurementService`.
- */
-export default function isRehydratable(displaySet, mappings) {
- if (!mappings || !mappings.length) {
- return false;
- }
-
- const mappingDefinitions = mappings.map(m => m.annotationType);
- const { measurements } = displaySet;
-
- const adapterKeys = Object.keys(cornerstoneAdapters).filter(
- adapterKey =>
- typeof cornerstoneAdapters[adapterKey].isValidCornerstoneTrackingIdentifier === 'function'
- );
-
- const adapters = [];
-
- adapterKeys.forEach(key => {
- if (mappingDefinitions.includes(key)) {
- // Must have both a dcmjs adapter and a measurementService
- // Definition in order to be a candidate for import.
- adapters.push(cornerstoneAdapters[key]);
- }
- });
-
- for (let i = 0; i < measurements.length; i++) {
- const { TrackingIdentifier } = measurements[i] || {};
- const hydratable = adapters.some(adapter => {
- let [cornerstoneTag, toolName] = TrackingIdentifier.split(':');
- if (supportedLegacyCornerstoneTags.includes(cornerstoneTag)) {
- cornerstoneTag = CORNERSTONE_3D_TAG;
- }
-
- const mappedTrackingIdentifier = `${cornerstoneTag}:${toolName}`;
-
- return adapter.isValidCornerstoneTrackingIdentifier(mappedTrackingIdentifier);
- });
-
- if (hydratable) {
- return true;
- }
- console.log('Measurement is not rehydratable', TrackingIdentifier, measurements[i]);
- }
-
- console.log('No measurements found which were rehydratable');
- return false;
-}
diff --git a/extensions/cornerstone-dicom-sr/src/utils/isRehydratable.ts b/extensions/cornerstone-dicom-sr/src/utils/isRehydratable.ts
new file mode 100644
index 000000000..cf51f42f3
--- /dev/null
+++ b/extensions/cornerstone-dicom-sr/src/utils/isRehydratable.ts
@@ -0,0 +1,41 @@
+import { adaptersSR } from '@cornerstonejs/adapters';
+
+const { MeasurementReport } = adaptersSR.Cornerstone3D;
+
+/**
+ * Checks if the given `displaySet`can be rehydrated into the `measurementService`.
+ *
+ * @param {object} displaySet The SR `displaySet` to check.
+ * @param {object[]} mappings The CornerstoneTools 4 mappings to the `measurementService`.
+ * @returns {boolean} True if the SR can be rehydrated into the `measurementService`.
+ */
+export default function isRehydratable(displaySet, mappings) {
+ if (!mappings || !mappings.length) {
+ return false;
+ }
+
+ const mappingDefinitions = new Set
();
+ for (const m of mappings) {
+ mappingDefinitions.add(m.annotationType);
+ }
+
+ const { measurements } = displaySet;
+
+ for (let i = 0; i < measurements.length; i++) {
+ const { TrackingIdentifier } = measurements[i] || {};
+ if (!TrackingIdentifier) {
+ console.warn('No tracking identifier for measurement ', measurements[i]);
+ continue;
+ }
+ const adapter = MeasurementReport.getAdapterForTrackingIdentifier(TrackingIdentifier);
+ const hydratable = adapter && mappingDefinitions.has(adapter.toolType);
+
+ if (hydratable) {
+ return true;
+ }
+ console.log('Measurement is not rehydratable', TrackingIdentifier, measurements[i]);
+ }
+
+ console.log('No measurements found which were rehydratable');
+ return false;
+}
diff --git a/extensions/cornerstone-dynamic-volume/package.json b/extensions/cornerstone-dynamic-volume/package.json
index 5014e4905..4aa08d574 100644
--- a/extensions/cornerstone-dynamic-volume/package.json
+++ b/extensions/cornerstone-dynamic-volume/package.json
@@ -42,8 +42,8 @@
},
"dependencies": {
"@babel/runtime": "^7.20.13",
- "@cornerstonejs/core": "^2.19.14",
- "@cornerstonejs/tools": "^2.19.14",
+ "@cornerstonejs/core": "^3.0.1",
+ "@cornerstonejs/tools": "^3.0.1",
"classnames": "^2.3.2"
}
}
diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json
index 4f182e9c1..fe83858fa 100644
--- a/extensions/cornerstone/package.json
+++ b/extensions/cornerstone/package.json
@@ -38,7 +38,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": "^2.19.14",
+ "@cornerstonejs/dicom-image-loader": "^3.0.1",
"@ohif/core": "3.10.0-beta.113",
"@ohif/ui": "3.10.0-beta.113",
"dcmjs": "*",
@@ -51,10 +51,10 @@
},
"dependencies": {
"@babel/runtime": "^7.20.13",
- "@cornerstonejs/adapters": "^2.19.14",
- "@cornerstonejs/core": "^2.19.14",
- "@cornerstonejs/tools": "^2.19.14",
- "@icr/polyseg-wasm": "^0.4.0",
+ "@cornerstonejs/adapters": "^3.0.1",
+ "@cornerstonejs/core": "^3.0.1",
+ "@cornerstonejs/tools": "^3.0.1",
+ "@cornerstonejs/polymorphic-segmentation": "^3.0.1",
"@itk-wasm/morphological-contour-interpolation": "1.1.0",
"@kitware/vtk.js": "32.1.1",
"html2canvas": "^1.4.1",
diff --git a/extensions/cornerstone/src/initCornerstoneTools.js b/extensions/cornerstone/src/initCornerstoneTools.js
index dd1aedc0f..423bbf9d9 100644
--- a/extensions/cornerstone/src/initCornerstoneTools.js
+++ b/extensions/cornerstone/src/initCornerstoneTools.js
@@ -37,6 +37,7 @@ import {
OrientationMarkerTool,
WindowLevelRegionTool,
} from '@cornerstonejs/tools';
+import * as polySeg from '@cornerstonejs/polymorphic-segmentation';
import CalibrationLineTool from './tools/CalibrationLineTool';
import ImageOverlayViewerTool from './tools/ImageOverlayViewerTool';
@@ -47,7 +48,11 @@ export default function initCornerstoneTools(configuration = {}) {
AdvancedMagnifyTool.isAnnotation = false;
PlanarFreehandContourSegmentationTool.isAnnotation = false;
- init(configuration);
+ init({
+ addons: {
+ polySeg,
+ },
+ });
addTool(PanTool);
addTool(WindowLevelTool);
addTool(StackScrollTool);
diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/ArrowAnnotate.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/ArrowAnnotate.ts
index edd57546c..e3521ec99 100644
--- a/extensions/cornerstone/src/utils/measurementServiceMappings/ArrowAnnotate.ts
+++ b/extensions/cornerstone/src/utils/measurementServiceMappings/ArrowAnnotate.ts
@@ -2,7 +2,8 @@ import SUPPORTED_TOOLS from './constants/supportedTools';
import { getIsLocked } from './utils/getIsLocked';
import getSOPInstanceAttributes from './utils/getSOPInstanceAttributes';
import { getIsVisible } from './utils/getIsVisible';
-const Length = {
+
+const ArrowAnnotate = {
toAnnotation: measurement => {},
/**
@@ -172,4 +173,4 @@ function _getReport(mappedAnnotations, points, FrameOfReferenceUID) {
values,
};
}
-export default Length;
+export default ArrowAnnotate;
diff --git a/extensions/measurement-tracking/package.json b/extensions/measurement-tracking/package.json
index 0e3c41c79..1115e1f18 100644
--- a/extensions/measurement-tracking/package.json
+++ b/extensions/measurement-tracking/package.json
@@ -32,8 +32,8 @@
"start": "yarn run dev"
},
"peerDependencies": {
- "@cornerstonejs/core": "^2.19.14",
- "@cornerstonejs/tools": "^2.19.14",
+ "@cornerstonejs/core": "^3.0.1",
+ "@cornerstonejs/tools": "^3.0.1",
"@ohif/core": "3.10.0-beta.113",
"@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.113",
"@ohif/extension-default": "3.10.0-beta.113",
diff --git a/extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/TrackedMeasurementsContext.tsx b/extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/TrackedMeasurementsContext.tsx
index e587c128d..e69f0917b 100644
--- a/extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/TrackedMeasurementsContext.tsx
+++ b/extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/TrackedMeasurementsContext.tsx
@@ -89,6 +89,15 @@ function TrackedMeasurementsContextProvider(
);
// Jump to the last tracked measurement - most recent
+ if (!trackedMeasurements?.length) {
+ console.warn(
+ "Didn't find any tracked measurements",
+ measurements,
+ trackedStudy,
+ trackedSeries
+ );
+ return;
+ }
const trackedMeasurement = trackedMeasurements[trackedMeasurements.length - 1];
const referencedDisplaySetUID = trackedMeasurement.displaySetInstanceUID;
diff --git a/modes/basic-test-mode/src/index.ts b/modes/basic-test-mode/src/index.ts
index 1ad5c62da..184f6756d 100644
--- a/modes/basic-test-mode/src/index.ts
+++ b/modes/basic-test-mode/src/index.ts
@@ -1,4 +1,3 @@
-import { hotkeys } from '@ohif/core';
import toolbarButtons from './toolbarButtons';
import { id } from './id';
import initToolGroups from './initToolGroups';
diff --git a/modes/segmentation/src/initToolGroups.ts b/modes/segmentation/src/initToolGroups.ts
index 387a4b0da..e61eeb0bf 100644
--- a/modes/segmentation/src/initToolGroups.ts
+++ b/modes/segmentation/src/initToolGroups.ts
@@ -70,14 +70,9 @@ function createTools(utilityModule) {
// preview: {
// enabled: true,
// },
- strategySpecificConfiguration: {
- // to use the use the center segment index to determine
- // if inside -> same segment, if outside -> eraser
- // useCenterSegmentIndex: true,
- THRESHOLD: {
- isDynamic: true,
- dynamicRadius: 3,
- },
+ threshold: {
+ isDynamic: true,
+ dynamicRadius: 3,
},
},
},
diff --git a/modes/tmtv/src/initToolGroups.js b/modes/tmtv/src/initToolGroups.js
index 00447ce56..2b39c3f6a 100644
--- a/modes/tmtv/src/initToolGroups.js
+++ b/modes/tmtv/src/initToolGroups.js
@@ -105,14 +105,9 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager) {
// preview: {
// enabled: true,
// },
- strategySpecificConfiguration: {
- // to use the use the center segment index to determine
- // if inside -> same segment, if outside -> eraser
- // useCenterSegmentIndex: true,
- THRESHOLD: {
- isDynamic: true,
- dynamicRadius: 3,
- },
+ threshold: {
+ isDynamic: true,
+ dynamicRadius: 3,
},
},
},
diff --git a/platform/app/package.json b/platform/app/package.json
index 6da17996d..3b484a48f 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": "^2.19.14",
+ "@cornerstonejs/dicom-image-loader": "^3.0.1",
"@emotion/serialize": "^1.1.3",
"@ohif/core": "3.10.0-beta.113",
"@ohif/extension-cornerstone": "3.10.0-beta.113",
diff --git a/platform/core/package.json b/platform/core/package.json
index 14a44a013..d59e6d213 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": "^2.19.14",
+ "@cornerstonejs/dicom-image-loader": "^3.0.1",
"@ohif/ui": "3.10.0-beta.113",
"cornerstone-math": "0.1.9",
"dicom-parser": "^1.8.21"
diff --git a/platform/ui-next/src/components/Icons/Icons.tsx b/platform/ui-next/src/components/Icons/Icons.tsx
index 0e1dd5abd..bcfdd1411 100644
--- a/platform/ui-next/src/components/Icons/Icons.tsx
+++ b/platform/ui-next/src/components/Icons/Icons.tsx
@@ -193,6 +193,7 @@ import Pencil from './Sources/Pencil';
import NotificationWarning from './Sources/NotificationWarning';
import ArrowRight from './Sources/ArrowRight';
import ChevronLeft from './Sources/ChevronLeft';
+import StatusAlert from './Sources/StatusAlert';
//
//
type IconProps = React.HTMLAttributes;
@@ -681,7 +682,7 @@ export const Icons = {
'icon-transferring': (props: IconProps) => IconTransferring(props),
'icon-alert-small': (props: IconProps) => Alert(props),
'icon-alert-outline': (props: IconProps) => AlertOutline(props),
- 'status-alert': (props: IconProps) => Alert(props),
+ 'status-alert': (props: IconProps) => StatusAlert(props),
info: (props: IconProps) => Info(props),
'notifications-info': (props: IconProps) => NotificationInfo(props),
'notificationwarning-diamond': (props: IconProps) => NotificationWarning(props),
diff --git a/platform/ui-next/src/components/Icons/Sources/StatusAlert.tsx b/platform/ui-next/src/components/Icons/Sources/StatusAlert.tsx
new file mode 100644
index 000000000..afc3c9c19
--- /dev/null
+++ b/platform/ui-next/src/components/Icons/Sources/StatusAlert.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import type { IconProps } from '../types';
+
+export const StatusError = (props: IconProps) => (
+
+);
+
+export default StatusError;
diff --git a/platform/ui-next/src/components/Icons/Sources/StatusError.tsx b/platform/ui-next/src/components/Icons/Sources/StatusError.tsx
index 07e42dfa7..829410966 100644
--- a/platform/ui-next/src/components/Icons/Sources/StatusError.tsx
+++ b/platform/ui-next/src/components/Icons/Sources/StatusError.tsx
@@ -6,6 +6,7 @@ export const StatusError = (props: IconProps) => (
width="24px"
height="24px"
viewBox="0 0 24 24"
+ {...props}
>