better calculation of mainchart default time to show
Costa Tsaousis (ktsaou) committed
Jun 15, 2014 at 04:17 UTC
203023d659bbd490cab53c0cec6d4083e37af845
1 file changed
+7
-8
web/index.js
+7
-8
@@ -16,7 +16,7 @@ var MAINCHART_STACKED_POINTS_DIVISOR = 20; // how much detailed will the main c
16
17
var MAINCHART_CONTROL_HEIGHT = 75; // how tall the control chart will be
18
var MAINCHART_CONTROL_DIVISOR = 2; // how much detailed will the control chart be? 1 = finest, higher is faster
19
-var MAINCHART_INITIAL_SELECTOR=10; // 1/10 of the width
19
+var MAINCHART_INITIAL_SELECTOR= 20; // 1/20th of the width, this overrides MAINCHART_MAX_TIME_TO_SHOW
20
21
var MODE_THUMBS = 1;
22
var MODE_MAIN = 2;
@@ -108,7 +108,9 @@ function initMainChart(c) {
108
if(mainchart.chartOptions.height < 300) mainchart.chartOptions.height = 300;
109
110
mainchart.div = 'maingraph';
111
- calculateChartPointsToShow(mainchart, mainchart.chartOptions.isStacked?MAINCHART_STACKED_POINTS_DIVISOR:MAINCHART_POINTS_DIVISOR, MAINCHART_MAX_TIME_TO_SHOW, 0);
111
+ mainchart.time_to_show = (mainchart.hiddenchart.last_entry_t - mainchart.hiddenchart.first_entry_t) / MAINCHART_INITIAL_SELECTOR;
112
+ if(mainchart.time_to_show < MAINCHART_INITIAL_SELECTOR) mainchart.time_to_show = MAINCHART_INITIAL_SELECTOR;
113
+ calculateChartPointsToShow(mainchart, mainchart.chartOptions.isStacked?MAINCHART_STACKED_POINTS_DIVISOR:MAINCHART_POINTS_DIVISOR, mainchart.time_to_show, 0);
114
115
// copy it to the hidden chart
116
mainchart.hiddenchart = $.extend(true, {}, mainchart);
@@ -212,11 +214,8 @@ function refreshHiddenChart(doNext) {
214
mainchart.dashboard.bind(mainchart.control_wrapper, mainchart.hidden_wrapper);
215
}
216
if(refresh_mode != REFRESH_PAUSED) {
215
- var duration = (mainchart.hiddenchart.last_entry_t - mainchart.hiddenchart.first_entry_t) / MAINCHART_INITIAL_SELECTOR;
216
- if(duration <= 0) duration = MAINCHART_INITIAL_SELECTOR;
217
-
217
mainchart.control_wrapper.setState({range: {
219
- start: new Date((Math.round(new Date().getTime() / 1000) - duration) * 1000),
218
+ start: new Date((Math.round(new Date().getTime() / 1000) - mainchart.hiddenchart.time_to_show) * 1000),
219
end: new Date()
220
}});
221
}
@@ -302,7 +301,7 @@ function setMainChartGroup(g, norefresh) {
301
mainchart.group = g;
302
303
if(!mainchart.before && !mainchart.after)
305
- calculateChartPointsToShow(mainchart, mainchart.chartOptions.isStacked?MAINCHART_STACKED_POINTS_DIVISOR:MAINCHART_POINTS_DIVISOR, MAINCHART_MAX_TIME_TO_SHOW, mainchart.group);
304
+ calculateChartPointsToShow(mainchart, mainchart.chartOptions.isStacked?MAINCHART_STACKED_POINTS_DIVISOR:MAINCHART_POINTS_DIVISOR, mainchart.time_to_show, mainchart.group);
305
else
306
calculateChartPointsToShow(mainchart, mainchart.chartOptions.isStacked?MAINCHART_STACKED_POINTS_DIVISOR:MAINCHART_POINTS_DIVISOR, 0, mainchart.group);
307
@@ -343,7 +342,7 @@ function setMainChartPlay(p) {
342
//mainchart.chartOptions.explorer = null;
343
mainchart.after = 0;
344
mainchart.before = 0;
346
- calculateChartPointsToShow(mainchart, mainchart.chartOptions.isStacked?MAINCHART_STACKED_POINTS_DIVISOR:MAINCHART_POINTS_DIVISOR, MAINCHART_MAX_TIME_TO_SHOW, 0);
345
+ calculateChartPointsToShow(mainchart, mainchart.chartOptions.isStacked?MAINCHART_STACKED_POINTS_DIVISOR:MAINCHART_POINTS_DIVISOR, mainchart.time_to_show, 0);
346
$('#group' + mainchart.group).trigger('click');
347
mainchart.last_updated = 0;
348
mainchart.hiddenchart.last_updated = 0;