1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/833ec0356dbf/ Changeset: 833ec0356dbf User: guerler Date: 2014-06-15 02:46:11 Summary: Charts: Fix formatting, clean up color schemes Affected #: 2 files diff -r 56a24bfc4d155bb0df1875a6225cf1e71b8947b3 -r 833ec0356dbfbb8c14d9720620e33773a1564647 config/plugins/visualizations/charts/static/charts/forms/default.js --- a/config/plugins/visualizations/charts/static/charts/forms/default.js +++ b/config/plugins/visualizations/charts/static/charts/forms/default.js @@ -68,17 +68,10 @@ } }, { - label : 'Rounded', - value : 'r', - operations : { - show : ['x_axis_precision'] - } - }, - { label : 'SI-prefix', value : 's', operations : { - show : ['x_axis_precision'] + hide : ['x_axis_precision'] } } ] @@ -91,27 +84,27 @@ data : [ { label : '0.00001', - value : '.5' + value : '5' }, { label : '0.0001', - value : '.4' + value : '4' }, { label : '0.001', - value : '.3' + value : '3' }, { label : '0.01', - value : '.2' + value : '2' }, { label : '0.1', - value : '.1' + value : '1' }, { label : '1', - value : '1' + value : '0' } ] @@ -176,17 +169,10 @@ } }, { - label : 'Rounded', - value : 'r', - operations : { - show : ['y_axis_precision'] - } - }, - { label : 'SI-prefix', value : 's', operations : { - show : ['y_axis_precision'] + hide : ['y_axis_precision'] } } ] @@ -199,27 +185,27 @@ data : [ { label : '0.00001', - value : '.5' + value : '5' }, { label : '0.0001', - value : '.4' + value : '4' }, { label : '0.001', - value : '.3' + value : '3' }, { label : '0.01', - value : '.2' + value : '2' }, { label : '0.1', - value : '.1' + value : '1' }, { label : '1', - value : '1' + value : '0' } ] diff -r 56a24bfc4d155bb0df1875a6225cf1e71b8947b3 -r 833ec0356dbfbb8c14d9720620e33773a1564647 config/plugins/visualizations/charts/static/charts/tools.js --- a/config/plugins/visualizations/charts/static/charts/tools.js +++ b/config/plugins/visualizations/charts/static/charts/tools.js @@ -268,7 +268,15 @@ }); } } else { - var d3format = d3.format(precision + type); + var d3format = function(d) { + switch (type) { + case 's' : + var prefix = d3.formatPrefix(d); + return prefix.scale(d).toFixed() + prefix.symbol; + default : + return d3.format('.' + precision + type)(d); + } + }; if (categories) { formatter(function(value) { var label = categories[value]; Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.