Clean up some code

Author: degzhaus

src/traces/quiver/attributes.js

@@ -3,6 +3,7 @@
 var baseAttrs = require('../../plots/attributes');
 var hovertemplateAttrs = require('../../plots/template_attributes').hovertemplateAttrs;
 var fontAttrs = require('../../plots/font_attributes');
+var axisHoverFormat = require('../../plots/cartesian/axis_format_attributes').axisHoverFormat;
 var dash = require('../../components/drawing/attributes').dash;
 
 var extendFlat = require('../../lib/extend').extendFlat;
@@ -81,6 +82,11 @@ var attrs = {
         description: 'Maximum distance (in pixels) to look for nearby arrows on hover.'
     },
 
+    xhoverformat: axisHoverFormat('x'),
+    yhoverformat: axisHoverFormat('y'),
+    uhoverformat: axisHoverFormat('u', 'noDate'),
+    vhoverformat: axisHoverFormat('v', 'noDate'),
+
     // Arrowhead sizing, consistent with annotations API naming
     arrowsize: {
         valType: 'number',

src/traces/quiver/defaults.js

@@ -2,12 +2,9 @@
 
 var Lib = require('../../lib');
 var attributes = require('./attributes');
-var Colorscale = require('../../components/colorscale');
-var colorscaleDefaults = Colorscale.handleDefaults;
-var hasColorscale = Colorscale.hasColorscale;
+var colorscaleDefaults = require('../../components/colorscale/defaults');
 
 module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
-    // Selection styling - use coerce to set proper defaults
     function coerce(attr, dflt) {
         return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
     }
@@ -17,7 +14,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     var y = coerce('y');
     var u = coerce('u');
     var v = coerce('v');
-    
+
     // Optional scalar field for colorscale
     coerce('c');
 
@@ -40,46 +37,48 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         for(var j = 0; j < len; j++) traceOut.v[j] = 0;
     }
 
-    // Set basic properties
-    traceOut.type = 'quiver';
-
     // Sizing API similar to cone
     var sizemode = coerce('sizemode');
     coerce('sizeref', sizemode === 'raw' ? 1 : 0.5);
     coerce('anchor');
 
-    // Set default values using coerce
-    coerce('arrowsize', 1);
-    // back-compat
-    coerce('arrow_scale');
-    coerce('hoverdistance', 20);
+    // Arrow styling
+    coerce('arrowsize');
+    coerce('arrow_scale'); // back-compat alias
+    coerce('arrowwidth');
+    coerce('hoverdistance');
+
+    // Line styling - use coerce for proper validation
+    coerce('line.color', defaultColor);
+    // If arrowwidth is set, use it as line.width default
+    var arrowwidth = traceOut.arrowwidth;
+    if(arrowwidth !== undefined) {
+        coerce('line.width', arrowwidth);
+    } else {
+        coerce('line.width');
+    }
+    coerce('line.dash');
+    coerce('line.shape');
+    coerce('line.smoothing');
+    coerce('line.simplify');
 
-    // Line styling
-    traceOut.line = {
-        color: traceIn.line && traceIn.line.color ? traceIn.line.color : defaultColor,
-        width: (traceIn.arrowwidth !== undefined) ? traceIn.arrowwidth : (traceIn.line && traceIn.line.width ? traceIn.line.width : 1),
-        dash: traceIn.line && traceIn.line.dash ? traceIn.line.dash : 'solid',
-        shape: traceIn.line && traceIn.line.shape ? traceIn.line.shape : 'linear',
-        smoothing: traceIn.line && traceIn.line.smoothing ? traceIn.line.smoothing : 1,
-        simplify: traceIn.line && traceIn.line.simplify !== undefined ? traceIn.line.simplify : true
-    };
+    // Text
+    coerce('text');
+    coerce('textposition');
+    Lib.coerceFont(coerce, 'textfont', layout.font);
 
-    // Hover and interaction - let the plots module handle hoverinfo defaults
-    // traceOut.hoverinfo will be set by Lib.coerceHoverinfo in plots.js
-    traceOut.hovertemplate = traceIn.hovertemplate;
+    // Hover
+    coerce('hovertemplate');
+    coerce('xhoverformat');
+    coerce('yhoverformat');
+    coerce('uhoverformat');
+    coerce('vhoverformat');
 
     // Colorscale defaults (adds colorscale, showscale, colorbar, etc.)
-    // Keep colorscale enabled by default for quiver
-    traceOut._hasColorscale = hasColorscale(traceIn) || true;
+    traceOut._hasColorscale = true;
     colorscaleDefaults(traceIn, traceOut, layout, coerce, { prefix: '', cLetter: 'c' });
 
-    // Text
-    traceOut.text = traceIn.text;
-    traceOut.textposition = traceIn.textposition || 'middle center';
-    
-    // Use Lib.coerceFont to set textfont properly
-    Lib.coerceFont(coerce, 'textfont', layout.font);
-    
+    // Selection styling
     coerce('selected.line.color');
     coerce('selected.line.width');
     coerce('selected.textfont.color');

src/traces/quiver/format_labels.js

@@ -1,12 +1,14 @@
 'use strict';
 
 var Axes = require('../../plots/cartesian/axes');
+var Lib = require('../../lib');
 
 module.exports = function formatLabels(cdi, trace, fullLayout) {
     var labels = {};
 
-    var xa = Axes.getFromId({ _fullLayout: fullLayout }, trace.xaxis || 'x');
-    var ya = Axes.getFromId({ _fullLayout: fullLayout }, trace.yaxis || 'y');
+    var mockGd = {_fullLayout: fullLayout};
+    var xa = Axes.getFromTrace(mockGd, trace, 'x');
+    var ya = Axes.getFromTrace(mockGd, trace, 'y');
 
     var x = cdi.x;
     var y = cdi.y;
@@ -17,9 +19,12 @@ module.exports = function formatLabels(cdi, trace, fullLayout) {
     var u = trace.u ? trace.u[cdi.i] : 0;
     var v = trace.v ? trace.v[cdi.i] : 0;
 
-    // Format u and v as plain numbers
-    labels.uLabel = String(u);
-    labels.vLabel = String(v);
+    // Format u and v using hoverformat if provided
+    var uhoverformat = trace.uhoverformat;
+    var vhoverformat = trace.vhoverformat;
+
+    labels.uLabel = uhoverformat ? Lib.numberFormat(uhoverformat)(u) : String(u);
+    labels.vLabel = vhoverformat ? Lib.numberFormat(vhoverformat)(v) : String(v);
 
     return labels;
 };

src/traces/quiver/hover.js

@@ -15,7 +15,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
     var distfn = function(di) {
         var x = xa.c2p(di.x) - xpx;
         var y = ya.c2p(di.y) - ypx;
-        return Math.max(Math.sqrt(x * x + y * y), 1 - 3 / Math.max(3, di.mrc || 0));
+        return Math.sqrt(x * x + y * y);
     };
 
     Fx.getClosest(cd, distfn, pointData);

src/traces/quiver/index.js

@@ -12,8 +12,8 @@ module.exports = {
     supplyDefaults: require('./defaults'),
     calc: require('./calc'),
     plot: require('./plot'),
-    style: require('./style'),
-    styleOnSelect: require('../scatter/style').styleOnSelect,
+    style: require('./style').style,
+    styleOnSelect: require('./style').styleOnSelect,
     hoverPoints: require('./hover'),
     formatLabels: require('./format_labels'),
     eventData: require('./event_data'),

src/traces/quiver/plot.js

@@ -2,7 +2,6 @@
 
 var d3 = require('@plotly/d3');
 
-var Registry = require('../../registry');
 var Lib = require('../../lib');
 var Drawing = require('../../components/drawing');
 var Colorscale = require('../../components/colorscale');
@@ -61,7 +60,6 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
     var trace = cdscatter[0].trace;
     var xa = plotinfo.xaxis;
     var ya = plotinfo.yaxis;
-    var fullLayout = gd._fullLayout;
 
     // Create line group for arrows
     var lines = d3.select(element).selectAll('g.lines')
@@ -86,11 +84,11 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
     var uArr = trace.u || [];
     var vArr = trace.v || [];
     var maxNorm = 0;
-    for (var ni = 0; ni < trace._length; ni++) {
+    for(var ni = 0; ni < trace._length; ni++) {
         var uu = uArr[ni] || 0;
         var vv = vArr[ni] || 0;
         var nrm = Math.sqrt(uu * uu + vv * vv);
-        if (nrm > maxNorm) maxNorm = nrm;
+        if(nrm > maxNorm) maxNorm = nrm;
     }
     var sizemode = trace.sizemode || 'scaled';
     var sizeref = (trace.sizeref !== undefined) ? trace.sizeref : (sizemode === 'raw' ? 1 : 0.5);
@@ -127,7 +125,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
         var unitx = norm ? (u / norm) : 0;
         var unity = norm ? (v / norm) : 0;
         var baseLen;
-        if (sizemode === 'scaled') {
+        if(sizemode === 'scaled') {
             var n = maxNorm ? (norm / maxNorm) : 0;
             baseLen = n * sizeref;
         } else {
@@ -146,12 +144,12 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
         var ang2 = barbAng - headAngle;
 
         var x0, y0, x1, y1;
-        if (anchor === 'tip') {
+        if(anchor === 'tip') {
             x1 = cdi.x;
             y1 = cdi.y;
             x0 = x1 - dx;
             y0 = y1 - dy;
-        } else if (anchor === 'cm' || anchor === 'center' || anchor === 'middle') {
+        } else if(anchor === 'cm' || anchor === 'center' || anchor === 'middle') {
             x0 = cdi.x - dx / 2;
             y0 = cdi.y - dy / 2;
             x1 = cdi.x + dx / 2;
@@ -186,12 +184,12 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
     Drawing.lineGroupStyle(lineSegments, trace.line && trace.line.width, trace.line && trace.line.color, trace.line && trace.line.dash);
 
     // If colorscale present, color arrows by magnitude |(u,v)|
-    if (trace._hasColorscale) {
+    if(trace._hasColorscale) {
         var colorFunc = Colorscale.makeColorScaleFuncFromTrace(trace);
         lineSegments.style('stroke', function(cdi) {
             var cArr = trace.c;
             var value;
-            if (Lib.isArrayOrTypedArray(cArr) && cArr.length > cdi.i && isFinite(cArr[cdi.i])) {
+            if(Lib.isArrayOrTypedArray(cArr) && cArr.length > cdi.i && isFinite(cArr[cdi.i])) {
                 value = cArr[cdi.i];
             } else {
                 var uVal = (trace.u && trace.u[cdi.i]) || 0;

src/traces/quiver/select_points.js

@@ -5,9 +5,8 @@ module.exports = function selectPoints(searchInfo, selectionTester) {
     var xa = searchInfo.xaxis;
     var ya = searchInfo.yaxis;
     var selection = [];
-    var trace = cd[0].trace;
     var i;
-    var segment;
+    var di;
     var x;
     var y;
 
@@ -17,20 +16,19 @@ module.exports = function selectPoints(searchInfo, selectionTester) {
         }
     } else {
         for(i = 0; i < cd.length; i++) {
-            segment = cd[i];
-            // Use the start point of the arrow for selection testing
-            x = xa.c2p(segment[0].x);
-            y = ya.c2p(segment[0].y);
+            di = cd[i];
+            x = xa.c2p(di.x);
+            y = ya.c2p(di.y);
 
-            if((segment[0].i !== null) && selectionTester.contains([x, y], false, i, searchInfo)) {
+            if((di.i !== null) && selectionTester.contains([x, y], false, i, searchInfo)) {
                 selection.push({
-                    pointNumber: segment[0].i,
-                    x: xa.c2d(segment[0].x),
-                    y: ya.c2d(segment[0].y)
+                    pointNumber: di.i,
+                    x: xa.c2d(di.x),
+                    y: ya.c2d(di.y)
                 });
-                segment.selected = 1;
+                di.selected = 1;
             } else {
-                segment.selected = 0;
+                di.selected = 0;
             }
         }
     }

src/traces/quiver/style.js

@@ -3,14 +3,31 @@
 var d3 = require('@plotly/d3');
 
 var Drawing = require('../../components/drawing');
-var Lib = require('../../lib');
 
-module.exports = function style(gd, calcTrace) {
-    if(!calcTrace || !calcTrace.length || !calcTrace[0]) return;
-    
-    var trace = calcTrace[0].trace;
-    var s = d3.select(gd).selectAll('g.trace' + trace.uid);
+function style(gd) {
+    var s = d3.select(gd).selectAll('g.trace.quiver');
 
-    s.selectAll('path.js-line')
-        .call(Drawing.lineGroupStyle, trace.line || {});
+    s.each(function(d) {
+        var trace = d[0].trace;
+        var line = trace.line || {};
+
+        d3.select(this).selectAll('path.js-line')
+            .call(Drawing.lineGroupStyle, line.width, line.color, line.dash);
+    });
+}
+
+function styleOnSelect(gd, cd, sel) {
+    var trace = cd[0].trace;
+    var line = trace.line || {};
+
+    if(!sel) return;
+
+    // Style the line paths based on selection state
+    sel.selectAll('path.js-line')
+        .call(Drawing.lineGroupStyle, line.width, line.color, line.dash);
+}
+
+module.exports = {
+    style: style,
+    styleOnSelect: styleOnSelect
 };