handle paper-referenced shapes

Author: emilykl

src/components/shapes/label_texttemplate.js

@@ -1,17 +1,27 @@
 'use strict';
 
+// Wrapper functions to handle paper-referenced shapes, which have no axis
+
+function d2l(v, axis) {
+    return axis ? axis.d2l(v) : v;
+}
+
+function l2d(v, axis) {
+    return axis ? axis.l2d(v) : v;
+}
+
 
 function x0Fn(shape) { return shape.x0; }
 function x1Fn(shape) { return shape.x1; }
 function y0Fn(shape) { return shape.y0; }
 function y1Fn(shape) { return shape.y1; }
 
 function dxFn(shape, xa) {
-    return xa.d2l(shape.x1) - xa.d2l(shape.x0);
+    return d2l(shape.x1, xa) - d2l(shape.x0, xa);
 }
 
 function dyFn(shape, xa, ya) {
-    return ya.d2l(shape.y1) - ya.d2l(shape.y0);
+    return d2l(shape.y1, ya) - d2l(shape.y0, ya);
 }
 
 function widthFn(shape, xa) {
@@ -31,11 +41,11 @@ function lengthFn(shape, xa, ya) {
 }
 
 function xcenterFn(shape, xa) {
-    return xa.l2d((xa.d2l(shape.x1) + xa.d2l(shape.x0)) / 2);
+    return l2d((d2l(shape.x1, xa) + d2l(shape.x0, xa)) / 2, xa);
 }
 
 function ycenterFn(shape, xa, ya) {
-    return ya.l2d((ya.d2l(shape.y1) + ya.d2l(shape.y0)) / 2);
+    return l2d((d2l(shape.y1, ya) + d2l(shape.y0, ya)) / 2, ya);
 }
 
 function slopeFn(shape, xa, ya) {

test/image/mocks/zz-text_on_shapes_texttemplate.json

@@ -160,6 +160,22 @@
         "width": 1000,
         "height": 1000,
         "shapes": [
+            {
+                "label": {
+                    "texttemplate": "Paper-referenced shape<br>x0: %{x0:.2f},  x1: %{x1:.2f},  xcenter: %{xcenter:.2f},  dx: %{dx:.2f}<br>y0: %{y0:.2f},  y1: %{y1:.2f},  ycenter: %{ycenter:.2f},  dy: %{dy:.2f}",
+                    "textposition": "middle left"
+                },
+                "layer": "above",
+                "xref": "paper",
+                "yref": "paper",
+                "x0": 0.2,
+                "x1": 0.6,
+                "y0": 0.15,
+                "y1": 0.05,
+                "type": "rect",
+                "opacity": 0.3,
+                "editable": true
+            },
             {
                 "label": {
                     "text": "this will be overridden",
@@ -186,7 +202,7 @@
                 "layer": "above",
                 "x0": 5,
                 "x1": 9,
-                "y0": 2.5,
+                "y0": 3.7,
                 "y1": 9,
                 "type": "line",
                 "opacity": 0.5,