Merge pull request #1033 from monfera/date-resolution-3

Preserving 64 bit floats for WebGL 2D plotting

Author: etpinard

package.json

@@ -59,18 +59,18 @@
     "es6-promise": "^3.0.2",
     "fast-isnumeric": "^1.1.1",
     "gl-contour2d": "^1.1.2",
-    "gl-error2d": "^1.0.0",
+    "gl-error2d": "^1.2.0",
     "gl-error3d": "^1.0.0",
     "gl-heatmap2d": "^1.0.2",
-    "gl-line2d": "^1.3.0",
+    "gl-line2d": "^1.4.0",
     "gl-line3d": "^1.1.0",
     "gl-mat4": "^1.1.2",
     "gl-mesh3d": "^1.2.0",
     "gl-plot2d": "^1.1.9",
     "gl-plot3d": "^1.5.1",
     "gl-pointcloud2d": "^1.0.0",
-    "gl-scatter2d": "^1.0.5",
-    "gl-scatter2d-fancy": "^1.1.1",
+    "gl-scatter2d": "^1.2.0",
+    "gl-scatter2d-fancy": "^1.2.0",
     "gl-scatter3d": "^1.0.4",
     "gl-select-box": "^1.0.1",
     "gl-shader": "4.2.0",

src/lib/float32_truncate.js

@@ -0,0 +1,32 @@
+/**
+* Copyright 2012-2016, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+function truncateFloat32(arrayIn, len) {
+    var arrayOut = new Float32Array(len);
+    for(var i = 0; i < len; i++) arrayOut[i] = arrayIn[i];
+    return arrayOut;
+}
+
+function truncateFloat64(arrayIn, len) {
+    var arrayOut = new Float64Array(len);
+    for(var i = 0; i < len; i++) arrayOut[i] = arrayIn[i];
+    return arrayOut;
+}
+
+/**
+ * Truncate a typed array to some length.
+ * For some reason, ES2015 Float32Array.prototype.slice takes
+ * 2x as long, therefore we aren't checking for its existence
+ */
+module.exports = function truncate(arrayIn, len) {
+    if(arrayIn instanceof Float32Array) return truncateFloat32(arrayIn, len);
+    if(arrayIn instanceof Float64Array) return truncateFloat64(arrayIn, len);
+    throw new Error('This array type is not yet supported by `truncate`.');
+};

src/lib/typed_array_truncate.js

@@ -20,7 +20,7 @@ var Axes = require('../../plots/cartesian/axes');
 var autoType = require('../../plots/cartesian/axis_autotype');
 var ErrorBars = require('../../components/errorbars');
 var str2RGBArray = require('../../lib/str2rgbarray');
-var truncate = require('../../lib/float32_truncate');
+var truncate = require('../../lib/typed_array_truncate');
 var formatColor = require('../../lib/gl_format_color');
 var subTypes = require('../scatter/subtypes');
 var makeBubbleSizeFn = require('../scatter/make_bubble_size_func');
@@ -51,7 +51,7 @@ function LineWithMarkers(scene, uid) {
 
     this.hasLines = false;
     this.lineOptions = {
-        positions: new Float32Array(0),
+        positions: new Float64Array(0),
         color: [0, 0, 0, 1],
         width: 1,
         fill: [false, false, false, false],
@@ -67,8 +67,8 @@ function LineWithMarkers(scene, uid) {
 
     this.hasErrorX = false;
     this.errorXOptions = {
-        positions: new Float32Array(0),
-        errors: new Float32Array(0),
+        positions: new Float64Array(0),
+        errors: new Float64Array(0),
         lineWidth: 1,
         capSize: 0,
         color: [0, 0, 0, 1]
@@ -78,8 +78,8 @@ function LineWithMarkers(scene, uid) {
 
     this.hasErrorY = false;
     this.errorYOptions = {
-        positions: new Float32Array(0),
-        errors: new Float32Array(0),
+        positions: new Float64Array(0),
+        errors: new Float64Array(0),
         lineWidth: 1,
         capSize: 0,
         color: [0, 0, 0, 1]
@@ -89,7 +89,7 @@ function LineWithMarkers(scene, uid) {
 
     this.hasMarkers = false;
     this.scatterOptions = {
-        positions: new Float32Array(0),
+        positions: new Float64Array(0),
         sizes: [],
         colors: [],
         glyphs: [],
@@ -291,7 +291,7 @@ proto.updateFast = function(options) {
 
     var len = x.length,
         idToIndex = new Array(len),
-        positions = new Float32Array(2 * len),
+        positions = new Float64Array(2 * len),
         bounds = this.bounds,
         pId = 0,
         ptr = 0;
@@ -357,13 +357,13 @@ proto.updateFast = function(options) {
         this.scatter.update(this.scatterOptions);
     }
     else {
-        this.scatterOptions.positions = new Float32Array(0);
+        this.scatterOptions.positions = new Float64Array(0);
         this.scatterOptions.glyphs = [];
         this.scatter.update(this.scatterOptions);
     }
 
     // turn off fancy scatter plot
-    this.scatterOptions.positions = new Float32Array(0);
+    this.scatterOptions.positions = new Float64Array(0);
     this.scatterOptions.glyphs = [];
     this.fancyScatter.update(this.scatterOptions);
 
@@ -389,9 +389,9 @@ proto.updateFancy = function(options) {
 
     var len = x.length,
         idToIndex = new Array(len),
-        positions = new Float32Array(2 * len),
-        errorsX = new Float32Array(4 * len),
-        errorsY = new Float32Array(4 * len),
+        positions = new Float64Array(2 * len),
+        errorsX = new Float64Array(4 * len),
+        errorsY = new Float64Array(4 * len),
         pId = 0,
         ptr = 0,
         ptrX = 0,
@@ -482,13 +482,13 @@ proto.updateFancy = function(options) {
         this.fancyScatter.update(this.scatterOptions);
     }
     else {
-        this.scatterOptions.positions = new Float32Array(0);
+        this.scatterOptions.positions = new Float64Array(0);
         this.scatterOptions.glyphs = [];
         this.fancyScatter.update(this.scatterOptions);
     }
 
     // turn off fast scatter plot
-    this.scatterOptions.positions = new Float32Array(0);
+    this.scatterOptions.positions = new Float64Array(0);
     this.scatterOptions.glyphs = [];
     this.scatter.update(this.scatterOptions);
 
@@ -506,7 +506,7 @@ proto.updateLines = function(options, positions) {
             var p = 0;
             var x = this.xData;
             var y = this.yData;
-            linePositions = new Float32Array(2 * x.length);
+            linePositions = new Float64Array(2 * x.length);
 
             for(i = 0; i < x.length; ++i) {
                 linePositions[p++] = x[i];
@@ -542,7 +542,7 @@ proto.updateLines = function(options, positions) {
         this.lineOptions.fillColor = [fillColor, fillColor, fillColor, fillColor];
     }
     else {
-        this.lineOptions.positions = new Float32Array(0);
+        this.lineOptions.positions = new Float64Array(0);
     }
 
     this.line.update(this.lineOptions);
@@ -565,7 +565,7 @@ proto.updateError = function(axLetter, options, positions, errors) {
         errorObjOptions.color = convertColor(errorOptions.color, 1, 1);
     }
     else {
-        errorObjOptions.positions = new Float32Array(0);
+        errorObjOptions.positions = new Float64Array(0);
     }
 
     errorObj.update(errorObjOptions);
@@ -588,7 +588,7 @@ proto.expandAxesFast = function(bounds, markerSize) {
     }
 };
 
-// not quite on-par with 'scatter' (scatter fill in several other expand options),
+// not quite on-par with 'scatter' (scatter fill in several other expand options)
 // but close enough for now
 proto.expandAxesFancy = function(x, y, ppad) {
     var scene = this.scene,

src/traces/scattergl/convert.js

@@ -2,16 +2,68 @@
     "data": [
         {
             "x": [
-                "2013-10-04 22:23:00",
-                "2013-11-04 22:23:00",
-                "2013-12-04 22:23:00"
+                "1970-10-25 22:23:00",
+                "1970-10-25 22:23:00.001",
+                "1970-10-25 22:23:00.002",
+                "1970-10-25 22:23:00.003",
+                "1970-10-25 22:23:00.004",
+                "2016-10-25 22:23:00",
+                "2016-10-25 22:23:00.001",
+                "2016-10-25 22:23:00.002",
+                "2016-10-25 22:23:00.003",
+                "2016-10-25 22:23:00.004"
             ],
             "y": [
+                0,
                 1,
+                2,
                 3,
-                6
+                4,
+                5,
+                6,
+                7,
+                8,
+                9
             ],
-            "type": "scattergl"
+            "type": "scattergl",
+            "mode": "markers"
+        },
+        {
+            "x": [
+                "1970-10-25 22:23:00",
+                "1970-10-25 22:23:00.001",
+                "1970-10-25 22:23:00.002",
+                "1970-10-25 22:23:00.003",
+                "1970-10-25 22:23:00.004",
+                "2016-10-25 22:23:00",
+                "2016-10-25 22:23:00.001",
+                "2016-10-25 22:23:00.002",
+                "2016-10-25 22:23:00.003",
+                "2016-10-25 22:23:00.004"
+            ],
+            "y": [
+                10,
+                11,
+                12,
+                13,
+                14,
+                15,
+                16,
+                17,
+                18,
+                19
+            ],
+            "type": "scattergl",
+            "mode": "lines+markers"
+        }
+    ],
+    "layout": {
+        "xaxis": {
+            "range": [
+                1477434179998,
+                1477434180004
+            ],
+            "autorange": false
         }
-    ]
+    }
 }