# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1605190581 -3600
# Node ID 4e14735e98f83cf3d8d9b7924e46e99dd5c3f377
# Parent  bc7bd8ee13f8dc9218aa407258ee75f2b8c5a0df
preparing to remove FrameExtent

diff -r bc7bd8ee13f8 -r 4e14735e98f8 Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp
--- a/Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp	Tue Nov 10 21:07:05 2020 +0100
+++ b/Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp	Thu Nov 12 15:16:21 2020 +0100
@@ -826,6 +826,69 @@
 
 
 
+// Coordinates of the clipped line for "instance1" (out)
+static bool GetReferenceLineCoordinates(double& x1,
+                                        double& y1,
+                                        double& x2,
+                                        double& y2,
+                                        const OrthancStone::DicomInstanceParameters& instance1,
+                                        unsigned int frame1,
+                                        const OrthancStone::DicomInstanceParameters& instance2,
+                                        unsigned int frame2)
+{
+  if (instance1.GetWidth() == 0 &&
+      instance1.GetHeight() == 0)
+  {
+    return false;
+  }
+  else
+  {
+    /**
+     * Compute the 2D extent of the "instance1", expressed in
+     * centimeters, in the 2D plane defined by this DICOM instance.
+     *
+     * In a multiframe image (cf. "ExtractFrameOffsets()"), the plane of
+     * each frame is a translation of the plane of the first frame along
+     * its normal. As a consequence, the extent is the same for each
+     * frame, so we can ignore the frame number.
+     **/
+    OrthancStone::Extent2D extent;
+
+    double ox = -instance1.GetPixelSpacingX() / 2.0;
+    double oy = -instance1.GetPixelSpacingY() / 2.0;
+    extent.AddPoint(ox, oy);
+    extent.AddPoint(ox + instance1.GetPixelSpacingX() * static_cast<double>(instance1.GetWidth()),
+                    oy + instance1.GetPixelSpacingY() * static_cast<double>(instance1.GetHeight()));
+
+    const OrthancStone::CoordinateSystem3D c1 = instance1.GetFrameGeometry(frame1);
+    const OrthancStone::CoordinateSystem3D c2 = instance2.GetFrameGeometry(frame2);
+  
+    OrthancStone::Vector direction, origin;
+  
+    if (!extent.IsEmpty() &&
+        instance1.GetFrameOfReferenceUid() == instance1.GetFrameOfReferenceUid() &&
+        OrthancStone::GeometryToolbox::IntersectTwoPlanes(origin, direction,
+                                                          c1.GetOrigin(), c1.GetNormal(),
+                                                          c2.GetOrigin(), c2.GetNormal()))
+    {
+      double ax, ay, bx, by;
+      c1.ProjectPoint(ax, ay, origin);
+      c1.ProjectPoint(bx, by, origin + 100.0 * direction);
+    
+      return OrthancStone::GeometryToolbox::ClipLineToRectangle(
+        x1, y1, x2, y2,
+        ax, ay, bx, by,
+        extent.GetX1(), extent.GetY1(), extent.GetX2(), extent.GetY2());
+    }
+    else
+    {
+      return false;
+    }
+  }
+}
+
+
+
 class FrameExtent
 {
 private:
diff -r bc7bd8ee13f8 -r 4e14735e98f8 OrthancStone/Sources/Toolbox/DicomInstanceParameters.cpp
--- a/OrthancStone/Sources/Toolbox/DicomInstanceParameters.cpp	Tue Nov 10 21:07:05 2020 +0100
+++ b/OrthancStone/Sources/Toolbox/DicomInstanceParameters.cpp	Thu Nov 12 15:16:21 2020 +0100
@@ -202,6 +202,12 @@
     hasIndexInSeries_ = (
       dicom.ParseUnsignedInteger32(indexInSeries_, Orthanc::DICOM_TAG_INSTANCE_NUMBER) ||
       dicom.ParseUnsignedInteger32(indexInSeries_, Orthanc::DICOM_TAG_IMAGE_INDEX));
+
+    if (!dicom.LookupStringValue(
+          frameOfReferenceUid_, Orthanc::DICOM_TAG_FRAME_OF_REFERENCE_UID, false))
+    {
+      frameOfReferenceUid_.clear();
+    }
   }
 
 
diff -r bc7bd8ee13f8 -r 4e14735e98f8 OrthancStone/Sources/Toolbox/DicomInstanceParameters.h
--- a/OrthancStone/Sources/Toolbox/DicomInstanceParameters.h	Tue Nov 10 21:07:05 2020 +0100
+++ b/OrthancStone/Sources/Toolbox/DicomInstanceParameters.h	Thu Nov 12 15:16:21 2020 +0100
@@ -62,6 +62,7 @@
       unsigned int        indexInSeries_;
       std::string         doseUnits_;
       double              doseGridScaling_;
+      std::string         frameOfReferenceUid_;
 
       explicit Data(const Orthanc::DicomMap& dicom);
     };
@@ -224,5 +225,10 @@
 
     // Required for RT-DOSE
     bool ComputeRegularSpacing(double& target) const;
+
+    const std::string& GetFrameOfReferenceUid() const
+    {
+      return data_.frameOfReferenceUid_;
+    }
   };
 }