From 15381da6663a4b1858a123666122c2ebedbc231c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20LAGIER?= Date: Wed, 5 Jan 2022 11:57:13 +0100 Subject: [PATCH 1/2] Handle container offsets in angle measurement --- src/plugins/AngleMeasurementsPlugin/AngleMeasurement.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/AngleMeasurementsPlugin/AngleMeasurement.js b/src/plugins/AngleMeasurementsPlugin/AngleMeasurement.js index 011ef730ab..1024ef53ae 100644 --- a/src/plugins/AngleMeasurementsPlugin/AngleMeasurement.js +++ b/src/plugins/AngleMeasurementsPlugin/AngleMeasurement.js @@ -197,8 +197,9 @@ class AngleMeasurement extends Component { var canvas = scene.canvas.canvas; var offsets = canvas.getBoundingClientRect(); - var top = offsets.top; - var left = offsets.left; + const containerOffsets = this._container.getBoundingClientRect(); + var top = offsets.top - containerOffsets.top; + var left = offsets.left - containerOffsets.left; var aabb = scene.canvas.boundary; var canvasWidth = aabb[2]; var canvasHeight = aabb[3]; @@ -510,4 +511,4 @@ class AngleMeasurement extends Component { } } -export {AngleMeasurement}; \ No newline at end of file +export {AngleMeasurement}; From a505afd9acd45edf9034c448ff2a7e106accfbf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20LAGIER?= Date: Wed, 5 Jan 2022 11:59:07 +0100 Subject: [PATCH 2/2] Handle container offsets in distance measurement --- .../DistanceMeasurementsPlugin/DistanceMeasurement.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurement.js b/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurement.js index 070681b314..e06a54d8fb 100644 --- a/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurement.js +++ b/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurement.js @@ -260,8 +260,9 @@ class DistanceMeasurement extends Component { var canvas = scene.canvas.canvas; var offsets = canvas.getBoundingClientRect(); - var top = offsets.top; - var left = offsets.left; + const containerOffsets = this._container.getBoundingClientRect(); + var top = offsets.top - containerOffsets.top; + var left = offsets.left - containerOffsets.left; var aabb = scene.canvas.boundary; var canvasWidth = aabb[2]; var canvasHeight = aabb[3];