save/restore compatible

cornerstonejs · Mar 17, 2023 · e886971 · e886971
1 parent 331e044
commit e886971
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/packages/adapters/src/adapters/Cornerstone3D/EllipticalROI.ts b/packages/adapters/src/adapters/Cornerstone3D/EllipticalROI.ts
@@ -137,19 +137,27 @@ class EllipticalROI {
     static getTID300RepresentationArguments(tool, worldToImageCoords) {
         const { data, finding, findingSites, metadata } = tool;
         const { cachedStats = {}, handles } = data;
-
+        const rotation = data.initialRotation || 0;
         const { referencedImageId } = metadata;
 
         if (!referencedImageId) {
             throw new Error(
                 "EllipticalROI.getTID300RepresentationArguments: referencedImageId is not defined"
             );
         }
-
-        const top = worldToImageCoords(referencedImageId, handles.points[0]);
-        const bottom = worldToImageCoords(referencedImageId, handles.points[1]);
-        const left = worldToImageCoords(referencedImageId, handles.points[2]);
-        const right = worldToImageCoords(referencedImageId, handles.points[3]);
+        let top, bottom, left, right;
+        // this way when it's restored we can assume the initial rotation is 0.
+        if (rotation == 90 || rotation == 270) {
+            bottom = worldToImageCoords(referencedImageId, handles.points[2]);
+            top = worldToImageCoords(referencedImageId, handles.points[3]);
+            left = worldToImageCoords(referencedImageId, handles.points[0]);
+            right = worldToImageCoords(referencedImageId, handles.points[1]);
+        } else {
+            top = worldToImageCoords(referencedImageId, handles.points[0]);
+            bottom = worldToImageCoords(referencedImageId, handles.points[1]);
+            left = worldToImageCoords(referencedImageId, handles.points[2]);
+            right = worldToImageCoords(referencedImageId, handles.points[3]);
+        }
 
         // find the major axis and minor axis
         const topBottomLength = Math.abs(top[1] - bottom[1]);

diff --git a/packages/tools/src/tools/annotation/EllipticalROITool.ts b/packages/tools/src/tools/annotation/EllipticalROITool.ts
@@ -767,7 +767,9 @@ class EllipticalROITool extends AnnotationTool {
         viewport.worldToCanvas(p)
       ) as [Types.Point2, Types.Point2, Types.Point2, Types.Point2];
 
-      const rotation = Math.abs(viewport.getRotation() - data.initialRotation);
+      const rotation = Math.abs(
+        viewport.getRotation() - (data.initialRotation || 0)
+      );
       let canvasCorners;
 
       if (rotation == 90 || rotation == 270) {