From: Robert Konigsberg <konigsberg@gmail.com>
Date: Thu, 6 Jun 2013 02:11:44 +0000 (-0700)
Subject: Merge pull request #250 from wimme/patch-4
X-Git-Tag: v1.0.0~25
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=ba57e1bb6097fe00538c146fea845d8931f819f0;hp=-c;p=dygraphs.git

Merge pull request #250 from wimme/patch-4

LogScale and customBars with negative values
---

ba57e1bb6097fe00538c146fea845d8931f819f0
diff --combined dygraph.js
index bd11c24,752c94d..dc3b798
--- a/dygraph.js
+++ b/dygraph.js
@@@ -985,7 -985,8 +985,7 @@@ Dygraph.prototype.createInterface_ = fu
    var enclosing = this.maindiv_;
  
    this.graphDiv = document.createElement("div");
 -  this.graphDiv.style.width = this.width_ + "px";
 -  this.graphDiv.style.height = this.height_ + "px";
 +
    // TODO(danvk): any other styles that are useful to set here?
    this.graphDiv.style.textAlign = 'left';  // This is a CSS "reset"
    enclosing.appendChild(this.graphDiv);
@@@ -993,8 -994,10 +993,8 @@@
    // Create the canvas for interactive parts of the chart.
    this.canvas_ = Dygraph.createCanvas();
    this.canvas_.style.position = "absolute";
 -  this.canvas_.width = this.width_;
 -  this.canvas_.height = this.height_;
 -  this.canvas_.style.width = this.width_ + "px";    // for IE
 -  this.canvas_.style.height = this.height_ + "px";  // for IE
 +
 +  this.resizeElements_();
  
    this.canvas_ctx_ = Dygraph.getContext(this.canvas_);
  
@@@ -1028,8 -1031,8 +1028,8 @@@
      }
    };
  
 -  this.addEvent(window, 'mouseout', this.mouseOutHandler_);
 -  this.addEvent(this.mouseEventElement_, 'mousemove', this.mouseMoveHandler_);
 +  this.addAndTrackEvent(window, 'mouseout', this.mouseOutHandler_);
 +  this.addAndTrackEvent(this.mouseEventElement_, 'mousemove', this.mouseMoveHandler_);
  
    // Don't recreate and register the resize handler on subsequent calls.
    // This happens when the graph is resized.
@@@ -1040,28 -1043,16 +1040,28 @@@
  
      // Update when the window is resized.
      // TODO(danvk): drop frames depending on complexity of the chart.
 -    this.addEvent(window, 'resize', this.resizeHandler_);
 +    this.addAndTrackEvent(window, 'resize', this.resizeHandler_);
    }
  };
  
 +Dygraph.prototype.resizeElements_ = function() {
 +  this.graphDiv.style.width = this.width_ + "px";
 +  this.graphDiv.style.height = this.height_ + "px";
 +  this.canvas_.width = this.width_;
 +  this.canvas_.height = this.height_;
 +  this.canvas_.style.width = this.width_ + "px";    // for IE
 +  this.canvas_.style.height = this.height_ + "px";  // for IE
 +};
 +
  /**
   * Detach DOM elements in the dygraph and null out all data references.
   * Calling this when you're done with a dygraph can dramatically reduce memory
   * usage. See, e.g., the tests/perf.html example.
   */
  Dygraph.prototype.destroy = function() {
 +  this.canvas_ctx_.restore();
 +  this.hidden_ctx_.restore();
 +
    var removeRecursive = function(node) {
      while (node.hasChildNodes()) {
        removeRecursive(node.firstChild);
@@@ -1069,11 -1060,19 +1069,11 @@@
      }
    };
  
 -  if (this.registeredEvents_) {
 -    for (var idx = 0; idx < this.registeredEvents_.length; idx++) {
 -      var reg = this.registeredEvents_[idx];
 -      Dygraph.removeEvent(reg.elem, reg.type, reg.fn);
 -    }
 -  }
 -
 -  this.registeredEvents_ = [];
 +  this.removeTrackedEvents_();
  
    // remove mouse event handlers (This may not be necessary anymore)
    Dygraph.removeEvent(window, 'mouseout', this.mouseOutHandler_);
    Dygraph.removeEvent(this.mouseEventElement_, 'mousemove', this.mouseMoveHandler_);
 -  Dygraph.removeEvent(this.mouseEventElement_, 'mouseup', this.mouseUpHandler_);
  
    // remove window handlers
    Dygraph.removeEvent(window,'resize',this.resizeHandler_);
@@@ -1345,13 -1344,19 +1345,13 @@@ Dygraph.prototype.createDragInterface_ 
  
    for (var eventName in interactionModel) {
      if (!interactionModel.hasOwnProperty(eventName)) continue;
 -    this.addEvent(this.mouseEventElement_, eventName,
 +    this.addAndTrackEvent(this.mouseEventElement_, eventName,
          bindHandler(interactionModel[eventName]));
    }
  
 -  // unregister the handler on subsequent calls.
 -  // This happens when the graph is resized.
 -  if (this.mouseUpHandler_) {
 -    Dygraph.removeEvent(document, 'mouseup', this.mouseUpHandler_);
 -  }
 -
    // If the user releases the mouse button during a drag, but not over the
    // canvas, then it doesn't count as a zooming action.
 -  this.mouseUpHandler_ = function(event) {
 +  var mouseUpHandler = function(event) {
      if (context.isZooming || context.isPanning) {
        context.isZooming = false;
        context.dragStartX = null;
@@@ -1371,7 -1376,7 +1371,7 @@@
      context.tarp.uncover();
    };
  
 -  this.addEvent(document, 'mouseup', this.mouseUpHandler_);
 +  this.addAndTrackEvent(document, 'mouseup', mouseUpHandler);
  };
  
  /**
@@@ -2231,15 -2236,6 +2231,15 @@@ Dygraph.prototype.predraw_ = function(
      this.cascadeEvents_('clearChart');
      this.plotter_.clear();
    }
 +
 +  if(!this.is_initial_draw_) {
 +    this.canvas_ctx_.restore();
 +    this.hidden_ctx_.restore();
 +  }
 +
 +  this.canvas_ctx_.save();
 +  this.hidden_ctx_.save();
 +
    this.plotter_ = new DygraphCanvasRenderer(this,
                                              this.hidden_,
                                              this.hidden_ctx_,
@@@ -2484,6 -2480,7 +2484,6 @@@ Dygraph.prototype.drawGraph_ = function
    // Save the X axis zoomed status as the updateOptions call will tend to set it erroneously
    var tmp_zoomed_x = this.zoomed_x_;
    // Tell PlotKit to use this new data and render itself
 -  this.layout_.setDateWindow(this.dateWindow_);
    this.zoomed_x_ = tmp_zoomed_x;
    this.layout_.evaluateWithError();
    this.renderGraph_(is_initial_draw);
@@@ -2824,12 -2821,20 +2824,20 @@@ Dygraph.prototype.extractSeries_ = func
      if (logScale) {
        // On the log scale, points less than zero do not exist.
        // This will create a gap in the chart.
-       if (point <= 0) {
+       if (errorBars || customBars) {
+         // point.length is either 2 (errorBars) or 3 (customBars)
+         for (var k = 0; k < point.length; k++) {
+           if (point[k] <= 0) {
+             point = null;
+             break;
+           }
+         }
+       } else if (point <= 0) {
          point = null;
        }
      }
      // Fix null points to fit the display type standard.
-     if(point !== null) {
+     if (point !== null) {
        series.push([x, point]);
      } else {
        series.push([x, errorBars ? [null, null] : customBars ? [null, null, null] : point]);
@@@ -3597,9 -3602,17 +3605,9 @@@ Dygraph.prototype.resize = function(wid
      this.height_ = this.maindiv_.clientHeight;
    }
  
 +  this.resizeElements_();
 +
    if (old_width != this.width_ || old_height != this.height_) {
 -    // TODO(danvk): there should be a clear() method.
 -    this.maindiv_.innerHTML = "";
 -    this.roller_ = null;
 -    this.attrs_.labelsDiv = null;
 -    this.createInterface_();
 -    if (this.annotations_.length) {
 -      // createInterface_ reset the layout, so we need to do this.
 -      this.layout_.setAnnotations(this.annotations_);
 -    }
 -    this.createDragInterface_();
      this.predraw_();
    }