@cornerstonejs/adapters 1.68.0 → 1.68.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4725,7 +4725,8 @@ var PlanarFreehandROI = /** @class */ (function () {
4725
4725
  function PlanarFreehandROI() {
4726
4726
  }
4727
4727
  PlanarFreehandROI.getMeasurementData = function (MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
4728
- var _a = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, PlanarFreehandROI.toolType), defaultState = _a.defaultState, SCOORDGroup = _a.SCOORDGroup, ReferencedFrameNumber = _a.ReferencedFrameNumber;
4728
+ var _a;
4729
+ var _b = MeasurementReport.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, PlanarFreehandROI.toolType), defaultState = _b.defaultState, NUMGroup = _b.NUMGroup, SCOORDGroup = _b.SCOORDGroup, ReferencedFrameNumber = _b.ReferencedFrameNumber;
4729
4730
  var referencedImageId = defaultState.annotation.metadata.referencedImageId;
4730
4731
  var GraphicData = SCOORDGroup.GraphicData;
4731
4732
  var worldCoords = [];
@@ -4749,8 +4750,7 @@ var PlanarFreehandROI = /** @class */ (function () {
4749
4750
  }
4750
4751
  var state = defaultState;
4751
4752
  state.annotation.data = {
4752
- polyline: worldCoords,
4753
- isOpenContour: isOpenContour,
4753
+ contour: { polyline: worldCoords, closed: !isOpenContour },
4754
4754
  handles: {
4755
4755
  points: points,
4756
4756
  activeHandleIndex: null,
@@ -4758,13 +4758,21 @@ var PlanarFreehandROI = /** @class */ (function () {
4758
4758
  hasMoved: false
4759
4759
  }
4760
4760
  },
4761
+ cachedStats: (_a = {},
4762
+ _a["imageId:".concat(referencedImageId)] = {
4763
+ area: NUMGroup
4764
+ ? NUMGroup.MeasuredValueSequence.NumericValue
4765
+ : null
4766
+ },
4767
+ _a),
4761
4768
  frameNumber: ReferencedFrameNumber
4762
4769
  };
4763
4770
  return state;
4764
4771
  };
4765
4772
  PlanarFreehandROI.getTID300RepresentationArguments = function (tool, worldToImageCoords) {
4766
4773
  var data = tool.data, finding = tool.finding, findingSites = tool.findingSites, metadata = tool.metadata;
4767
- var isOpenContour = data.isOpenContour, polyline = data.polyline;
4774
+ var _a = data.contour, polyline = _a.polyline, closed = _a.closed;
4775
+ var isOpenContour = closed !== true;
4768
4776
  var referencedImageId = metadata.referencedImageId;
4769
4777
  if (!referencedImageId) {
4770
4778
  throw new Error("PlanarFreehandROI.getTID300RepresentationArguments: referencedImageId is not defined");
@@ -4778,12 +4786,18 @@ var PlanarFreehandROI = /** @class */ (function () {
4778
4786
  // Explicitly expand to avoid ciruclar references.
4779
4787
  points.push([firstPoint[0], firstPoint[1]]);
4780
4788
  }
4781
- var area = 0; // TODO -> The tool doesn't have these stats yet.
4782
- var perimeter = 0;
4789
+ var _b = data.cachedStats["imageId:".concat(referencedImageId)] || {}, area = _b.area, areaUnit = _b.areaUnit, modalityUnit = _b.modalityUnit, perimeter = _b.perimeter, mean = _b.mean, max = _b.max, stdDev = _b.stdDev;
4783
4790
  return {
4791
+ /** From cachedStats */
4784
4792
  points: points,
4785
4793
  area: area,
4794
+ areaUnit: areaUnit,
4786
4795
  perimeter: perimeter,
4796
+ modalityUnit: modalityUnit,
4797
+ mean: mean,
4798
+ max: max,
4799
+ stdDev: stdDev,
4800
+ /** Other */
4787
4801
  trackingIdentifierTextValue: trackingIdentifierTextValue$2,
4788
4802
  finding: finding,
4789
4803
  findingSites: findingSites || []