fix(seg): Enhance segmentation tools and UI, refactor code, and update dependencies (#4915)
This commit is contained in:
1 parent
1dc00d3030
commit
8432d5f633
37 files changed
+1063
-1122
No files matched your search
@@ -2,7 +2,6 @@ const colormaps = [
|
||||
{
|
||||
ColorSpace: 'RGB',
|
||||
Name: 'Grayscale',
|
||||
name: 'Grayscale',
|
||||
NanColor: [1, 0, 0],
|
||||
RGBPoints: [0, 0, 0, 0, 1, 1, 1, 1],
|
||||
description: 'Grayscale',
|
||||
@@ -10,7 +9,6 @@ const colormaps = [
|
||||
{
|
||||
ColorSpace: 'RGB',
|
||||
Name: 'X Ray',
|
||||
name: 'X Ray',
|
||||
NanColor: [1, 0, 0],
|
||||
RGBPoints: [0, 1, 1, 1, 1, 0, 0, 0],
|
||||
description: 'X Ray',
|
||||
@@ -18,7 +16,6 @@ const colormaps = [
|
||||
{
|
||||
ColorSpace: 'RGB',
|
||||
Name: 'hsv',
|
||||
name: 'hsv',
|
||||
RGBPoints: [
|
||||
-1, 1, 0, 0, -0.666666, 1, 0, 1, -0.333333, 0, 0, 1, 0, 0, 1, 1, 0.33333, 0, 1, 0, 0.66666, 1,
|
||||
1, 0, 1, 1, 0, 0,
|
||||
@@ -28,7 +25,6 @@ const colormaps = [
|
||||
{
|
||||
ColorSpace: 'RGB',
|
||||
Name: 'hot_iron',
|
||||
name: 'hot_iron',
|
||||
RGBPoints: [
|
||||
0.0, 0.0039215686, 0.0039215686, 0.0156862745, 0.00392156862745098, 0.0039215686,
|
||||
0.0039215686, 0.0156862745, 0.00784313725490196, 0.0039215686, 0.0039215686, 0.031372549,
|
||||
@@ -224,7 +220,6 @@ const colormaps = [
|
||||
{
|
||||
ColorSpace: 'RGB',
|
||||
Name: 'red_hot',
|
||||
name: 'red_hot',
|
||||
RGBPoints: [
|
||||
0.0, 0.0, 0.0, 0.0, 0.00392156862745098, 0.0, 0.0, 0.0, 0.00784313725490196, 0.0, 0.0, 0.0,
|
||||
0.011764705882352941, 0.0, 0.0, 0.0, 0.01568627450980392, 0.0039215686, 0.0039215686,
|
||||
@@ -359,7 +354,6 @@ const colormaps = [
|
||||
{
|
||||
ColorSpace: 'RGB',
|
||||
Name: 's_pet',
|
||||
name: 's_pet',
|
||||
RGBPoints: [
|
||||
0.0, 0.0156862745, 0.0039215686, 0.0156862745, 0.00392156862745098, 0.0156862745,
|
||||
0.0039215686, 0.0156862745, 0.00784313725490196, 0.0274509804, 0.0039215686, 0.031372549,
|
||||
@@ -553,7 +547,6 @@ const colormaps = [
|
||||
{
|
||||
ColorSpace: 'RGB',
|
||||
Name: 'perfusion',
|
||||
name: 'perfusion',
|
||||
RGBPoints: [
|
||||
0.0, 0.0, 0.0, 0.0, 0.00392156862745098, 0.0078431373, 0.0235294118, 0.0235294118,
|
||||
0.00784313725490196, 0.0078431373, 0.031372549, 0.0470588235, 0.011764705882352941,
|
||||
@@ -733,7 +726,6 @@ const colormaps = [
|
||||
{
|
||||
ColorSpace: 'RGB',
|
||||
Name: 'rainbow_2',
|
||||
name: 'rainbow_2',
|
||||
RGBPoints: [
|
||||
0.0, 0.0, 0.0, 0.0, 0.00392156862745098, 0.0156862745, 0.0, 0.0117647059, 0.00784313725490196,
|
||||
0.0352941176, 0.0, 0.0274509804, 0.011764705882352941, 0.0509803922, 0.0, 0.0392156863,
|
||||
@@ -872,7 +864,6 @@ const colormaps = [
|
||||
{
|
||||
ColorSpace: 'RGB',
|
||||
Name: 'suv',
|
||||
name: 'suv',
|
||||
RGBPoints: [
|
||||
0.0, 1.0, 1.0, 1.0, 0.00392156862745098, 1.0, 1.0, 1.0, 0.00784313725490196, 1.0, 1.0, 1.0,
|
||||
0.011764705882352941, 1.0, 1.0, 1.0, 0.01568627450980392, 1.0, 1.0, 1.0, 0.0196078431372549,
|
||||
@@ -1019,7 +1010,6 @@ const colormaps = [
|
||||
{
|
||||
ColorSpace: 'RGB',
|
||||
Name: 'ge_256',
|
||||
name: 'ge_256',
|
||||
RGBPoints: [
|
||||
0.0, 0.0039215686, 0.0078431373, 0.0078431373, 0.00392156862745098, 0.0039215686,
|
||||
0.0078431373, 0.0078431373, 0.00784313725490196, 0.0039215686, 0.0078431373, 0.0117647059,
|
||||
@@ -1211,7 +1201,6 @@ const colormaps = [
|
||||
{
|
||||
ColorSpace: 'RGB',
|
||||
Name: 'ge',
|
||||
name: 'ge',
|
||||
RGBPoints: [
|
||||
0.0, 0.0078431373, 0.0078431373, 0.0078431373, 0.00392156862745098, 0.0078431373,
|
||||
0.0078431373, 0.0078431373, 0.00784313725490196, 0.0078431373, 0.0078431373, 0.0078431373,
|
||||
@@ -1404,7 +1393,6 @@ const colormaps = [
|
||||
{
|
||||
ColorSpace: 'RGB',
|
||||
Name: 'siemens',
|
||||
name: 'siemens',
|
||||
RGBPoints: [
|
||||
0.0, 0.0078431373, 0.0039215686, 0.1254901961, 0.00392156862745098, 0.0078431373,
|
||||
0.0039215686, 0.1254901961, 0.00784313725490196, 0.0078431373, 0.0039215686, 0.1882352941,
|
||||
|
||||
@@ -1,9 +1,15 @@
|
||||
import { handleSegmentChange } from './segmentUtils';
|
||||
import { isReferenceViewable } from './isReferenceViewable';
|
||||
import {
|
||||
setupSegmentationDataModifiedHandler,
|
||||
setupSegmentationModifiedHandler,
|
||||
} from './segmentationHandlers';
|
||||
|
||||
const utils = {
|
||||
handleSegmentChange,
|
||||
isReferenceViewable,
|
||||
setupSegmentationDataModifiedHandler,
|
||||
setupSegmentationModifiedHandler,
|
||||
};
|
||||
|
||||
export default utils;
|
||||
@@ -84,7 +84,7 @@ const Bidirectional = {
|
||||
function getMappedAnnotations(annotation, displaySetService) {
|
||||
const { metadata, data } = annotation;
|
||||
const { cachedStats } = data;
|
||||
const { referencedImageId, referencedSeriesInstanceUID } = metadata;
|
||||
const { referencedImageId } = metadata;
|
||||
const targets = Object.keys(cachedStats);
|
||||
|
||||
if (!targets.length) {
|
||||
|
||||
@@ -93,6 +93,7 @@ function getMappedAnnotations(annotation, displaySetService) {
|
||||
}
|
||||
|
||||
const annotations = [];
|
||||
const addedModalities = new Set();
|
||||
Object.keys(cachedStats).forEach(targetId => {
|
||||
const targetStats = cachedStats[targetId];
|
||||
|
||||
@@ -108,6 +109,12 @@ function getMappedAnnotations(annotation, displaySetService) {
|
||||
const { mean, stdDev, max, area, Modality, areaUnit, modalityUnit, perimeter, radiusUnit } =
|
||||
targetStats;
|
||||
|
||||
if (Modality && addedModalities.has(Modality)) {
|
||||
return;
|
||||
}
|
||||
|
||||
addedModalities.add(Modality);
|
||||
|
||||
annotations.push({
|
||||
SeriesInstanceUID,
|
||||
SOPInstanceUID,
|
||||
|
||||
@@ -93,6 +93,8 @@ function getMappedAnnotations(annotation, displaySetService) {
|
||||
}
|
||||
|
||||
const annotations = [];
|
||||
const addedModalities = new Set();
|
||||
|
||||
Object.keys(cachedStats).forEach(targetId => {
|
||||
const targetStats = cachedStats[targetId];
|
||||
|
||||
@@ -107,6 +109,16 @@ function getMappedAnnotations(annotation, displaySetService) {
|
||||
const { SeriesNumber } = displaySet;
|
||||
const { mean, stdDev, max, area, Modality, areaUnit, modalityUnit } = targetStats;
|
||||
|
||||
// Skip if we've already added this modality
|
||||
if (Modality && addedModalities.has(Modality)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Add modality to the set if it exists
|
||||
if (Modality) {
|
||||
addedModalities.add(Modality);
|
||||
}
|
||||
|
||||
annotations.push({
|
||||
SeriesInstanceUID,
|
||||
SOPInstanceUID,
|
||||
|
||||
@@ -92,6 +92,8 @@ function getMappedAnnotations(annotation, displaySetService) {
|
||||
}
|
||||
|
||||
const annotations = [];
|
||||
|
||||
const addedModalities = new Set();
|
||||
Object.keys(cachedStats).forEach(targetId => {
|
||||
const targetStats = cachedStats[targetId];
|
||||
|
||||
@@ -106,6 +108,16 @@ function getMappedAnnotations(annotation, displaySetService) {
|
||||
const { SeriesNumber } = displaySet;
|
||||
const { mean, stdDev, max, area, Modality, modalityUnit, areaUnit } = targetStats;
|
||||
|
||||
// Skip if we've already added this modality
|
||||
if (Modality && addedModalities.has(Modality)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Add modality to the set if it exists
|
||||
if (Modality) {
|
||||
addedModalities.add(Modality);
|
||||
}
|
||||
|
||||
annotations.push({
|
||||
SeriesInstanceUID,
|
||||
SOPInstanceUID,
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
import * as cornerstoneTools from '@cornerstonejs/tools';
|
||||
import { updateSegmentationStats } from './updateSegmentationStats';
|
||||
|
||||
/**
|
||||
* Sets up the handler for segmentation data modification events
|
||||
*/
|
||||
export function setupSegmentationDataModifiedHandler({
|
||||
segmentationService,
|
||||
customizationService,
|
||||
commandsManager,
|
||||
}) {
|
||||
segmentationService.subscribeDebounced(
|
||||
segmentationService.EVENTS.SEGMENTATION_DATA_MODIFIED,
|
||||
async ({ segmentationId }) => {
|
||||
const segmentation = segmentationService.getSegmentation(segmentationId);
|
||||
const readableText = customizationService.getCustomization('panelSegmentation.readableText');
|
||||
|
||||
// Check for segments with bidirectional measurements and update them
|
||||
const segmentIndices = Object.keys(segmentation.segments)
|
||||
.map(index => parseInt(index))
|
||||
.filter(index => index > 0);
|
||||
|
||||
for (const segmentIndex of segmentIndices) {
|
||||
const segment = segmentation.segments[segmentIndex];
|
||||
if (segment?.cachedStats?.namedStats?.bidirectional) {
|
||||
// Run the command to update the bidirectional measurement
|
||||
commandsManager.runCommand('runSegmentBidirectional', {
|
||||
segmentationId,
|
||||
segmentIndex,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
const updatedSegmentation = await updateSegmentationStats({
|
||||
segmentation,
|
||||
segmentationId,
|
||||
readableText,
|
||||
});
|
||||
|
||||
if (updatedSegmentation) {
|
||||
segmentationService.addOrUpdateSegmentation({
|
||||
segmentationId,
|
||||
segments: updatedSegmentation.segments,
|
||||
});
|
||||
}
|
||||
},
|
||||
1000
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets up the handler for segmentation modification events
|
||||
*/
|
||||
export function setupSegmentationModifiedHandler({ segmentationService }) {
|
||||
segmentationService.subscribe(
|
||||
segmentationService.EVENTS.SEGMENTATION_MODIFIED,
|
||||
async ({ segmentationId }) => {
|
||||
const segmentation = segmentationService.getSegmentation(segmentationId);
|
||||
|
||||
const annotationState = cornerstoneTools.annotation.state.getAllAnnotations();
|
||||
const bidirectionalAnnotations = annotationState.filter(
|
||||
annotation =>
|
||||
annotation.metadata.toolName === cornerstoneTools.SegmentBidirectionalTool.toolName
|
||||
);
|
||||
|
||||
let toRemoveUIDs = [];
|
||||
if (!segmentation) {
|
||||
toRemoveUIDs = bidirectionalAnnotations.map(
|
||||
annotation => annotation.metadata.segmentationId === segmentationId
|
||||
);
|
||||
return;
|
||||
} else {
|
||||
const segmentIndices = Object.keys(segmentation.segments)
|
||||
.map(index => parseInt(index))
|
||||
.filter(index => index > 0);
|
||||
|
||||
// check if there is a bidirectional data that exists but the segment
|
||||
// does not exists anymore we need to remove the bidirectional data
|
||||
const bidirectionalAnnotationsToRemove = bidirectionalAnnotations.filter(
|
||||
annotation =>
|
||||
annotation.metadata.segmentationId === segmentationId &&
|
||||
!segmentIndices.includes(annotation.metadata.segmentIndex)
|
||||
);
|
||||
|
||||
toRemoveUIDs = bidirectionalAnnotationsToRemove.map(annotation => annotation.annotationUID);
|
||||
}
|
||||
|
||||
toRemoveUIDs.forEach(uid => {
|
||||
cornerstoneTools.annotation.state.removeAnnotation(uid);
|
||||
});
|
||||
}
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user