gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix xaxis ticks display while changing refresh rate for monitor charts

Browse Source
This commit is contained in:
Atul Pratap Singh 2013-01-12 00:44:30 +05:30
parent acc3fbaeb3
commit e2aace700a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/server_status_monitor.js
View File

@ -559,11 +559,6 @@ AJAX.registerOnload('server_status_monitor.js', function() {
runtime.xmin = new Date().getTime() - server_time_diff - runtime.gridMaxPoints * monitorSettings.gridRefresh;
runtime.xmax = new Date().getTime() - server_time_diff + monitorSettings.gridRefresh;
$.each(runtime.charts, function(key, value) {
value.chart['axes']['xaxis']['max'] = runtime.xmax;
value.chart['axes']['xaxis']['min'] = runtime.xmin;
});
runtime.refreshTimeout = setTimeout(refreshChartGrid, monitorSettings.gridRefresh);
saveMonitor(); // Save settings
@ -1530,8 +1525,12 @@ AJAX.registerOnload('server_status_monitor.js', function() {
}
// update chart options
elem.chart['axes']['xaxis']['max'] = runtime.xmax;
elem.chart['axes']['xaxis']['min'] = runtime.xmin;
// keep ticks number/positioning consistent while refreshrate changes
var tickInterval = (runtime.xmax - runtime.xmin)/5;
elem.chart['axes']['xaxis'].ticks = [(runtime.xmax - tickInterval*4),
(runtime.xmax - tickInterval*3), (runtime.xmax - tickInterval*2),
(runtime.xmax - tickInterval), runtime.xmax];
if (elem.title !== PMA_messages['strSystemCPUUsage']
&& elem.title !== PMA_messages['strQueryCacheEfficiency']
&& elem.title !== PMA_messages['strSystemMemory']