* Add customization URL parameter
* fix: Preserve should be customizeable
* Update customizations docs
* fix: Overlay items on patient name
* Add customization test
* Fix resolve to absolute path
* fix: Warn on no data in load
* Remove unused customization stuff
* fix: PR comments
* Update stored parameters to only use an array for mulitples
* Remove requires ohif.* special call out
* Remove strict mode
* PR comments
* Document segmentation examples
* Add three examples as requested
* PR comments
* lock
* Remove old customizatoin export
* fix: Ordering issues on customization loads
* fix: Use correct default for dev builds app config
* Fixes for conflicts
* chore: restore pnpm-lock.yaml to match master
The lockfile diff was incidental peer-descriptor churn and carried no
functional dependency change. It tripped the CircleCI security-audit gate
(which only runs when pnpm-lock.yaml is in the PR diff), surfacing a
pre-existing critical `decompress` transitive vuln that also exists on
master. Restoring master's lockfile removes the audit trigger.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* fix(ci): restore json5 lockfile entry; ignore unfixable decompress GHSA
The previous commit restored pnpm-lock.yaml from master, which dropped the
json5@2.2.3 entry that platform/core legitimately depends on (JSONC parsing
for the customization feature). That broke `--frozen-lockfile` install
(ERR_PNPM_OUTDATED_LOCKFILE). This restores the correct lockfile.
Because the lockfile must change (json5), the CircleCI security-audit gate
runs and previously failed on a critical `decompress` <=4.2.1 zip-slip
advisory. This is a pre-existing transitive vuln (present on master too) with
no published patch — decompress's latest release is 4.2.1, so no version
bump/override can resolve it. It reaches the tree only via @itk-wasm/dam, a
build/data-asset extraction tool under @cornerstonejs/labelmap-interpolation.
Add GHSA-mp2f-45pm-3cg9 to the existing pnpm-workspace.yaml auditConfig
ignoreGhsas accepted-risk list, matching how the repo already exempts other
build-tooling advisories. `pnpm audit --audit-level high` now passes locally
(1 critical ignored, 0 high).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* test(e2e): fix visitStudy URL encoding that broke mpr2 study load
The visitStudy rewrite (added for the ?customization= option) built the URL
with new URLSearchParams({ StudyInstanceUIDs: studyInstanceUID }), which
percent-encodes the value. mpr2.spec.ts embeds an extra param in the UID
string ('<uid>&hangingprotocolid=mpr'), so the & and = were encoded and the
whole thing collapsed into one invalid StudyInstanceUIDs value -> the study
could not be found ('studies are not available'), the viewer never rendered,
and the side-panel-header-right click timed out.
Restore master's raw concatenation for StudyInstanceUIDs (so embedded params
survive as separate query params) while still appending the customization
option separately. Only mpr2 embeds & in the UID, matching the single failure.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* PR comments
---------
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
317 lines
9.2 KiB
TypeScript
317 lines
9.2 KiB
TypeScript
const colours = {
|
|
'viewport-0': 'rgb(200, 0, 0)',
|
|
'viewport-1': 'rgb(200, 200, 0)',
|
|
'viewport-2': 'rgb(0, 200, 0)',
|
|
};
|
|
|
|
const colorsByOrientation = {
|
|
axial: 'rgb(200, 0, 0)',
|
|
sagittal: 'rgb(200, 200, 0)',
|
|
coronal: 'rgb(0, 200, 0)',
|
|
};
|
|
|
|
function initDefaultToolGroup(extensionManager, toolGroupService, commandsManager, toolGroupId) {
|
|
const utilityModule = extensionManager.getModuleEntry(
|
|
'@ohif/extension-cornerstone.utilityModule.tools'
|
|
);
|
|
|
|
const { toolNames, Enums } = utilityModule.exports;
|
|
|
|
const tools = {
|
|
active: [
|
|
{
|
|
toolName: toolNames.WindowLevel,
|
|
bindings: [{ mouseButton: Enums.MouseBindings.Primary }],
|
|
},
|
|
{
|
|
toolName: toolNames.Pan,
|
|
bindings: [{ mouseButton: Enums.MouseBindings.Auxiliary }],
|
|
},
|
|
{
|
|
toolName: toolNames.Zoom,
|
|
bindings: [{ mouseButton: Enums.MouseBindings.Secondary }, { numTouchPoints: 2 }],
|
|
},
|
|
{
|
|
toolName: toolNames.StackScroll,
|
|
bindings: [{ mouseButton: Enums.MouseBindings.Wheel }, { numTouchPoints: 3 }],
|
|
},
|
|
],
|
|
passive: [
|
|
{ toolName: toolNames.Length },
|
|
{
|
|
toolName: toolNames.ArrowAnnotate,
|
|
configuration: {
|
|
getTextCallback: (callback, eventDetails) => {
|
|
commandsManager.runCommand('arrowTextCallback', {
|
|
callback,
|
|
eventDetails,
|
|
});
|
|
},
|
|
changeTextCallback: (data, eventDetails, callback) => {
|
|
commandsManager.runCommand('arrowTextCallback', {
|
|
callback,
|
|
data,
|
|
eventDetails,
|
|
});
|
|
},
|
|
},
|
|
},
|
|
{
|
|
toolName: toolNames.SegmentBidirectional,
|
|
},
|
|
{ toolName: toolNames.Bidirectional },
|
|
{ toolName: toolNames.DragProbe },
|
|
{ toolName: toolNames.Probe },
|
|
{ toolName: toolNames.EllipticalROI },
|
|
{ toolName: toolNames.CircleROI },
|
|
{ toolName: toolNames.RectangleROI },
|
|
{ toolName: toolNames.StackScroll },
|
|
{ toolName: toolNames.Angle },
|
|
{ toolName: toolNames.CobbAngle },
|
|
{ toolName: toolNames.Magnify },
|
|
{ toolName: toolNames.PlanarRotate },
|
|
{ toolName: toolNames.CalibrationLine },
|
|
{
|
|
toolName: toolNames.PlanarFreehandContourSegmentation,
|
|
configuration: {
|
|
displayOnePointAsCrosshairs: true,
|
|
},
|
|
},
|
|
{ toolName: toolNames.UltrasoundDirectional },
|
|
{ toolName: toolNames.PlanarFreehandROI },
|
|
{ toolName: toolNames.SplineROI },
|
|
{ toolName: toolNames.LivewireContour },
|
|
{ toolName: toolNames.WindowLevelRegion },
|
|
],
|
|
enabled: [
|
|
{ toolName: toolNames.ImageOverlayViewer },
|
|
{ toolName: toolNames.ReferenceLines },
|
|
],
|
|
disabled: [
|
|
{
|
|
toolName: toolNames.AdvancedMagnify,
|
|
},
|
|
],
|
|
};
|
|
|
|
const updatedTools = commandsManager.run('initializeSegmentLabelTool', { tools });
|
|
|
|
toolGroupService.createToolGroupAndAddTools(toolGroupId, updatedTools);
|
|
}
|
|
|
|
function initSRToolGroup(extensionManager, toolGroupService) {
|
|
const SRUtilityModule = extensionManager.getModuleEntry(
|
|
'@ohif/extension-cornerstone-dicom-sr.utilityModule.tools'
|
|
);
|
|
|
|
if (!SRUtilityModule) {
|
|
return;
|
|
}
|
|
|
|
const CS3DUtilityModule = extensionManager.getModuleEntry(
|
|
'@ohif/extension-cornerstone.utilityModule.tools'
|
|
);
|
|
|
|
const { toolNames: SRToolNames } = SRUtilityModule.exports;
|
|
const { toolNames, Enums } = CS3DUtilityModule.exports;
|
|
const tools = {
|
|
active: [
|
|
{
|
|
toolName: toolNames.WindowLevel,
|
|
bindings: [
|
|
{
|
|
mouseButton: Enums.MouseBindings.Primary,
|
|
},
|
|
],
|
|
},
|
|
{
|
|
toolName: toolNames.Pan,
|
|
bindings: [
|
|
{
|
|
mouseButton: Enums.MouseBindings.Auxiliary,
|
|
},
|
|
],
|
|
},
|
|
{
|
|
toolName: toolNames.Zoom,
|
|
bindings: [
|
|
{
|
|
mouseButton: Enums.MouseBindings.Secondary,
|
|
},
|
|
{ numTouchPoints: 2 },
|
|
],
|
|
},
|
|
{
|
|
toolName: toolNames.StackScroll,
|
|
bindings: [{ mouseButton: Enums.MouseBindings.Wheel }, { numTouchPoints: 3 }],
|
|
},
|
|
],
|
|
passive: [
|
|
{ toolName: SRToolNames.SRLength },
|
|
{ toolName: SRToolNames.SRArrowAnnotate },
|
|
{ toolName: SRToolNames.SRBidirectional },
|
|
{ toolName: SRToolNames.SREllipticalROI },
|
|
{ toolName: SRToolNames.SRCircleROI },
|
|
{ toolName: SRToolNames.SRPlanarFreehandROI },
|
|
{ toolName: SRToolNames.SRRectangleROI },
|
|
{ toolName: toolNames.WindowLevelRegion },
|
|
],
|
|
enabled: [
|
|
{
|
|
toolName: SRToolNames.DICOMSRDisplay,
|
|
},
|
|
],
|
|
// disabled
|
|
};
|
|
|
|
const toolGroupId = 'SRToolGroup';
|
|
toolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
|
|
}
|
|
|
|
function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
|
|
const utilityModule = extensionManager.getModuleEntry(
|
|
'@ohif/extension-cornerstone.utilityModule.tools'
|
|
);
|
|
|
|
const serviceManager = extensionManager._servicesManager;
|
|
const { cornerstoneViewportService } = serviceManager.services;
|
|
|
|
const { toolNames, Enums } = utilityModule.exports;
|
|
|
|
const tools = {
|
|
active: [
|
|
{
|
|
toolName: toolNames.WindowLevel,
|
|
bindings: [{ mouseButton: Enums.MouseBindings.Primary }],
|
|
},
|
|
{
|
|
toolName: toolNames.Pan,
|
|
bindings: [{ mouseButton: Enums.MouseBindings.Auxiliary }],
|
|
},
|
|
{
|
|
toolName: toolNames.Zoom,
|
|
bindings: [{ mouseButton: Enums.MouseBindings.Secondary }, { numTouchPoints: 2 }],
|
|
},
|
|
{
|
|
toolName: toolNames.StackScroll,
|
|
bindings: [{ mouseButton: Enums.MouseBindings.Wheel }, { numTouchPoints: 3 }],
|
|
},
|
|
],
|
|
passive: [
|
|
{ toolName: toolNames.Length },
|
|
{
|
|
toolName: toolNames.ArrowAnnotate,
|
|
configuration: {
|
|
getTextCallback: (callback, eventDetails) => {
|
|
commandsManager.runCommand('arrowTextCallback', {
|
|
callback,
|
|
eventDetails,
|
|
});
|
|
},
|
|
changeTextCallback: (data, eventDetails, callback) => {
|
|
commandsManager.runCommand('arrowTextCallback', {
|
|
callback,
|
|
data,
|
|
eventDetails,
|
|
});
|
|
},
|
|
},
|
|
},
|
|
{ toolName: toolNames.Bidirectional },
|
|
{ toolName: toolNames.DragProbe },
|
|
{ toolName: toolNames.Probe },
|
|
{ toolName: toolNames.EllipticalROI },
|
|
{ toolName: toolNames.CircleROI },
|
|
{ toolName: toolNames.RectangleROI },
|
|
{ toolName: toolNames.StackScroll },
|
|
{ toolName: toolNames.Angle },
|
|
{ toolName: toolNames.CobbAngle },
|
|
{ toolName: toolNames.PlanarFreehandROI },
|
|
{ toolName: toolNames.SplineROI },
|
|
{ toolName: toolNames.LivewireContour },
|
|
{ toolName: toolNames.WindowLevelRegion },
|
|
{
|
|
toolName: toolNames.PlanarFreehandContourSegmentation,
|
|
configuration: {
|
|
displayOnePointAsCrosshairs: true,
|
|
},
|
|
},
|
|
],
|
|
disabled: [
|
|
{
|
|
toolName: toolNames.Crosshairs,
|
|
bindings: [
|
|
{ mouseButton: Enums.MouseBindings.Primary, modifierKey: Enums.KeyboardBindings.Shift },
|
|
],
|
|
configuration: {
|
|
viewportIndicators: true,
|
|
viewportIndicatorsConfig: {
|
|
circleRadius: 5,
|
|
xOffset: 0.95,
|
|
yOffset: 0.05,
|
|
},
|
|
autoPan: {
|
|
enabled: false,
|
|
panSize: 10,
|
|
},
|
|
getReferenceLineColor: viewportId => {
|
|
const viewportInfo = cornerstoneViewportService.getViewportInfo(viewportId);
|
|
const viewportOptions = viewportInfo?.viewportOptions;
|
|
if (viewportOptions) {
|
|
return (
|
|
colours[viewportOptions.id] ||
|
|
colorsByOrientation[viewportOptions.orientation] ||
|
|
'#0c0'
|
|
);
|
|
} else {
|
|
console.warn('missing viewport?', viewportId);
|
|
return '#0c0';
|
|
}
|
|
},
|
|
},
|
|
},
|
|
{
|
|
toolName: toolNames.AdvancedMagnify,
|
|
},
|
|
{ toolName: toolNames.ReferenceLines },
|
|
],
|
|
};
|
|
|
|
toolGroupService.createToolGroupAndAddTools('mpr', tools);
|
|
}
|
|
function initVolume3DToolGroup(extensionManager, toolGroupService) {
|
|
const utilityModule = extensionManager.getModuleEntry(
|
|
'@ohif/extension-cornerstone.utilityModule.tools'
|
|
);
|
|
|
|
const { toolNames, Enums } = utilityModule.exports;
|
|
|
|
const tools = {
|
|
active: [
|
|
{
|
|
toolName: toolNames.TrackballRotateTool,
|
|
bindings: [{ mouseButton: Enums.MouseBindings.Primary }],
|
|
},
|
|
{
|
|
toolName: toolNames.Zoom,
|
|
bindings: [{ mouseButton: Enums.MouseBindings.Secondary }, { numTouchPoints: 2 }],
|
|
},
|
|
{
|
|
toolName: toolNames.Pan,
|
|
bindings: [{ mouseButton: Enums.MouseBindings.Auxiliary }, { numTouchPoints: 3 }],
|
|
},
|
|
],
|
|
};
|
|
|
|
toolGroupService.createToolGroupAndAddTools('volume3d', tools);
|
|
}
|
|
|
|
function initToolGroups(extensionManager, toolGroupService, commandsManager) {
|
|
initDefaultToolGroup(extensionManager, toolGroupService, commandsManager, 'default');
|
|
initSRToolGroup(extensionManager, toolGroupService);
|
|
initMPRToolGroup(extensionManager, toolGroupService, commandsManager);
|
|
initVolume3DToolGroup(extensionManager, toolGroupService);
|
|
}
|
|
|
|
export default initToolGroups;
|