ross/dv3d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve export schema

Browse Source
This commit is contained in:
Ross
2025-06-01 22:17:41 +01:00
parent 313c7a9e9a
commit 1fd3020f0c
1 changed files with 114 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dicom-viewer/src/App.tsx
+59 -66
View File
@@ -1073,66 +1073,74 @@ function App() {
} }
useEffect(() => { useEffect(() => {
// Export the current viewer state as JSON // Export the current viewer state as JSON
window.exportViewerState = () => { window.exportViewerState = () => {
const numActive = viewportGrid.rows * viewportGrid.cols; const numActive = viewportGrid.rows * viewportGrid.cols;
const activeViewportModes = viewportModes.slice(0, numActive); const modes = viewportModes.slice(0, numActive);
const activeSelectedStackIdx = selectedStackIdx.slice(0, numActive); const stackIdx = selectedStackIdx.slice(0, numActive);
const activeAvailableStacks = availableStacks; const stacks = availableStacks.map(s => ({
const activeViewportImageIds = viewportImageIds.slice(0, numActive); i: s.imageIds, // imageIds
u: s.studyInstanceUID // studyInstanceUID
}));
// Collect viewport properties, stack positions, and camera for active viewports // Only keep minimal properties
const renderingEngine = renderingEngineRef.current; const renderingEngine = renderingEngineRef.current;
const viewportProperties: any[] = []; const props: any[] = [];
const stackPositions: number[] = []; const stackPos: number[] = [];
const cameraProperties: any[] = []; const cam: any[] = [];
for (let i = 0; i < numActive; i++) { for (let i = 0; i < numActive; i++) {
let props = null; let p = null, s = null, c = null;
let stackPos = null;
let camera = null;
if (renderingEngine) { if (renderingEngine) {
const viewportId = `CT_${i}`; const viewportId = `CT_${i}`;
const viewport = renderingEngine.getViewport(viewportId); const viewport = renderingEngine.getViewport(viewportId);
if (viewport) { if (viewport) {
if (typeof viewport.getProperties === "function") { if (typeof viewport.getProperties === "function") {
props = viewport.getProperties(); const { voiRange, invert, interpolationType, VOILUTFunction, colormap } = viewport.getProperties();
p = { voiRange, invert, interpolationType, VOILUTFunction, colormap };
} }
if (typeof viewport.getCurrentImageIdIndex === "function") { if (typeof viewport.getCurrentImageIdIndex === "function") {
stackPos = viewport.getCurrentImageIdIndex(); s = viewport.getCurrentImageIdIndex();
} }
if (typeof viewport.getCamera === "function") { if (typeof viewport.getCamera === "function") {
camera = viewport.getCamera(); c = viewport.getCamera();
} }
} }
} }
viewportProperties.push(props); props.push(p);
stackPositions.push(stackPos); stackPos.push(s);
cameraProperties.push(camera); cam.push(c);
} }
// Use short keys for compactness
const state = { const state = {
viewportGrid, grid: viewportGrid,
viewportModes: activeViewportModes, modes,
selectedStackIdx: activeSelectedStackIdx, stacks,
availableStacks: activeAvailableStacks, stackIdx,
viewportImageIds: activeViewportImageIds, stackPos,
viewportProperties, props,
stackPositions, cam,
cameraProperties,
};
return JSON.stringify(state, null, 2);
}; };
return JSON.stringify(state);
};
window.importViewerState = (json: string) => { // Import and restore a viewer state from JSON (using stack indices)
window.importViewerState = (json: string) => {
try { try {
console.log("Importing viewer state:", json);
restoringStateRef.current = true; restoringStateRef.current = true;
const state = typeof json === "string" ? JSON.parse(json) : json; const state = typeof json === "string" ? JSON.parse(json) : json;
if (state.viewportGrid) setViewportGrid(state.viewportGrid); if (state.grid) setViewportGrid(state.grid);
if (state.viewportModes) setViewportModes(state.viewportModes); if (state.modes) setViewportModes(state.modes);
if (state.selectedStackIdx) setSelectedStackIdx(state.selectedStackIdx); if (state.stacks) setAvailableStacks(state.stacks.map((s: any) => ({
if (state.availableStacks) setAvailableStacks(state.availableStacks); imageIds: s.i,
if (state.viewportImageIds) setViewportImageIds(state.viewportImageIds); studyInstanceUID: s.u,
})));
if (state.stackIdx && state.stacks) {
const reconstructed = state.stackIdx.map(
(idx: number) => state.stacks[idx]?.i || []
);
setViewportImageIds(reconstructed);
setSelectedStackIdx(state.stackIdx);
}
setTimeout(() => { setTimeout(() => {
const renderingEngine = renderingEngineRef.current; const renderingEngine = renderingEngineRef.current;
@@ -1140,67 +1148,52 @@ function App() {
restoringStateRef.current = false; restoringStateRef.current = false;
return; return;
} }
const numActive = state.viewportGrid?.rows * state.viewportGrid?.cols || 1; const numActive = state.grid?.rows * state.grid?.cols || 1;
for (let i = 0; i < numActive; i++) { for (let i = 0; i < numActive; i++) {
const viewportId = `CT_${i}`; const viewportId = `CT_${i}`;
const viewport = renderingEngine.getViewport(viewportId); const viewport = renderingEngine.getViewport(viewportId);
if (!viewport) continue; if (!viewport) continue;
// Restore stack position (scroll) // Restore stack position
if ( if (
state.stackPositions && state.stackPos &&
typeof state.stackPositions[i] === "number" && typeof state.stackPos[i] === "number" &&
typeof viewport.setImageIdIndex === "function" typeof viewport.setImageIdIndex === "function"
) { ) {
if (csUtilities && csUtilities.jumpToSlice) { if (csUtilities && csUtilities.jumpToSlice) {
csUtilities.jumpToSlice(viewport.element, { imageIndex: state.stackPositions[i] }); csUtilities.jumpToSlice(viewport.element, { imageIndex: state.stackPos[i] });
} else { } else {
viewport.setImageIdIndex(state.stackPositions[i]); viewport.setImageIdIndex(state.stackPos[i]);
} }
} }
// Restore viewport properties (VOI, invert, etc.) // Restore properties
if ( if (
state.viewportProperties && state.props &&
state.viewportProperties[i] && state.props[i] &&
typeof viewport.setProperties === "function" typeof viewport.setProperties === "function"
) { ) {
const props = state.viewportProperties[i]; viewport.setProperties(state.props[i]);
const { voiRange, invert, interpolationType, VOILUTFunction, colormap } = props;
const propsToRestore: any = {};
if (voiRange && voiRange.lower !== undefined && voiRange.upper !== undefined) propsToRestore.voiRange = voiRange;
if (invert !== undefined) propsToRestore.invert = invert;
if (interpolationType !== undefined) propsToRestore.interpolationType = interpolationType;
if (VOILUTFunction) propsToRestore.VOILUTFunction = VOILUTFunction;
if (
colormap !== undefined &&
colormap !== null &&
(typeof colormap === "string" || (typeof colormap === "object" && !("actor" in colormap)))
) {
propsToRestore.colormap = colormap;
}
viewport.setProperties(propsToRestore);
viewport.render(); viewport.render();
} }
// Restore camera properties (zoom, pan, orientation) // Restore camera
if ( if (
state.cameraProperties && state.cam &&
state.cameraProperties[i] && state.cam[i] &&
typeof viewport.setCamera === "function" typeof viewport.setCamera === "function"
) { ) {
viewport.setCamera(state.cameraProperties[i]); viewport.setCamera(state.cam[i]);
viewport.render(); viewport.render();
} }
} }
restoringStateRef.current = false; restoringStateRef.current = false;
console.log("Viewer state restored successfully");
}, 300); }, 300);
} catch (e) { } catch (e) {
restoringStateRef.current = false; restoringStateRef.current = false;
alert("Failed to import viewer state: " + e); alert("Failed to import viewer state: " + e);
} }
}; };
// Export all annotations using cornerstoneTools.annotation.state.getAllAnnotations() // Export all annotations using cornerstoneTools.annotation.state.getAllAnnotations()
window.exportAnnotations = () => { window.exportAnnotations = () => {