fixed mainchart control refresh and size
Costa Tsaousis (ktsaou) committed
Oct 4, 2015 at 00:08 UTC
6c717cbe437704c19a40ba524b4ab202d93d1069
1 file changed
+10
-7
web/index.js
+10
-7
@@ -111,14 +111,17 @@ function initMainChart(c) {
111
mainchart.chartOptions.explorer = null;
112
mainchart.chart = null;
113
114
+ mainchart.before = 0;
115
+ mainchart.after = 0;
116
+
117
mainchart.chartOptions.width = screenWidth();
118
mainchart.chartOptions.height = $(window).height() - 150 - MAINCHART_CONTROL_HEIGHT;
119
if(mainchart.chartOptions.height < 300) mainchart.chartOptions.height = 300;
120
121
mainchart.div = 'maingraph';
119
- mainchart.time_to_show = (mainchart.last_entry_t - mainchart.first_entry_t) / MAINCHART_INITIAL_SELECTOR;
120
- if(mainchart.time_to_show < MAINCHART_INITIAL_SELECTOR) mainchart.time_to_show = MAINCHART_INITIAL_SELECTOR;
121
- calculateChartPointsToShow(mainchart, mainchart.chartOptions.isStacked?MAINCHART_STACKED_POINTS_DIVISOR:MAINCHART_POINTS_DIVISOR, mainchart.time_to_show, 0);
122
+ mainchart.max_time_to_show = (mainchart.last_entry_t - mainchart.first_entry_t) / MAINCHART_INITIAL_SELECTOR;
123
+ if(mainchart.max_time_to_show < mainchart.update_every * MAINCHART_INITIAL_SELECTOR) mainchart.max_time_to_show = mainchart.update_every * MAINCHART_INITIAL_SELECTOR;
124
+ calculateChartPointsToShow(mainchart, mainchart.chartOptions.isStacked?MAINCHART_STACKED_POINTS_DIVISOR:MAINCHART_POINTS_DIVISOR, mainchart.max_time_to_show, 0);
125
126
// copy it to the hidden chart
127
mainchart.hiddenchart = $.extend(true, {}, mainchart);
@@ -149,7 +152,7 @@ function refreshHiddenChart(doNext) {
152
153
// is it too soon for a refresh?
154
var now = new Date().getTime();
152
- if((now - mainchart.hiddenchart.last_updated) < (mainchart.hiddenchart.group * mainchart.hiddenchart.update_every * 1000)) {
155
+ if((now - mainchart.hiddenchart.last_updated) < (mainchart.update_every * 10 * 1000) || (now - mainchart.hiddenchart.last_updated) < (mainchart.hiddenchart.group * mainchart.hiddenchart.update_every * 1000)) {
156
if(typeof doNext == "function") doNext();
157
return;
158
}
@@ -223,7 +226,7 @@ function refreshHiddenChart(doNext) {
226
}
227
if(refresh_mode != REFRESH_PAUSED) {
228
mainchart.control_wrapper.setState({range: {
226
- start: new Date((Math.round(new Date().getTime() / 1000) - mainchart.hiddenchart.time_to_show) * 1000),
229
+ start: new Date(now - (mainchart.max_time_to_show * 1000)),
230
end: new Date()
231
}});
232
}
@@ -309,7 +312,7 @@ function setMainChartGroup(g, norefresh) {
312
mainchart.group = g;
313
314
if(!mainchart.before && !mainchart.after)
312
- calculateChartPointsToShow(mainchart, mainchart.chartOptions.isStacked?MAINCHART_STACKED_POINTS_DIVISOR:MAINCHART_POINTS_DIVISOR, mainchart.time_to_show, mainchart.group);
315
+ calculateChartPointsToShow(mainchart, mainchart.chartOptions.isStacked?MAINCHART_STACKED_POINTS_DIVISOR:MAINCHART_POINTS_DIVISOR, mainchart.max_time_to_show, mainchart.group);
316
else
317
calculateChartPointsToShow(mainchart, mainchart.chartOptions.isStacked?MAINCHART_STACKED_POINTS_DIVISOR:MAINCHART_POINTS_DIVISOR, 0, mainchart.group);
318
@@ -350,7 +353,7 @@ function setMainChartPlay(p) {
353
//mainchart.chartOptions.explorer = null;
354
mainchart.after = 0;
355
mainchart.before = 0;
353
- calculateChartPointsToShow(mainchart, mainchart.chartOptions.isStacked?MAINCHART_STACKED_POINTS_DIVISOR:MAINCHART_POINTS_DIVISOR, mainchart.time_to_show, 0);
356
+ calculateChartPointsToShow(mainchart, mainchart.chartOptions.isStacked?MAINCHART_STACKED_POINTS_DIVISOR:MAINCHART_POINTS_DIVISOR, mainchart.max_time_to_show, 0);
357
$('#group' + mainchart.group).trigger('click');
358
mainchart.last_updated = 0;
359
mainchart.hiddenchart.last_updated = 0;