othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(measurement label auto-completion): Customization of measurement label auto-completion fails for measurements following arrow annotations. (#4739)

Browse Source
This commit is contained in:
arul-trenser 2025-02-03 21:01:41 +05:30 committed by GitHub
parent 43aa20c372
commit e035ef1dcc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 73 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
extensions/default/src/utils/promptLabelAnnotation.js
View File

@ -1,32 +1,42 @@
import { showLabelAnnotationPopup } from './callInputDialog'; import { showLabelAnnotationPopup } from './callInputDialog';
function promptLabelAnnotation({ servicesManager }, ctx, evt) { function promptLabelAnnotation({ servicesManager }, ctx, evt) {
const { measurementService, customizationService } = servicesManager.services; const { measurementService, customizationService, toolGroupService } = servicesManager.services;
const { viewportId, StudyInstanceUID, SeriesInstanceUID, measurementId } = evt; const { viewportId, StudyInstanceUID, SeriesInstanceUID, measurementId, toolName } = evt;
return new Promise(async function (resolve) { return new Promise(async function (resolve) {
const labelConfig = customizationService.getCustomization('measurementLabels'); const toolGroup = toolGroupService.getToolGroupForViewport(viewportId);
const renderContent = customizationService.getCustomization('ui.labellingComponent'); const activeToolOptions = toolGroup.getToolConfiguration(toolName);
const measurement = measurementService.getMeasurement(measurementId); if(activeToolOptions.getTextCallback) {
const value = await showLabelAnnotationPopup( resolve({
measurement, StudyInstanceUID,
servicesManager.services.uiDialogService, SeriesInstanceUID,
labelConfig, viewportId,
renderContent })
); } else {
const labelConfig = customizationService.getCustomization('measurementLabels');
const measurement = measurementService.getMeasurement(measurementId);
const renderContent = customizationService.getCustomization('ui.labellingComponent');
const value = await showLabelAnnotationPopup(
measurement,
servicesManager.services.uiDialogService,
labelConfig,
renderContent
);
measurementService.update( measurementService.update(
measurementId, measurementId,
{ {
...value, ...value,
}, },
true true
); );
resolve({ resolve({
StudyInstanceUID, StudyInstanceUID,
SeriesInstanceUID, SeriesInstanceUID,
viewportId, viewportId,
}); });
}
}); });
} }

2
extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.tsx
View File

@ -150,6 +150,7 @@ function TrackedCornerstoneViewport(
referenceStudyUID: StudyInstanceUID, referenceStudyUID: StudyInstanceUID,
referenceSeriesUID: SeriesInstanceUID, referenceSeriesUID: SeriesInstanceUID,
uid: measurementId, uid: measurementId,
toolName,
} = measurement; } = measurement;
sendTrackedMeasurementsEvent('SET_DIRTY', { SeriesInstanceUID }); sendTrackedMeasurementsEvent('SET_DIRTY', { SeriesInstanceUID });
@ -158,6 +159,7 @@ function TrackedCornerstoneViewport(
StudyInstanceUID, StudyInstanceUID,
SeriesInstanceUID, SeriesInstanceUID,
measurementId, measurementId,
toolName,
}); });
} }
}).unsubscribe }).unsubscribe

2
modes/longitudinal/src/index.ts
View File

@ -89,7 +89,7 @@ function modeFactory({ modeConfiguration }) {
measurementService.clearMeasurements(); measurementService.clearMeasurements();
// Init Default and SR ToolGroups // Init Default and SR ToolGroups
initToolGroups(extensionManager, toolGroupService, commandsManager, this.labelConfig); initToolGroups(extensionManager, toolGroupService, commandsManager);
toolbarService.addButtons([...toolbarButtons, ...moreTools]); toolbarService.addButtons([...toolbarButtons, ...moreTools]);
toolbarService.createButtonSection('primary', [ toolbarService.createButtonSection('primary', [

62
modes/longitudinal/src/initToolGroups.js
View File

@ -16,8 +16,7 @@ function initDefaultToolGroup(
extensionManager, extensionManager,
toolGroupService, toolGroupService,
commandsManager, commandsManager,
toolGroupId, toolGroupId
modeLabelConfig
) { ) {
const utilityModule = extensionManager.getModuleEntry( const utilityModule = extensionManager.getModuleEntry(
'@ohif/extension-cornerstone.utilityModule.tools' '@ohif/extension-cornerstone.utilityModule.tools'
@ -50,23 +49,17 @@ function initDefaultToolGroup(
toolName: toolNames.ArrowAnnotate, toolName: toolNames.ArrowAnnotate,
configuration: { configuration: {
getTextCallback: (callback, eventDetails) => { getTextCallback: (callback, eventDetails) => {
if (modeLabelConfig) { commandsManager.runCommand('arrowTextCallback', {
callback(' '); callback,
} else { eventDetails,
commandsManager.runCommand('arrowTextCallback', { });
callback,
eventDetails,
});
}
}, },
changeTextCallback: (data, eventDetails, callback) => { changeTextCallback: (data, eventDetails, callback) => {
if (modeLabelConfig === undefined) { commandsManager.runCommand('arrowTextCallback', {
commandsManager.runCommand('arrowTextCallback', { callback,
callback, data,
data, eventDetails,
eventDetails, });
});
}
}, },
}, },
}, },
@ -178,7 +171,7 @@ function initSRToolGroup(extensionManager, toolGroupService) {
toolGroupService.createToolGroupAndAddTools(toolGroupId, tools); toolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
} }
function initMPRToolGroup(extensionManager, toolGroupService, commandsManager, modeLabelConfig) { function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
const utilityModule = extensionManager.getModuleEntry( const utilityModule = extensionManager.getModuleEntry(
'@ohif/extension-cornerstone.utilityModule.tools' '@ohif/extension-cornerstone.utilityModule.tools'
); );
@ -213,23 +206,17 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager, m
toolName: toolNames.ArrowAnnotate, toolName: toolNames.ArrowAnnotate,
configuration: { configuration: {
getTextCallback: (callback, eventDetails) => { getTextCallback: (callback, eventDetails) => {
if (modeLabelConfig) { commandsManager.runCommand('arrowTextCallback', {
callback(''); callback,
} else { eventDetails,
commandsManager.runCommand('arrowTextCallback', { });
callback,
eventDetails,
});
}
}, },
changeTextCallback: (data, eventDetails, callback) => { changeTextCallback: (data, eventDetails, callback) => {
if (modeLabelConfig === undefined) { commandsManager.runCommand('arrowTextCallback', {
commandsManager.runCommand('arrowTextCallback', { callback,
callback, data,
data, eventDetails,
eventDetails, });
});
}
}, },
}, },
}, },
@ -320,16 +307,15 @@ function initVolume3DToolGroup(extensionManager, toolGroupService) {
toolGroupService.createToolGroupAndAddTools('volume3d', tools); toolGroupService.createToolGroupAndAddTools('volume3d', tools);
} }
function initToolGroups(extensionManager, toolGroupService, commandsManager, modeLabelConfig) { function initToolGroups(extensionManager, toolGroupService, commandsManager) {
initDefaultToolGroup( initDefaultToolGroup(
extensionManager, extensionManager,
toolGroupService, toolGroupService,
commandsManager, commandsManager,
'default', 'default'
modeLabelConfig
); );
initSRToolGroup(extensionManager, toolGroupService, commandsManager); initSRToolGroup(extensionManager, toolGroupService);
initMPRToolGroup(extensionManager, toolGroupService, commandsManager, modeLabelConfig); initMPRToolGroup(extensionManager, toolGroupService, commandsManager);
initVolume3DToolGroup(extensionManager, toolGroupService); initVolume3DToolGroup(extensionManager, toolGroupService);
} }

2
modes/tmtv/src/index.ts
View File

@ -61,7 +61,7 @@ function modeFactory({ modeConfiguration }) {
const { toolNames, Enums } = utilityModule.exports; const { toolNames, Enums } = utilityModule.exports;
// Init Default and SR ToolGroups // Init Default and SR ToolGroups
initToolGroups(toolNames, Enums, toolGroupService, commandsManager, null, servicesManager); initToolGroups(toolNames, Enums, toolGroupService, commandsManager);
const { unsubscribe } = toolGroupService.subscribe( const { unsubscribe } = toolGroupService.subscribe(
toolGroupService.EVENTS.VIEWPORT_ADDED, toolGroupService.EVENTS.VIEWPORT_ADDED,

30
modes/tmtv/src/initToolGroups.js
View File

@ -6,7 +6,7 @@ export const toolGroupIds = {
default: 'default', default: 'default',
}; };
function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager, modeLabelConfig) { function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager) {
const tools = { const tools = {
active: [ active: [
{ {
@ -32,23 +32,17 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager, mo
toolName: toolNames.ArrowAnnotate, toolName: toolNames.ArrowAnnotate,
configuration: { configuration: {
getTextCallback: (callback, eventDetails) => { getTextCallback: (callback, eventDetails) => {
if (modeLabelConfig) { commandsManager.runCommand('arrowTextCallback', {
callback(' '); callback,
} else { eventDetails,
commandsManager.runCommand('arrowTextCallback', { });
callback,
eventDetails,
});
}
}, },
changeTextCallback: (data, eventDetails, callback) => { changeTextCallback: (data, eventDetails, callback) => {
if (modeLabelConfig === undefined) { commandsManager.runCommand('arrowTextCallback', {
commandsManager.runCommand('arrowTextCallback', { callback,
callback, data,
data, eventDetails,
eventDetails, });
});
}
}, },
}, },
}, },
@ -180,8 +174,8 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager, mo
toolGroupService.createToolGroupAndAddTools(toolGroupIds.MIP, mipTools); toolGroupService.createToolGroupAndAddTools(toolGroupIds.MIP, mipTools);
} }
function initToolGroups(toolNames, Enums, toolGroupService, commandsManager, modeLabelConfig) { function initToolGroups(toolNames, Enums, toolGroupService, commandsManager) {
_initToolGroups(toolNames, Enums, toolGroupService, commandsManager, modeLabelConfig); _initToolGroups(toolNames, Enums, toolGroupService, commandsManager);
} }
export default initToolGroups; export default initToolGroups;