Mercurial > hg > orthanc-stone

changeset 1985:bb307007f8e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved interaction with rectangle probes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 31 Oct 2022 15:01:09 +0100
parents 187a261d7ae2
children e29783c92419
files OrthancStone/Sources/Scene2D/AnnotationsSceneLayer.cpp
diffstat 1 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancStone/Sources/Scene2D/AnnotationsSceneLayer.cpp	Mon Oct 31 14:42:46 2022 +0100
+++ b/OrthancStone/Sources/Scene2D/AnnotationsSceneLayer.cpp	Mon Oct 31 15:01:09 2022 +0100
@@ -1674,7 +1674,10 @@
         const double x1 = segment1_.GetPosition1().GetX();
         const double y1 = segment1_.GetPosition1().GetY();
         const double x2 = segment1_.GetPosition2().GetX();
-        const double y2 = handle2_.GetCenter().GetY();
+
+        const double y2 = y1 + handle2_.GetCenter().GetY() - handle1_.GetCenter().GetY();
+        //const double y2 = handle2_.GetCenter().GetY();
+
         handle1_.SetCenter(x1, y1);
         handle2_.SetCenter(x2, y2);
         segment2_.SetPosition(x2, y1, x2, y2);
@@ -1683,10 +1686,13 @@
       }
       else if (&primitive == &segment2_)
       {
-        const double x1 = handle1_.GetCenter().GetX();
         const double y1 = segment2_.GetPosition1().GetY();
         const double x2 = segment2_.GetPosition2().GetX();
         const double y2 = segment2_.GetPosition2().GetY();
+
+        const double x1 = x2 + handle1_.GetCenter().GetX() - handle2_.GetCenter().GetX();
+        //const double x1 = handle1_.GetCenter().GetX();
+
         handle1_.SetCenter(x1, y1);
         handle2_.SetCenter(x2, y2);
         segment1_.SetPosition(x1, y1, x2, y1);
@@ -1696,9 +1702,12 @@
       else if (&primitive == &segment3_)
       {
         const double x1 = segment3_.GetPosition2().GetX();
-        const double y1 = handle1_.GetCenter().GetY();
         const double x2 = segment3_.GetPosition1().GetX();
         const double y2 = segment3_.GetPosition2().GetY();
+
+        const double y1 = y2 + handle1_.GetCenter().GetY() - handle2_.GetCenter().GetY();
+        //const double y1 = handle1_.GetCenter().GetY();
+
         handle1_.SetCenter(x1, y1);
         handle2_.SetCenter(x2, y2);
         segment1_.SetPosition(x1, y1, x2, y1);
@@ -1709,8 +1718,11 @@
       {
         const double x1 = segment4_.GetPosition2().GetX();
         const double y1 = segment4_.GetPosition2().GetY();
-        const double x2 = handle2_.GetCenter().GetX();
         const double y2 = segment4_.GetPosition1().GetY();
+
+        const double x2 = x1 + handle2_.GetCenter().GetX() - handle1_.GetCenter().GetX();
+        //const double x2 = handle2_.GetCenter().GetX();
+
         handle1_.SetCenter(x1, y1);
         handle2_.SetCenter(x2, y2);
         segment1_.SetPosition(x1, y1, x2, y1);