Fix carpet label details

Author: rreusser

src/traces/carpet/axis_attributes.js

@@ -84,7 +84,10 @@ module.exports = {
         role: 'style',
         description: 'Same as `showtickprefix` but for tick suffixes.'
     },
-    labelfont: extendFlat({}, fontAttrs, {
+    startlabelfont: extendFlat({}, fontAttrs, {
+        description: 'Sets the label font.'
+    }),
+    endlabelfont: extendFlat({}, fontAttrs, {
         description: 'Sets the label font.'
     }),
     tick0: {

src/traces/carpet/calc_gridlines.js

@@ -165,9 +165,7 @@ module.exports = function calcGridlines (trace, axisLetter, crossAxisLetter) {
                 return trace._evalxy([], i0, j0, ti, tj);
             };
 
-            ret.dxy = function (i) {
-                var i0 = Math.max(0, Math.min(na - 2, Math.floor(i)));
-                var ti = Math.min(1, Math.max(0, i - i0));
+            ret.dxy = function (i0, ti) {
                 return trace.dxydi([], i0, j0, ti, tj);
             };
 
@@ -188,9 +186,7 @@ module.exports = function calcGridlines (trace, axisLetter, crossAxisLetter) {
             }
 
 
-            ret.dxy = function (j) {
-                var j0 = Math.max(0, Math.min(nb - 2, Math.floor(j)));
-                var tj = Math.min(1, Math.max(0, j - j0));
+            ret.dxy = function (j0, tj) {
                 return trace.dxydj([], i0, j0, ti, tj);
             };
 

src/traces/carpet/calc_labels.js

@@ -34,22 +34,28 @@ module.exports = function calcLabels (trace, axis) {
     for (i = 0; i < gridlines.length; i++) {
         var gridline = gridlines[i];
 
-        labels.push({
-            text: gridline.value.toFixed(3),
-            endAnchor: true,
-            xy: gridline.xy(0),
-            dxy: gridline.dxy(0, 0),
-            axis: gridline.axis,
-            length: gridline.crossAxis.length
-        });
-
-        labels.push({
-            text: gridline.value.toFixed(3),
-            endAnchor: false,
-            xy: gridline.xy(gridline.crossLength - 1),
-            dxy: gridline.dxy(gridline.crossLength - 2, 1),
-            axis: gridline.axis,
-            length: gridline.crossAxis.length
-        });
+        if (['start', 'both'].indexOf(axis.showlabels) !== -1) {
+            labels.push({
+                text: gridline.value.toFixed(3),
+                endAnchor: true,
+                xy: gridline.xy(0),
+                dxy: gridline.dxy(0, 0),
+                axis: gridline.axis,
+                length: gridline.crossAxis.length,
+                font: gridline.crossAxis.startlabelfont
+            });
+        }
+
+        if (['end', 'both'].indexOf(axis.showlabels) !== -1) {
+            labels.push({
+                text: gridline.value.toFixed(3),
+                endAnchor: false,
+                xy: gridline.xy(gridline.crossLength - 1),
+                dxy: gridline.dxy(gridline.crossLength - 2, 1),
+                axis: gridline.axis,
+                length: gridline.crossAxis.length,
+                font: gridline.crossAxis.endlabelfont
+            });
+        }
     }
 };

src/traces/carpet/defaults.js

@@ -94,7 +94,15 @@ function handleAxisDefaults(traceIn, traceOut, axis) {
 
     coerce('labelpadding');
 
-    Lib.coerceFont(coerce, 'labelfont', {size: 12});
+    Lib.coerceFont(coerce, 'startlabelfont', {
+        size: 12,
+        color: ax.startlinecolor
+    });
+
+    Lib.coerceFont(coerce, 'endlabelfont', {
+        size: 12,
+        color: ax.endlinecolor
+    });
 
     // Compute which labels to show. In a sense this is sort of a data computation
     // that should go in calc.js, but it's so minimal for any conceivable case that

src/traces/carpet/plot.js

@@ -154,7 +154,7 @@ function drawAxisLabels(xaxis, yaxis, trace, layer, labels, labelClass) {
             .attr('text-anchor', endAnchor ? 'end' : 'start')
             .text(prefix + label.text + suffix)
             .attr('transform', 'rotate(' + angle + ' ' + xy[0] + ',' + xy[1] + ')')
-            .call(Drawing.font, ax.labelfont.family, ax.labelfont.size, ax.labelfont.color);
+            .call(Drawing.font, label.font.family, label.font.size, label.font.color);
     });
 
     labelJoin.exit().remove();