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

Merge branch 'QA_3_5-jqplot' of git://github.com/lem9/phpmyadmin into QA_3_5-jqplot

Browse Source
This commit is contained in:
Atul Pratap Singh 2012-09-20 01:22:47 +05:30
commit 85dc955afb
2 changed files with 6 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
js/functions.js
View File

@ -1686,46 +1686,9 @@ function PMA_createChart(passedSettings)
return new Highcharts.Chart(settings);
}
/*
* Creates a Profiling Chart. Used in server_status_monitor.js
*/
function PMA_createProfilingChart(data, options)
{
return PMA_createChart($.extend(true, {
chart: {
renderTo: 'profilingchart',
type: 'pie'
},
title: { text:'', margin:0 },
series: [{
type: 'pie',
name: PMA_messages['strQueryExecutionTime'],
data: data
}],
plotOptions: {
pie: {
allowPointSelect: true,
cursor: 'pointer',
dataLabels: {
enabled: true,
distance: 35,
formatter: function() {
return '<b>'+ this.point.name +'</b><br/>'+ Highcharts.numberFormat(this.percentage, 2) +' %';
}
}
}
},
tooltip: {
formatter: function() {
return '<b>'+ this.point.name +'</b><br/>'+PMA_prettyProfilingNum(this.y)+'<br/>('+Highcharts.numberFormat(this.percentage, 2) +' %)';
}
}
},options));
}
/*
* Creates a Profiling Chart with jqplot. Used in sql.js
* and in server_status_monitor.js
*/
function PMA_createProfilingChartJqplot(target, data)
{
@ -1767,7 +1730,7 @@ function PMA_createProfilingChartJqplot(target, data)
}
/**
* Formats a profiling duration nicely (in us and ms time). Used in PMA_createProfilingChart() and server_status.js
* Formats a profiling duration nicely (in us and ms time). Used in server_status.js
*
* @param integer Number to be formatted, should be in the range of microsecond to second
* @param integer Acuracy, how many numbers right to the comma should be

15
js/server_status_monitor.js
View File

@ -2017,17 +2017,10 @@ $(function() {
return false;
});
profilingChart = PMA_createProfilingChart(chartData, {
chart: {
renderTo: 'queryProfiling'
},
plotOptions: {
pie: {
size: '50%'
}
}
});
profilingChart = PMA_createProfilingChartJqplot(
'queryProfiling',
chartData
);
$('div#queryProfiling').resizable();
}