add 'startarrowhead', 'startarrowsize' and 'startstandoff' and rename 'arrowanchor' to 'arrowside'

apalchys · apalchys · commit c4a0f1fc0ea2 · 2017-11-21T10:39:28.000+03:00
diff --git a/src/components/annotations/attributes.js b/src/components/annotations/attributes.js
@@ -173,11 +173,21 @@ module.exports = {
         dflt: 1,
         role: 'style',
         editType: 'arraydraw',
-        description: 'Sets the annotation arrow head style.'
+        description: 'Sets the end annotation arrow head style.'
     },
-    arrowanchor: {
-        valType: 'enumerated',
-        values: ['end', 'start', 'start+end'],
+    startarrowhead: {
+        valType: 'integer',
+        min: 0,
+        max: ARROWPATHS.length,
+        dflt: 1,
+        role: 'style',
+        editType: 'arraydraw',
+        description: 'Sets the start annotation arrow head style.'
+    },
+    arrowside: {
+        valType: 'flaglist',
+        flags: ['end', 'start'],
+        extras: ['none'],
         dflt: 'end',
         role: 'style',
         editType: 'arraydraw',
@@ -190,7 +200,18 @@ module.exports = {
         role: 'style',
         editType: 'calcIfAutorange',
         description: [
-            'Sets the size of the annotation arrow head, relative to `arrowwidth`.',
+            'Sets the size of the end annotation arrow head, relative to `arrowwidth`.',
+            'A value of 1 (default) gives a head about 3x as wide as the line.'
+        ].join(' ')
+    },
+    startarrowsize: {
+        valType: 'number',
+        min: 0.3,
+        dflt: 1,
+        role: 'style',
+        editType: 'calcIfAutorange',
+        description: [
+            'Sets the size of the start annotation arrow head, relative to `arrowwidth`.',
             'A value of 1 (default) gives a head about 3x as wide as the line.'
         ].join(' ')
     },
@@ -208,7 +229,21 @@ module.exports = {
         role: 'style',
         editType: 'calcIfAutorange',
         description: [
-            'Sets a distance, in pixels, to move the arrowhead away from the',
+            'Sets a distance, in pixels, to move the end arrowhead away from the',
+            'position it is pointing at, for example to point at the edge of',
+            'a marker independent of zoom. Note that this shortens the arrow',
+            'from the `ax` / `ay` vector, in contrast to `xshift` / `yshift`',
+            'which moves everything by this amount.'
+        ].join(' ')
+    },
+    startstandoff: {
+        valType: 'number',
+        min: 0,
+        dflt: 0,
+        role: 'style',
+        editType: 'calcIfAutorange',
+        description: [
+            'Sets a distance, in pixels, to move the start arrowhead away from the',
             'position it is pointing at, for example to point at the edge of',
             'a marker independent of zoom. Note that this shortens the arrow',
             'from the `ax` / `ay` vector, in contrast to `xshift` / `yshift`',
diff --git a/src/components/annotations/common_defaults.js b/src/components/annotations/common_defaults.js
@@ -35,12 +35,18 @@ module.exports = function handleAnnotationCommonDefaults(annIn, annOut, fullLayo
     if(h) coerce('valign');
 
     if(showArrow) {
+        var arrowside = coerce('arrowside');
+        var arrowhead = coerce('arrowhead');
+        var arrowsize = coerce('arrowsize');
+
+        if(arrowside.indexOf('start') !== -1) {
+            coerce('startarrowhead', arrowhead);
+        }
+        coerce('startarrowsize', arrowsize);
         coerce('arrowcolor', borderOpacity ? annOut.bordercolor : Color.defaultLine);
-        coerce('arrowhead');
-        coerce('arrowanchor');
-        coerce('arrowsize');
         coerce('arrowwidth', ((borderOpacity && borderWidth) || 1) * 2);
         coerce('standoff');
+        coerce('startstandoff');
 
     }
 
diff --git a/src/components/annotations/draw.js b/src/components/annotations/draw.js
@@ -510,7 +510,7 @@ function drawRaw(gd, options, index, subplotId, xa, ya) {
 
             var strokewidth = options.arrowwidth,
                 arrowColor = options.arrowcolor,
-                arrowAnchor = options.arrowanchor;
+                arrowSide = options.arrowside;
 
             var arrowGroup = annGroup.append('g')
                 .style({opacity: Color.opacity(arrowColor)})
@@ -521,7 +521,7 @@ function drawRaw(gd, options, index, subplotId, xa, ya) {
                 .style('stroke-width', strokewidth + 'px')
                 .call(Color.stroke, Color.rgb(arrowColor));
 
-            drawArrowHead(arrow, arrowAnchor, options);
+            drawArrowHead(arrow, arrowSide, options);
 
             // the arrow dragger is a small square right at the head, then a line to the tail,
             // all expanded by a stroke width of 6px plus the arrow line width
diff --git a/src/components/annotations/draw_arrow_head.js b/src/components/annotations/draw_arrow_head.js
@@ -20,12 +20,15 @@ var ARROWPATHS = require('./arrow_paths');
  *
  * @param {d3.selection} el3: a d3-selected line or path element
  *
- * @param {string} ends: 'start', 'end', or 'start+end' for which ends get arrowheads
+ * @param {string} ends: 'none', 'start', 'end', or 'start+end' for which ends get arrowheads
  *
  * @param {object} options: style information. Must have all the following:
- * @param {number} options.arrowhead: head style - see ./arrow_paths
- * @param {number} options.arrowsize: relative size of the head vs line width
- * @param {number} options.standoff: distance in px to move the arrow point from its target
+ * @param {number} options.arrowhead: end head style - see ./arrow_paths
+ * @param {number} options.startarrowhead: start head style - see ./arrow_paths
+ * @param {number} options.arrowsize: relative size of the end head vs line width
+ * @param {number} options.startarrowsize: relative size of the start head vs line width
+ * @param {number} options.standoff: distance in px to move the end arrow point from its target
+ * @param {number} options.startstandoff: distance in px to move the start arrow point from its target
  * @param {number} options.arrowwidth: width of the arrow line
  * @param {string} options.arrowcolor: color of the arrow line, for the head to match
  *     Note that the opacity of this color is ignored, as it's assumed the container
@@ -35,10 +38,14 @@ var ARROWPATHS = require('./arrow_paths');
 module.exports = function drawArrowHead(el3, ends, options) {
     var el = el3.node();
     var headStyle = ARROWPATHS[options.arrowhead || 0];
+    var startHeadStyle = ARROWPATHS[options.startarrowhead || 0];
     var scale = (options.arrowwidth || 1) * options.arrowsize;
+    var startScale = (options.arrowwidth || 1) * options.startarrowsize;
     var doStart = ends.indexOf('start') >= 0;
     var doEnd = ends.indexOf('end') >= 0;
+    var doNone = ends.indexOf('none') >= 0;
     var backOff = headStyle.backoff * scale + options.standoff;
+    var startBackOff = startHeadStyle.backoff * startScale + options.startstandoff;
 
     var start, end, startRot, endRot;
 
@@ -51,6 +58,13 @@ module.exports = function drawArrowHead(el3, ends, options) {
 
         startRot = Math.atan2(dy, dx);
         endRot = startRot + Math.PI;
+        if(backOff && startBackOff) {
+            if(backOff * backOff + startBackOff * startBackOff > dx * dx + dy * dy) {
+                hideLine();
+                return;
+            }
+        }
+
         if(backOff) {
             if(backOff * backOff > dx * dx + dy * dy) {
                 hideLine();
@@ -59,17 +73,27 @@ module.exports = function drawArrowHead(el3, ends, options) {
             var backOffX = backOff * Math.cos(startRot),
                 backOffY = backOff * Math.sin(startRot);
 
-            if(doStart) {
-                start.x -= backOffX;
-                start.y -= backOffY;
-                el3.attr({x1: start.x, y1: start.y});
-            }
-            if(doEnd) {
+            if(doEnd || doNone) {
                 end.x += backOffX;
                 end.y += backOffY;
                 el3.attr({x2: end.x, y2: end.y});
             }
         }
+
+        if(startBackOff) {
+            if(startBackOff * startBackOff > dx * dx + dy * dy) {
+                hideLine();
+                return;
+            }
+            var startBackOffX = startBackOff * Math.cos(startRot),
+                startbackOffY = startBackOff * Math.sin(startRot);
+
+            if(doStart || doNone) {
+                start.x -= startBackOffX;
+                start.y -= startbackOffY;
+                el3.attr({x1: start.x, y1: start.y});
+            }
+        }
     }
     else if(el.nodeName === 'path') {
         var pathlen = el.getTotalLength(),
@@ -79,41 +103,35 @@ module.exports = function drawArrowHead(el3, ends, options) {
             // combine the two
             dashArray = '';
 
-        if(pathlen < backOff) {
+        if(pathlen < backOff || pathlen < startBackOff || pathlen < backOff + startBackOff) {
             hideLine();
             return;
         }
 
-        if(doStart) {
-            var start0 = el.getPointAtLength(0);
-            var dstart = el.getPointAtLength(0.1);
 
-            startRot = Math.atan2(start0.y - dstart.y, start0.x - dstart.x);
-            start = el.getPointAtLength(Math.min(backOff, pathlen));
+        var start0 = el.getPointAtLength(0);
+        var dstart = el.getPointAtLength(0.1);
 
-            if(backOff) dashArray = '0px,' + backOff + 'px,';
-        }
+        startRot = Math.atan2(start0.y - dstart.y, start0.x - dstart.x);
+        start = el.getPointAtLength(Math.min(startBackOff, pathlen));
 
-        if(doEnd) {
-            var end0 = el.getPointAtLength(pathlen);
-            var dend = el.getPointAtLength(pathlen - 0.1);
+        dashArray = '0px,' + startBackOff + 'px,';
 
-            endRot = Math.atan2(end0.y - dend.y, end0.x - dend.x);
-            end = el.getPointAtLength(Math.max(0, pathlen - backOff));
+        var end0 = el.getPointAtLength(pathlen);
+        var dend = el.getPointAtLength(pathlen - 0.1);
 
-            if(backOff) {
-                var shortening = dashArray ? 2 * backOff : backOff;
-                dashArray += (pathlen - shortening) + 'px,' + pathlen + 'px';
-            }
-        }
-        else if(dashArray) dashArray += pathlen + 'px';
+        endRot = Math.atan2(end0.y - dend.y, end0.x - dend.x);
+        end = el.getPointAtLength(Math.max(0, pathlen - backOff));
+
+        var shortening = dashArray ? startBackOff + backOff : backOff;
+        dashArray += (pathlen - shortening) + 'px,' + pathlen + 'px';
 
-        if(dashArray) el3.style('stroke-dasharray', dashArray);
+        el3.style('stroke-dasharray', dashArray);
     }
 
     function hideLine() { el3.style('stroke-dasharray', '0px,100px'); }
 
-    function drawhead(p, rot) {
+    function drawhead(headStyle, p, rot, scale) {
         if(!headStyle.path) return;
         if(headStyle.noRotate) rot = 0;
 
@@ -132,6 +150,6 @@ module.exports = function drawArrowHead(el3, ends, options) {
             });
     }
 
-    if(doStart) drawhead(start, startRot);
-    if(doEnd) drawhead(end, endRot);
+    if(doStart) drawhead(startHeadStyle, start, startRot, startScale);
+    if(doEnd) drawhead(headStyle, end, endRot, scale);
 };
diff --git a/src/components/annotations3d/attributes.js b/src/components/annotations3d/attributes.js
@@ -72,10 +72,13 @@ module.exports = overrideAll({
     showarrow: annAtts.showarrow,
     arrowcolor: annAtts.arrowcolor,
     arrowhead: annAtts.arrowhead,
-    arrowanchor: annAtts.arrowanchor,
+    startarrowhead: annAtts.startarrowhead,
+    arrowside: annAtts.arrowside,
     arrowsize: annAtts.arrowsize,
+    startarrowsize: annAtts.startarrowsize,
     arrowwidth: annAtts.arrowwidth,
     standoff: annAtts.standoff,
+    startstandoff: annAtts.startstandoff,
     hovertext: annAtts.hovertext,
     hoverlabel: annAtts.hoverlabel,
     captureevents: annAtts.captureevents,
diff --git a/test/image/baselines/annotations.png b/test/image/baselines/annotations.png
diff --git a/test/image/mocks/annotations.json b/test/image/mocks/annotations.json
@@ -45,7 +45,8 @@
                 "arrowcolor":"rgb(166, 28, 0)","borderpad":3,"textangle":50,"x":5,"y":1
             },
             {"text":"","showarrow":true,"borderwidth":1.2,"arrowhead":2,"axref":"x","ayref":"y","x":5,"y":3,"ax":4,"ay":5},
-            {"text":"","showarrow":true,"borderwidth":1.2,"arrowhead":2,"arrowanchor":"start+end","axref":"x","ayref":"y","x":2,"y":4,"ax":3,"ay":4},
+            {"text":"","showarrow":true,"borderwidth":1.2,"arrowhead":3,"startarrowhead":6,"arrowsize":1.5,"startarrowsize":3,"standoff": 7,"startstandoff": 15,"arrowside":"start+end","axref":"x","ayref":"y","x":2,"y":4,"ax":3,"ay":4},
+            {"text":"","showarrow":true,"borderwidth":1.2,"startarrowhead":2,"startstandoff": 5,"arrowside":"start","axref":"x","ayref":"y","x":1,"y":5,"ax":2,"ay":4},
             {"text":"","showarrow":true,"borderwidth":1.2,"arrowhead":2,"axref":"x","ayref":"y","x":6,"y":2,"ax":3,"ay":3},
             {
                 "text": "arrow ML<br>+standoff", "x": 2, "y": 2, "ax": 20, "ay": 20,
diff --git a/test/jasmine/tests/annotations_test.js b/test/jasmine/tests/annotations_test.js
@@ -141,14 +141,14 @@ describe('Test annotations', function() {
             expect(layoutOut.annotations[2]._yclick).toBe('A', 'category');
         });
 
-        it('should default to end for arrowanchor', function() {
+        it('should default to end for arrowside', function() {
             var layoutIn = {
                 annotations: [{ showarrow: true, arrowhead: 2 }]
             };
 
             var out = _supply(layoutIn);
 
-            expect(out[0].arrowanchor).toEqual('end');
+            expect(out[0].arrowside).toEqual('end');
         });
     });
 });
