scattergl size fixes.

Author: jonmmease

src/traces/scatter/make_bubble_size_func.js

@@ -5,7 +5,10 @@ var isNumeric = require('fast-isnumeric');
 
 // used in the drawing step for 'scatter' and 'scattegeo' and
 // in the convert step for 'scatter3d'
-module.exports = function makeBubbleSizeFn(trace) {
+module.exports = function makeBubbleSizeFn(trace, factor) {
+    if(!factor) {
+        factor = 2;
+    }
     var marker = trace.marker;
     var sizeRef = marker.sizeref || 1;
     var sizeMin = marker.sizemin || 0;
@@ -21,7 +24,7 @@ module.exports = function makeBubbleSizeFn(trace) {
     // TODO add support for position/negative bubbles?
     // TODO add 'sizeoffset' attribute?
     return function(v) {
-        var baseSize = baseFn(v / 2);
+        var baseSize = baseFn(v / factor);
 
         // don't show non-numeric and negative sizes
         return (isNumeric(baseSize) && (baseSize > 0)) ?

src/traces/scattergl/convert.js

@@ -39,6 +39,8 @@ function convertStyle(gd, trace) {
         textUnsel: undefined
     };
 
+    var plotGlPixelRatio = gd._context.plotGlPixelRatio;
+
     if(trace.visible !== true) return opts;
 
     if(subTypes.hasText(trace)) {
@@ -64,7 +66,7 @@ function convertStyle(gd, trace) {
     if(subTypes.hasLines(trace)) {
         opts.line = {
             overlay: true,
-            thickness: trace.line.width,
+            thickness: trace.line.width * plotGlPixelRatio,
             color: trace.line.color,
             opacity: trace.opacity
         };
@@ -77,11 +79,11 @@ function convertStyle(gd, trace) {
     }
 
     if(trace.error_x && trace.error_x.visible) {
-        opts.errorX = convertErrorBarStyle(trace, trace.error_x);
+        opts.errorX = convertErrorBarStyle(trace, trace.error_x, plotGlPixelRatio);
     }
 
     if(trace.error_y && trace.error_y.visible) {
-        opts.errorY = convertErrorBarStyle(trace, trace.error_y);
+        opts.errorY = convertErrorBarStyle(trace, trace.error_y, plotGlPixelRatio);
     }
 
     if(!!trace.fill && trace.fill !== 'none') {
@@ -106,6 +108,7 @@ function convertTextStyle(gd, trace) {
     var tff = textfontIn.family;
     var optsOut = {};
     var i;
+    var plotGlPixelRatio = gd._context.plotGlPixelRatio;
 
     var texttemplate = trace.texttemplate;
     if(texttemplate) {
@@ -191,13 +194,13 @@ function convertTextStyle(gd, trace) {
                 Array.isArray(tfs) ? (
                     isNumeric(tfs[i]) ? tfs[i] : 0
                 ) : tfs
-            );
+            ) * plotGlPixelRatio;
 
             fonti.family = Array.isArray(tff) ? tff[i] : tff;
         }
     } else {
         // if both are single values, make render fast single-value
-        optsOut.font = {size: tfs, family: tff};
+        optsOut.font = {size: tfs * plotGlPixelRatio, family: tff};
     }
 
     return optsOut;
@@ -283,7 +286,8 @@ function convertMarkerStyle(trace) {
     }
 
     // prepare sizes
-    var markerSizeFunc = makeBubbleSizeFn(trace);
+    var sizeFactor = 1;
+    var markerSizeFunc = makeBubbleSizeFn(trace, sizeFactor);
     var s;
 
     if(multiSize || multiLineWidth) {
@@ -308,10 +312,10 @@ function convertMarkerStyle(trace) {
         // See  https://github.com/plotly/plotly.js/pull/1781#discussion_r121820798
         if(multiLineWidth) {
             for(i = 0; i < count; i++) {
-                borderSizes[i] = optsIn.line.width[i] / 2;
+                borderSizes[i] = optsIn.line.width[i];
             }
         } else {
-            s = optsIn.line.width / 2;
+            s = optsIn.line.width;
             for(i = 0; i < count; i++) {
                 borderSizes[i] = s;
             }
@@ -335,7 +339,7 @@ function convertMarkerSelection(trace, target) {
     if(target.marker && target.marker.symbol) {
         optsOut = convertMarkerStyle(Lib.extendFlat({}, optsIn, target.marker));
     } else if(target.marker) {
-        if(target.marker.size) optsOut.size = target.marker.size / 2;
+        if(target.marker.size) optsOut.size = target.marker.size;
         if(target.marker.color) optsOut.colors = target.marker.color;
         if(target.marker.opacity !== undefined) optsOut.opacity = target.marker.opacity;
     }
@@ -365,10 +369,10 @@ function convertTextSelection(gd, trace, target) {
     return optsOut;
 }
 
-function convertErrorBarStyle(trace, target) {
+function convertErrorBarStyle(trace, target, plotGlPixelRatio) {
     var optsOut = {
-        capSize: target.width * 2,
-        lineWidth: target.thickness,
+        capSize: target.width * 2 * plotGlPixelRatio,
+        lineWidth: target.thickness * plotGlPixelRatio,
         color: target.color
     };