feat(actions): simplify action corner api through the toolbarService (#5033)
This commit is contained in:
1 parent
f71b88e639
commit
7c15bb8901
246 files changed
+7930
-4270
No files matched your search
@@ -26,7 +26,7 @@ const Length = {
|
||||
|
||||
const isLocked = getIsLocked(annotationUID);
|
||||
const isVisible = getIsVisible(annotationUID);
|
||||
const colorString = config.style.getStyleProperty('color', { annotationUID });
|
||||
// const colorString = config.style.getStyleProperty('color', { annotationUID });
|
||||
|
||||
// color string is like 'rgb(255, 255, 255)' we need them to be in RGBA array [255, 255, 255, 255]
|
||||
// Todo: this should be in a utility
|
||||
|
||||
@@ -21,7 +21,7 @@ const LivewireContour = {
|
||||
*/
|
||||
toMeasurement: (
|
||||
csToolsEventDetail,
|
||||
DisplaySetService,
|
||||
displaySetService,
|
||||
CornerstoneViewportService,
|
||||
getValueTypeFromToolType,
|
||||
customizationService
|
||||
@@ -43,16 +43,16 @@ const LivewireContour = {
|
||||
}
|
||||
|
||||
const { SOPInstanceUID, SeriesInstanceUID, frameNumber, StudyInstanceUID } =
|
||||
getSOPInstanceAttributes(referencedImageId);
|
||||
getSOPInstanceAttributes(referencedImageId, displaySetService, annotation);
|
||||
|
||||
let displaySet;
|
||||
if (SOPInstanceUID) {
|
||||
displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(
|
||||
displaySet = displaySetService.getDisplaySetForSOPInstanceUID(
|
||||
SOPInstanceUID,
|
||||
SeriesInstanceUID
|
||||
);
|
||||
} else {
|
||||
displaySet = DisplaySetService.getDisplaySetsForSeries(SeriesInstanceUID);
|
||||
displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID);
|
||||
}
|
||||
|
||||
return {
|
||||
@@ -64,13 +64,14 @@ const LivewireContour = {
|
||||
metadata,
|
||||
frameNumber,
|
||||
referenceSeriesUID: SeriesInstanceUID,
|
||||
referencedImageId,
|
||||
referenceStudyUID: StudyInstanceUID,
|
||||
toolName: metadata.toolName,
|
||||
displaySetInstanceUID: displaySet.displaySetInstanceUID,
|
||||
label: data.label,
|
||||
isLocked,
|
||||
isVisible,
|
||||
displayText: getDisplayText(annotation, displaySet),
|
||||
displayText: getDisplayText(annotation, displaySet, displaySetService),
|
||||
data: data.cachedStats,
|
||||
type: getValueTypeFromToolType(toolName),
|
||||
getReport: () => getColumnValueReport(annotation, customizationService),
|
||||
@@ -122,20 +123,27 @@ function getColumnValueReport(annotation, customizationService) {
|
||||
*
|
||||
* @param {Object} annotation - The annotation object.
|
||||
* @param {Object} displaySet - The display set object.
|
||||
* @returns {string[]} - An array of display text.
|
||||
* @returns {object} - An object with primary and secondary text arrays.
|
||||
*/
|
||||
function getDisplayText(annotation, displaySet) {
|
||||
function getDisplayText(annotation, displaySet, displaySetService) {
|
||||
const { metadata, data } = annotation;
|
||||
|
||||
const displayText = {
|
||||
primary: [],
|
||||
secondary: [],
|
||||
};
|
||||
|
||||
if (!data.cachedStats || !data.cachedStats[`imageId:${metadata.referencedImageId}`]) {
|
||||
return [];
|
||||
return displayText;
|
||||
}
|
||||
|
||||
const { area, areaUnit } = data.cachedStats[`imageId:${metadata.referencedImageId}`];
|
||||
|
||||
const { SOPInstanceUID, frameNumber } = getSOPInstanceAttributes(metadata.referencedImageId);
|
||||
|
||||
const displayText = [];
|
||||
const { SOPInstanceUID, frameNumber } = getSOPInstanceAttributes(
|
||||
metadata.referencedImageId,
|
||||
displaySetService,
|
||||
annotation
|
||||
);
|
||||
|
||||
const instance = displaySet.instances.find(image => image.SOPInstanceUID === SOPInstanceUID);
|
||||
let InstanceNumber;
|
||||
@@ -152,21 +160,15 @@ function getDisplayText(annotation, displaySet) {
|
||||
seriesText = `S: ${SeriesNumber}${instanceText}${frameText}`;
|
||||
}
|
||||
|
||||
const texts = [];
|
||||
if (area) {
|
||||
const roundedArea = utils.roundNumber(area || 0, 2);
|
||||
texts.push(`${roundedArea} ${getDisplayUnit(areaUnit)}`);
|
||||
displayText.primary.push(`${roundedArea} ${getDisplayUnit(areaUnit)}`);
|
||||
}
|
||||
|
||||
if (seriesText) {
|
||||
texts.push(seriesText);
|
||||
displayText.secondary.push(seriesText);
|
||||
}
|
||||
|
||||
displayText.push({
|
||||
text: texts,
|
||||
series: seriesText,
|
||||
});
|
||||
|
||||
return displayText;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user