Lib: Remove markTime method

Author: mdtusz

src/lib/index.js

@@ -12,6 +12,7 @@
 var d3 = require('d3');
 
 var lib = module.exports = {};
+var config = require('../plot_api/plot_config');
 
 lib.nestedProperty = require('./nested_property');
 lib.isPlainObject = require('./is_plain_object');
@@ -100,25 +101,24 @@ lib.pauseEvent = function(e) {
 
 // set VERBOSE to true to get a lot more logging and tracing
 lib.VERBOSE = false;
-
-// first markTime call will return time from page load
-lib.TIMER = new Date().getTime();
-
 // console.log that only runs if VERBOSE is on
 lib.log = function() {
     if(lib.VERBOSE) console.log.apply(console, arguments);
+    if(config.logging > 1) {
+        console.log.apply(console, arguments);
+    }
 };
 
-/**
- * markTime - for debugging, mark the number of milliseconds
- * since the previous call to markTime and log arbitrary info too
- */
-lib.markTime = function(v) {
-    if(!lib.VERBOSE) return;
-    var t2 = new Date().getTime();
-    console.log(v, t2 - lib.TIMER, '(msec)');
-    if(lib.VERBOSE === 'trace') console.trace();
-    lib.TIMER = t2;
+lib.warn = function() {
+    if(config.logging > 0) {
+        console.warn.apply(console, arguments);
+    }
+};
+
+lib.error = function() {
+    if(config.logging > 0) {
+        console.error.apply(console, arguments);
+    }
 };
 
 // constrain - restrict a number v to be between v0 and v1
@@ -271,18 +271,17 @@ lib.syncOrAsync = function(sequence, arg, finalStep) {
     var ret, fni;
 
     function continueAsync() {
-        lib.markTime('async done ' + fni.name);
         return lib.syncOrAsync(sequence, arg, finalStep);
     }
+
     while(sequence.length) {
         fni = sequence.splice(0, 1)[0];
         ret = fni(arg);
-        // lib.markTime('done calling '+fni.name)
+
         if(ret && ret.then) {
             return ret.then(continueAsync)
                 .then(undefined, lib.promiseError);
         }
-        lib.markTime('sync done ' + fni.name);
     }
 
     return finalStep && finalStep(arg);
@@ -434,6 +433,7 @@ lib.addStyleRule = function(selector, styleString) {
         styleSheet.addRule(selector, styleString, 0);
     }
     else console.warn('addStyleRule failed');
+    else lib.warn('addStyleRule failed');
 };
 
 lib.getTranslate = function(element) {

src/plot_api/plot_api.js

@@ -51,7 +51,6 @@ var xmlnsNamespaces = require('../constants/xmlns_namespaces');
  *
  */
 Plotly.plot = function(gd, data, layout, config) {
-    Lib.markTime('in plot');
 
     gd = getGraphDiv(gd);
 
@@ -223,11 +222,9 @@ Plotly.plot = function(gd, data, layout, config) {
             }
         }
 
-        Lib.markTime('done with bar/box adjustments');
 
         // calc and autorange for errorbars
         ErrorBars.calc(gd);
-        Lib.markTime('done ErrorBars.calc');
 
         // TODO: autosize extra for text markers
         return Lib.syncOrAsync([
@@ -282,7 +279,6 @@ Plotly.plot = function(gd, data, layout, config) {
 
         // styling separate from drawing
         Plots.style(gd);
-        Lib.markTime('done Plots.style');
 
         // show annotations and shapes
         Shapes.drawAll(gd);
@@ -312,7 +308,6 @@ Plotly.plot = function(gd, data, layout, config) {
     function cleanUp() {
         // now we're REALLY TRULY done plotting...
         // so mark it as done and let other procedures call a replot
-        Lib.markTime('done plot');
         gd.emit('plotly_afterplot');
     }
 
@@ -641,9 +636,7 @@ function cleanLayout(layout) {
 
     // sanitize rgb(fractions) and rgba(fractions) that old tinycolor
     // supported, but new tinycolor does not because they're not valid css
-    Lib.markTime('finished rest of cleanLayout, starting color');
     Color.clean(layout);
-    Lib.markTime('finished cleanLayout color.clean');
 
     return layout;
 }

src/plots/cartesian/index.js

@@ -81,8 +81,6 @@ exports.plot = function(gd) {
             // plot all traces of this type on this subplot at once
             var cdModule = getCdModule(cdSubplot, _module);
             _module.plot(gd, subplotInfo, cdModule);
-
-            Lib.markTime('done ' + (cdModule[0] && cdModule[0][0].trace.type));
         }
     }
 };

src/traces/contour/plot.js

@@ -51,7 +51,6 @@ var BOTTOMSTART = [1, 9, 13, 104, 713],
     SADDLEREMAINDER = {1: 4, 2: 8, 4: 1, 7: 13, 8: 2, 11: 14, 13: 7, 14: 11};
 
 function plotOne(gd, plotinfo, cd) {
-    Lib.markTime('in Contour.plot');
     var trace = cd[0].trace,
         x = cd[0].x,
         y = cd[0].y,
@@ -103,8 +102,6 @@ function plotOne(gd, plotinfo, cd) {
     makeFills(plotGroup, pathinfo, perimeter, contours);
     makeLines(plotGroup, pathinfo, contours);
     clipGaps(plotGroup, plotinfo, cd[0], perimeter);
-
-    Lib.markTime('done Contour.plot');
 }
 
 function emptyPathinfo(contours, plotinfo, cd0) {

src/traces/heatmap/calc.js

@@ -23,8 +23,6 @@ var maxRowLength = require('./max_row_length');
 
 
 module.exports = function calc(gd, trace) {
-    Lib.markTime('start convert x&y');
-
     // prepare the raw data
     // run makeCalcdata on x and y even for heatmaps, in case of category mappings
     var xa = Axes.getFromId(gd, trace.xaxis || 'x'),
@@ -45,8 +43,6 @@ module.exports = function calc(gd, trace) {
     xa._minDtick = 0;
     ya._minDtick = 0;
 
-    Lib.markTime('done convert x&y');
-
     if(isHist) {
         var binned = histogram2dCalc(gd, trace);
         x = binned.x;

src/traces/heatmap/colorbar.js

@@ -41,6 +41,4 @@ module.exports = function colorbar(gd, cd) {
             .range(scl.map(function(v) { return v[1]; })))
         .filllevels({start: zmin, end: zmax, size: (zmax - zmin) / 254})
         .options(trace.colorbar)();
-
-    Lib.markTime('done colorbar');
 };

src/traces/heatmap/plot.js

@@ -28,8 +28,6 @@ module.exports = function(gd, plotinfo, cdheatmaps) {
 
 // From http://www.xarg.org/2010/03/generate-client-side-png-files-using-javascript/
 function plotOne(gd, plotinfo, cd) {
-    Lib.markTime('in Heatmap.plot');
-
     var trace = cd[0].trace,
         uid = trace.uid,
         xa = plotinfo.x(),
@@ -286,8 +284,6 @@ function plotOne(gd, plotinfo, cd) {
         return setColor(z00 + xinterp.frac * dx + yinterp.frac * (dy + xinterp.frac * dxy));
     }
 
-    Lib.markTime('done init png');
-
     if(zsmooth) { // best or fast, works fastest with imageData
         var pxIndex = 0,
             pixels = new Uint8Array(imageWidth * imageHeight * 4);
@@ -359,8 +355,6 @@ function plotOne(gd, plotinfo, cd) {
         }
     }
 
-    Lib.markTime('done filling png');
-
     rcount = Math.round(rcount / pixcount);
     gcount = Math.round(gcount / pixcount);
     bcount = Math.round(bcount / pixcount);
@@ -391,6 +385,4 @@ function plotOne(gd, plotinfo, cd) {
         y: top,
         preserveAspectRatio: 'none'
     });
-
-    Lib.markTime('done showing png');
 }

src/traces/histogram2d/calc.js

@@ -33,7 +33,6 @@ module.exports = function calc(gd, trace) {
     if(x.length > serieslen) x.splice(serieslen, x.length - serieslen);
     if(y.length > serieslen) y.splice(serieslen, y.length - serieslen);
 
-    Lib.markTime('done convert data');
 
     // calculate the bins
     if(trace.autobinx || !('xbins' in trace)) {
@@ -54,7 +53,6 @@ module.exports = function calc(gd, trace) {
         }
         trace._input.ybins = trace.ybins;
     }
-    Lib.markTime('done autoBin');
 
     // make the empty bin array & scale the map
     z = [];
@@ -138,7 +136,6 @@ module.exports = function calc(gd, trace) {
     }
 
 
-    Lib.markTime('done making bins');
     // put data into bins
     for(i = 0; i < serieslen; i++) {
         n = Lib.findBin(x[i], xbins);
@@ -154,7 +151,6 @@ module.exports = function calc(gd, trace) {
     if(normfunc) {
         for(m = 0; m < ny; m++) normfunc(z[m], total, xinc, yinc[m]);
     }
-    Lib.markTime('done binning');
 
     return {
         x: x,

src/traces/scatter/calc.js

@@ -21,13 +21,9 @@ var calcMarkerColorscale = require('./marker_colorscale_calc');
 module.exports = function calc(gd, trace) {
     var xa = Axes.getFromId(gd, trace.xaxis || 'x'),
         ya = Axes.getFromId(gd, trace.yaxis || 'y');
-    Lib.markTime('in Scatter.calc');
 
-    var x = xa.makeCalcdata(trace, 'x');
-    Lib.markTime('finished convert x');
-
-    var y = ya.makeCalcdata(trace, 'y');
-    Lib.markTime('finished convert y');
+    var x = xa.makeCalcdata(trace, 'x'),
+        y = ya.makeCalcdata(trace, 'y');
 
     var serieslen = Math.min(x.length, y.length),
         marker,
@@ -111,11 +107,8 @@ module.exports = function calc(gd, trace) {
         yOptions.padded = false;
     }
 
-    Lib.markTime('ready for Axes.expand');
     Axes.expand(xa, x, xOptions);
-    Lib.markTime('done expand x');
     Axes.expand(ya, y, yOptions);
-    Lib.markTime('done expand y');
 
     // create the "calculated data" to plot
     var cd = new Array(serieslen);

src/traces/scatter/colorbar.js

@@ -48,6 +48,4 @@ module.exports = function colorbar(gd, cd) {
             .range(scl.map(function(v) { return v[1]; })))
         .filllevels({start: cmin, end: cmax, size: (cmax - cmin) / 254})
         .options(marker.colorbar)();
-
-    Lib.markTime('done colorbar');
 };