Skip to content

[Feature]: Save additional metrics to SR report for all annotations #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Feature]: Save additional metrics to SR report for all annotations #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
165c52e
saving additional metrics to SR
abhijith-trenser Oct 28, 2025
cc8b84b
added buildContentSequence support for all tools
abhijith-trenser Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 19 additions & 32 deletions src/utilities/TID300/Bidirectional.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import TID300Measurement from "./TID300Measurement.js";
import unit2CodingValue from "./unit2CodingValue.js";
import buildContentSequence from "./buildContentSequence.js";

export default class Bidirectional extends TID300Measurement {
contentItem() {
Expand All @@ -23,6 +24,22 @@ export default class Bidirectional extends TID300Measurement {
use3DSpatialCoordinates
});

const longAxisContentSequence = buildContentSequence({
graphicType: "POLYLINE",
graphicData: longAxisGraphicData,
use3DSpatialCoordinates,
referencedSOPSequence: ReferencedSOPSequence,
referencedFrameOfReferenceUID: ReferencedFrameOfReferenceUID
});

const shortAxisContentSequence = buildContentSequence({
graphicType: "POLYLINE",
graphicData: shortAxisGraphicData,
use3DSpatialCoordinates,
referencedSOPSequence: ReferencedSOPSequence,
referencedFrameOfReferenceUID: ReferencedFrameOfReferenceUID
});

return this.getMeasurement([
{
RelationshipType: "CONTAINS",
Expand All @@ -36,22 +53,7 @@ export default class Bidirectional extends TID300Measurement {
MeasurementUnitsCodeSequence: unit2CodingValue(unit),
NumericValue: longAxisLength
},
ContentSequence: {
RelationshipType: "INFERRED FROM",
ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
GraphicType: "POLYLINE",
GraphicData: longAxisGraphicData,
ReferencedFrameOfReferenceUID: use3DSpatialCoordinates
? ReferencedFrameOfReferenceUID
: undefined,
ContentSequence: use3DSpatialCoordinates
? undefined
: {
RelationshipType: "SELECTED FROM",
ValueType: "IMAGE",
ReferencedSOPSequence
}
}
ContentSequence: longAxisContentSequence
},
{
RelationshipType: "CONTAINS",
Expand All @@ -65,22 +67,7 @@ export default class Bidirectional extends TID300Measurement {
MeasurementUnitsCodeSequence: unit2CodingValue(unit),
NumericValue: shortAxisLength
},
ContentSequence: {
RelationshipType: "INFERRED FROM",
ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
GraphicType: "POLYLINE",
GraphicData: shortAxisGraphicData,
ReferencedFrameOfReferenceUID: use3DSpatialCoordinates
? ReferencedFrameOfReferenceUID
: undefined,
ContentSequence: use3DSpatialCoordinates
? undefined
: {
RelationshipType: "SELECTED FROM",
ValueType: "IMAGE",
ReferencedSOPSequence
}
}
ContentSequence: shortAxisContentSequence
}
]);
}
Expand Down
26 changes: 10 additions & 16 deletions src/utilities/TID300/Calibration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import TID300Measurement from "./TID300Measurement.js";
import unit2CodingValue from "./unit2CodingValue.js";
import buildContentSequence from "./buildContentSequence.js";

export default class Calibration extends TID300Measurement {
contentItem() {
Expand All @@ -18,6 +19,14 @@ export default class Calibration extends TID300Measurement {
use3DSpatialCoordinates
});

const graphicContentSequence = buildContentSequence({
graphicType: "POLYLINE",
graphicData: GraphicData,
use3DSpatialCoordinates,
referencedSOPSequence: ReferencedSOPSequence,
referencedFrameOfReferenceUID: ReferencedFrameOfReferenceUID
});

return this.getMeasurement([
{
RelationshipType: "CONTAINS",
Expand All @@ -31,22 +40,7 @@ export default class Calibration extends TID300Measurement {
MeasurementUnitsCodeSequence: unit2CodingValue(unit),
NumericValue: distance
},
ContentSequence: {
RelationshipType: "INFERRED FROM",
ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
GraphicType: "POLYLINE",
GraphicData,
ReferencedFrameOfReferenceUID: use3DSpatialCoordinates
? ReferencedFrameOfReferenceUID
: undefined,
ContentSequence: use3DSpatialCoordinates
? undefined
: {
RelationshipType: "SELECTED FROM",
ValueType: "IMAGE",
ReferencedSOPSequence
}
}
ContentSequence: graphicContentSequence
}
]);
}
Expand Down
99 changes: 89 additions & 10 deletions src/utilities/TID300/Circle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import TID300Measurement from "./TID300Measurement.js";
import unit2CodingValue from "./unit2CodingValue.js";
import buildContentSequence from "./buildContentSequence.js";

export default class Circle extends TID300Measurement {
contentItem() {
Expand All @@ -11,6 +12,12 @@ export default class Circle extends TID300Measurement {
area,
areaUnit = "mm2",
unit = "mm",
max,
min,
mean,
stdDev,
radiusUnit,
modalityUnit,
ReferencedFrameOfReferenceUID
} = this.props;

Expand All @@ -23,7 +30,13 @@ export default class Circle extends TID300Measurement {
use3DSpatialCoordinates
});

// TODO: Add Mean and STDev value of (modality?) pixels
const graphicContentSequence = buildContentSequence({
graphicType: "CIRCLE",
graphicData: GraphicData,
use3DSpatialCoordinates,
referencedSOPSequence: ReferencedSOPSequence,
referencedFrameOfReferenceUID: ReferencedFrameOfReferenceUID
});

return this.getMeasurement([
{
Expand All @@ -38,14 +51,39 @@ export default class Circle extends TID300Measurement {
MeasurementUnitsCodeSequence: unit2CodingValue(unit),
NumericValue: perimeter
},
ContentSequence: graphicContentSequence
},
{
RelationshipType: "CONTAINS",
ValueType: "NUM",
ConceptNameCodeSequence: {
CodeValue: "131190003",
CodingSchemeDesignator: "SCT",
CodeMeaning: "Radius"
},
MeasuredValueSequence: {
MeasurementUnitsCodeSequence: unit2CodingValue(radiusUnit),
NumericValue: perimeter
},
ContentSequence: graphicContentSequence
},
{
RelationshipType: "CONTAINS",
ValueType: "NUM",
ConceptNameCodeSequence: {
CodeValue: "G-A166",
CodingSchemeDesignator: "SRT",
CodeMeaning: "Area" // TODO: Look this up from a Code Meaning dictionary
},
MeasuredValueSequence: {
MeasurementUnitsCodeSequence: unit2CodingValue(areaUnit),
NumericValue: area
},
ContentSequence: {
RelationshipType: "INFERRED FROM",
ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
GraphicType: "CIRCLE",
GraphicData,
ReferencedFrameOfReferenceUID: use3DSpatialCoordinates
? ReferencedFrameOfReferenceUID
: undefined,
ContentSequence: use3DSpatialCoordinates
? undefined
: {
Expand All @@ -56,17 +94,30 @@ export default class Circle extends TID300Measurement {
}
},
{
// TODO: This feels weird to repeat the GraphicData
RelationshipType: "CONTAINS",
ValueType: "NUM",
ConceptNameCodeSequence: {
CodeValue: "G-A166",
CodingSchemeDesignator: "SRT",
CodeMeaning: "Area" // TODO: Look this up from a Code Meaning dictionary
CodeValue: "56851009",
CodingSchemeDesignator: "SCT",
CodeMeaning: "Maximum"
},
MeasuredValueSequence: {
MeasurementUnitsCodeSequence: unit2CodingValue(areaUnit),
NumericValue: area
MeasurementUnitsCodeSequence: modalityUnit,
NumericValue: max
},
ContentSequence: graphicContentSequence
},
{
RelationshipType: "CONTAINS",
ValueType: "NUM",
ConceptNameCodeSequence: {
CodeValue: "255605001",
CodingSchemeDesignator: "SCT",
CodeMeaning: "Minimum"
},
MeasuredValueSequence: {
MeasurementUnitsCodeSequence: modalityUnit,
NumericValue: min
},
ContentSequence: {
RelationshipType: "INFERRED FROM",
Expand All @@ -81,6 +132,34 @@ export default class Circle extends TID300Measurement {
ReferencedSOPSequence
}
}
},
{
RelationshipType: "CONTAINS",
ValueType: "NUM",
ConceptNameCodeSequence: {
CodeValue: "373098007",
CodingSchemeDesignator: "SCT",
CodeMeaning: "Mean"
},
MeasuredValueSequence: {
MeasurementUnitsCodeSequence: modalityUnit,
NumericValue: mean
},
ContentSequence: graphicContentSequence
},
{
RelationshipType: "CONTAINS",
ValueType: "NUM",
ConceptNameCodeSequence: {
CodeValue: "386136009",
CodingSchemeDesignator: "SCT",
CodeMeaning: "Standard Deviation"
},
MeasuredValueSequence: {
MeasurementUnitsCodeSequence: modalityUnit,
NumericValue: stdDev
},
ContentSequence: graphicContentSequence
}
]);
}
Expand Down
26 changes: 10 additions & 16 deletions src/utilities/TID300/CobbAngle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import TID300Measurement from "./TID300Measurement.js";
import buildContentSequence from "./buildContentSequence.js";

export default class CobbAngle extends TID300Measurement {
contentItem() {
Expand All @@ -18,6 +19,14 @@ export default class CobbAngle extends TID300Measurement {
use3DSpatialCoordinates
});

const graphicContentSequence = buildContentSequence({
graphicType: "POLYLINE",
graphicData: GraphicData,
use3DSpatialCoordinates,
referencedSOPSequence: ReferencedSOPSequence,
referencedFrameOfReferenceUID: ReferencedFrameOfReferenceUID
});

return this.getMeasurement([
{
RelationshipType: "CONTAINS",
Expand All @@ -36,22 +45,7 @@ export default class CobbAngle extends TID300Measurement {
},
NumericValue: rAngle
},
ContentSequence: {
RelationshipType: "INFERRED FROM",
ValueType: use3DSpatialCoordinates ? "SCOORD3D" : "SCOORD",
GraphicType: "POLYLINE",
GraphicData,
ReferencedFrameOfReferenceUID: use3DSpatialCoordinates
? ReferencedFrameOfReferenceUID
: undefined,
ContentSequence: use3DSpatialCoordinates
? undefined
: {
RelationshipType: "SELECTED FROM",
ValueType: "IMAGE",
ReferencedSOPSequence
}
}
ContentSequence: graphicContentSequence
}
]);
}
Expand Down
Loading