From a3c5caa2758b0685fe8c48079df8ff2d23d54770 Mon Sep 17 00:00:00 2001 From: Alex de Mulder Date: Tue, 24 Jun 2014 18:18:14 +0200 Subject: [PATCH] ready for optimalization. --- dist/vis.js | 8 +++++ examples/graph2d/08_performance.html | 53 +++++++++++++++------------- src/timeline/component/Linegraph.js | 8 +++++ 3 files changed, 45 insertions(+), 24 deletions(-) diff --git a/dist/vis.js b/dist/vis.js index 140a1682..9001434f 100644 --- a/dist/vis.js +++ b/dist/vis.js @@ -3660,6 +3660,13 @@ Linegraph.prototype.setOptions = function(options) { this.legendRight.setOptions(this.options.legend); } } + + if (this.groups.hasOwnProperty(UNGROUPED)) { + this.groups[UNGROUPED].setOptions(options); + } + } + if (this.dom.frame) { + this._updateGraph(); } }; @@ -4197,6 +4204,7 @@ Linegraph.prototype._prepareData = function (datapoints, options) { if (options.yAxisOrientation == 'right') { axis = this.yAxisRight; } + for (var i = 0; i < datapoints.length; i++) { xValue = Math.round(toScreen(datapoints[i].x) + this.width - 1); yValue = Math.round(axis.convertValue(datapoints[i].y)); diff --git a/examples/graph2d/08_performance.html b/examples/graph2d/08_performance.html index d9fbb923..13c559e9 100644 --- a/examples/graph2d/08_performance.html +++ b/examples/graph2d/08_performance.html @@ -19,62 +19,65 @@

Graph2D | Performance

- This example shows the some of the graphs outlined on the right side using the yAxisOrientation option within the groups. - We also show a few more custom styles for the graphs. Finally, the legend is manually positioned. Both the left and right axis - have their own legend. If one of the axis is unused, the legend is not shown. The options for the legend have been split - in a left and a right segment. The default position of the left axis has been changed. - - + This example is a test of the performance of the Graph2D. Select the amount of datapoints you want to plot and press draw. + You can choose between the style of the points as well as the interpolation method. This can only be toggled with the buttons.

- + Interpolation method: + Points style:
+