feat: Add DICOM SEG support and MPR, referenceLines and StackSync and more (#3015)
* feat: add initial sop class handler for SEG * feat: move segmentation service * update segmentation service methods * fix: viewport data structure * feat: Add initial render for the DICOM SEG for each displaySet * fix: various wrong architectural dependencies between services * feat: initial separate SEG display in each viewport * feat: refactore viewport action bar * initial work for SEG hydration * fix: various bugs regarding drag and dropping different viewports * fix: rendering issues for multiple seg displaysets * fix: bugs for thumbnail and hydration * feat: fix the initial segment color * update after rebase * feat: initial design for the segmentation group table * feat: initial new design for the segmentation panel * feat: segmentation panel * feat: make segmentation appear on all related viewports * fix: segmentation load bug based on functional groups * initial work for segmentation crosshairs * fix: various stylings and functionality * fix: various stylings for the seg panel * fix: overflow styles * feat: add more ui components * feat: added segmentation config * feat: add jump to segment * feat: add jump to segment for DICOM SEG viewport * fix: bugs after rebase * feat: jump in segmentation viewport * fix: mpr support for seg * feat: add more icons * feat: new icons * feat: add new side panel * feat: add segmentation config * feat: add loading indicator to ohif * feat: make hanging protocols follow matching rules for viewports * feat: enhance drag and drop to be hanging protocol aware * fix: mpr restore previous layout * fix: crosshairs toggle * fix: add auth headers to the dicom loader via dicomwebclient * fix: bug for crosshairs toggle in mpr * fix: seg viewport reusing old toolGroup * feat: add loading animation with lottie * fix: various bugs for Segmentation hydration in mpr * feat: change outline alpha to outline opacity * feat: loading indicator for seg viewport * fix: various segmentation group styles * fix: local mode for seg * feat: add animation for the highlight * fix: loading indicatro to show segment indices * feat: enhance modality drop down ui * fix: panels * fix: download form * fix: layout shift in loading indicator * fix: loading indicator to have correct values * fix: update software number * fix: image jump between MPR and default * fix: segmentation cleanup and cine service cleanup * fix: segmentation toolgroup clena up * fix: highlight interval should not trigger again * fix: issue with multiframe sorting * rename: change onSeriesChange to onArrowsClick * fix: buttons for tmtv and layout shift * fix: various bugs wrt crosshairs * fix: crosshairs re init on reset camera * fix: middle slice calculation different from cs middle reset camera * fix: reset camera should reset viewport camera * fix: loading segments in MPR mode * fix: tmtv hp back to before * fix: layout shift * feat: orientation markers for volume viewport * fix: capture for volume viewports * fix: memory leak for back to worklist * fix: loading bar bg color * fix: side panel for only one panel * fix: react select style in production * fix: various styling for segmentation groups * fix: various ui styles * feat: add new segmentation config styles * fix: hover state for segmentation item * fix: side panel layout shift * temp add panels * try to fix scrollbar for thimbnail * fix: scroll not appearing for side panels * feat: changed styles for scrollbar * feat: add cpu fallback warning * fix: webworker destroy * fix: select styles * fix: orientation marker color and position * fix: capture screenshot for volume viewports * fix: hide segment visibility on mpr * fix: reloading an already loaded seg displayset * feat: add is equal * fix: mpr jump to measurements * apply review comments * fix: optimization for the segmentation load * fix: remove unnecessary context menu and hp service reset * fix: segmentation service wrt brush settings * feat: initial work for the stack synchronization * fix: add validateDisplaySetSelectorsForNewDisplaySets to make sure drag and drop can follow requirements * fix: various react proptypes * fix: thumbnails for the tmtv and change default props to default params * feat: make showing loading indicator configurable and add docs * bump versions and add more docs * fix demo * update cornerstone versions * apply review comments * feat: add reference lines * fix build * fix unit tests * add reference lines icon * fix: e2e tests * fix static wado config * docs: add segmentation service docs * fix: docker build * fix: keep camera and bump versions * Try re-enabling minification to fix deploy previews Co-authored-by: Erik Ziegler <erik.sweed@gmail.com>
This commit is contained in:
1 parent
08c58b0634
commit
83ea228d86
254 files changed
+12856
-3141
No files matched your search
@@ -20,10 +20,12 @@ import progressTrackingUtils from './progressTrackingUtils';
|
||||
import isLowPriorityModality from './isLowPriorityModality';
|
||||
import { isImage } from './isImage';
|
||||
import isDisplaySetReconstructable from './isDisplaySetReconstructable';
|
||||
import sortInstancesByPosition from './sortInstancesByPosition';
|
||||
import imageIdToURI from './imageIdToURI';
|
||||
import debounce from './debounce';
|
||||
import roundNumber from './roundNumber';
|
||||
import downloadCSVReport from './downloadCSVReport';
|
||||
import isEqualWithin from './isEqualWithin';
|
||||
|
||||
// Commented out unused functionality.
|
||||
// Need to implement new mechanism for derived displaySets using the displaySetManager.
|
||||
@@ -46,6 +48,7 @@ const utils = {
|
||||
hotkeys,
|
||||
Queue,
|
||||
isDicomUid,
|
||||
isEqualWithin,
|
||||
resolveObjectPath,
|
||||
hierarchicalListUtils,
|
||||
progressTrackingUtils,
|
||||
@@ -72,12 +75,14 @@ export {
|
||||
hotkeys,
|
||||
Queue,
|
||||
isDicomUid,
|
||||
isEqualWithin,
|
||||
resolveObjectPath,
|
||||
hierarchicalListUtils,
|
||||
progressTrackingUtils,
|
||||
isLowPriorityModality,
|
||||
isImage,
|
||||
isDisplaySetReconstructable,
|
||||
sortInstancesByPosition,
|
||||
imageIdToURI,
|
||||
debounce,
|
||||
roundNumber,
|
||||
|
||||
@@ -17,6 +17,7 @@ describe('Top level exports', () => {
|
||||
'b64toBlob',
|
||||
'formatDate',
|
||||
'formatPN',
|
||||
'isEqualWithin',
|
||||
//'loadAndCacheDerivedDisplaySets',
|
||||
'isDisplaySetReconstructable',
|
||||
'isImage',
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import toNumber from './toNumber';
|
||||
import sortInstancesByPosition from './sortInstancesByPosition';
|
||||
|
||||
// TODO: Is 10% a reasonable spacingTolerance for spacing?
|
||||
const spacingTolerance = 0.2;
|
||||
@@ -28,10 +29,12 @@ export default function isDisplaySetReconstructable(instances) {
|
||||
return { value: false };
|
||||
}
|
||||
|
||||
const sortedInstances = sortInstancesByPosition(instances);
|
||||
|
||||
if (isMultiframe) {
|
||||
return processMultiframe(instances[0]);
|
||||
return processMultiframe(sortedInstances[0]);
|
||||
} else {
|
||||
return processSingleframe(instances);
|
||||
return processSingleframe(sortedInstances);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
/**
|
||||
* returns equal if the two arrays are identical within the
|
||||
* given tolerance.
|
||||
*
|
||||
* @param v1 - The first array of values
|
||||
* @param v2 - The second array of values.
|
||||
* @param tolerance - The acceptable tolerance, the default is 0.00001
|
||||
*
|
||||
* @returns True if the two values are within the tolerance levels.
|
||||
*/
|
||||
export default function isEqualWithin(
|
||||
v1: number[] | Float32Array,
|
||||
v2: number[] | Float32Array,
|
||||
tolerance = 1e-5
|
||||
): boolean {
|
||||
if (v1.length !== v2.length) {
|
||||
return false;
|
||||
}
|
||||
|
||||
for (let i = 0; i < v1.length; i++) {
|
||||
if (Math.abs(v1[i] - v2[i]) > tolerance) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
import sortInstances from './sortInstancesByPosition';
|
||||
|
||||
describe('sortInstances', () => {
|
||||
it('should sort instances based on their imagePositionPatient', () => {
|
||||
const instances = [
|
||||
{
|
||||
ImagePositionPatient: [0, 0, 2],
|
||||
ImageOrientationPatient: [1, 0, 0, 0, 1, 0],
|
||||
},
|
||||
{
|
||||
ImagePositionPatient: [0, 0, 1],
|
||||
ImageOrientationPatient: [1, 0, 0, 0, 1, 0],
|
||||
},
|
||||
{
|
||||
ImagePositionPatient: [0, 0, 0],
|
||||
ImageOrientationPatient: [1, 0, 0, 0, 1, 0],
|
||||
},
|
||||
];
|
||||
|
||||
const sortedInstances = sortInstances(instances);
|
||||
|
||||
expect(sortedInstances).toEqual([
|
||||
{
|
||||
ImagePositionPatient: [0, 0, 0],
|
||||
ImageOrientationPatient: [1, 0, 0, 0, 1, 0],
|
||||
},
|
||||
{
|
||||
ImagePositionPatient: [0, 0, 1],
|
||||
ImageOrientationPatient: [1, 0, 0, 0, 1, 0],
|
||||
},
|
||||
{
|
||||
ImagePositionPatient: [0, 0, 2],
|
||||
ImageOrientationPatient: [1, 0, 0, 0, 1, 0],
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
it('should return the same instances if there is only one instance', () => {
|
||||
const instances = [
|
||||
{
|
||||
ImagePositionPatient: [0, 0, 0],
|
||||
},
|
||||
];
|
||||
|
||||
const sortedInstances = sortInstances(instances);
|
||||
|
||||
expect(sortedInstances).toEqual([
|
||||
{
|
||||
ImagePositionPatient: [0, 0, 0],
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
it('should return the same instances if there are no instances', () => {
|
||||
const instances = [];
|
||||
|
||||
const sortedInstances = sortInstances(instances);
|
||||
|
||||
expect(sortedInstances).toEqual([]);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,67 @@
|
||||
import { vec3 } from 'gl-matrix';
|
||||
|
||||
/**
|
||||
* Given an array of imageIds, sort them based on their imagePositionPatient, and
|
||||
* also returns the spacing between images and the origin of the reference image
|
||||
*
|
||||
* @param imageIds - array of imageIds
|
||||
* @param scanAxisNormal - [x, y, z] array or gl-matrix vec3
|
||||
*
|
||||
* @returns The sortedImageIds, zSpacing, and origin of the first image in the series.
|
||||
*/
|
||||
export default function sortInstances(instances: Array<any>) {
|
||||
// Return if only one instance e.g., multiframe
|
||||
if (instances.length <= 1) {
|
||||
return instances;
|
||||
}
|
||||
|
||||
const {
|
||||
ImagePositionPatient: referenceImagePositionPatient,
|
||||
ImageOrientationPatient,
|
||||
} = instances[Math.floor(instances.length / 2)]; // this prevents getting scout image as test image
|
||||
|
||||
const rowCosineVec = vec3.fromValues(
|
||||
ImageOrientationPatient[0],
|
||||
ImageOrientationPatient[1],
|
||||
ImageOrientationPatient[2]
|
||||
);
|
||||
const colCosineVec = vec3.fromValues(
|
||||
ImageOrientationPatient[3],
|
||||
ImageOrientationPatient[4],
|
||||
ImageOrientationPatient[5]
|
||||
);
|
||||
|
||||
const scanAxisNormal = vec3.cross(vec3.create(), rowCosineVec, colCosineVec);
|
||||
|
||||
const refIppVec = vec3.set(
|
||||
vec3.create(),
|
||||
referenceImagePositionPatient[0],
|
||||
referenceImagePositionPatient[1],
|
||||
referenceImagePositionPatient[2]
|
||||
);
|
||||
|
||||
const distanceInstancePairs = instances.map(instance => {
|
||||
const imagePositionPatient = instance.ImagePositionPatient;
|
||||
|
||||
const positionVector = vec3.create();
|
||||
|
||||
vec3.sub(
|
||||
positionVector,
|
||||
referenceImagePositionPatient,
|
||||
imagePositionPatient
|
||||
);
|
||||
|
||||
const distance = vec3.dot(positionVector, scanAxisNormal);
|
||||
|
||||
return {
|
||||
distance,
|
||||
instance,
|
||||
};
|
||||
});
|
||||
|
||||
distanceInstancePairs.sort((a, b) => b.distance - a.distance);
|
||||
|
||||
const sortedInstances = distanceInstancePairs.map(a => a.instance);
|
||||
|
||||
return sortedInstances;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
/**
|
||||
* Given the flatten index, and rows and column, it returns the
|
||||
* row and column index
|
||||
*/
|
||||
const unravelIndex = (index, numRows, numCols) => {
|
||||
const row = Math.floor(index / numCols);
|
||||
const col = index % numCols;
|
||||
return { row, col };
|
||||
};
|
||||
|
||||
export default unravelIndex;
|
||||
@@ -0,0 +1,13 @@
|
||||
// prettier-ignore
|
||||
// @ts-nocheck
|
||||
/**
|
||||
* Generates a unique id that has limited chance of collision
|
||||
*
|
||||
* @see {@link https://stackoverflow.com/a/2117523/1867984|StackOverflow: Source}
|
||||
* @returns a v4 compliant GUID
|
||||
*/
|
||||
export default function uuidv4(): string {
|
||||
return ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, c =>
|
||||
(c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user