1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/1b8b87437c7e/ Changeset: 1b8b87437c7e User: guerler Date: 2014-03-07 02:24:08 Summary: Charts: Fix column number Affected #: 4 files diff -r c58e14ae86d182f8152edbfe2569857da54ccb49 -r 1b8b87437c7e0b8e7a9f6a51b0ec910237e514f1 config/plugins/visualizations/charts/static/charts/histogram.js --- a/config/plugins/visualizations/charts/static/charts/histogram.js +++ b/config/plugins/visualizations/charts/static/charts/histogram.js @@ -34,7 +34,11 @@ self.d3_chart = nv.models.multiBarChart(); self.d3_chart.xAxis.tickFormat(d3.format('.2f')) - self.d3_chart.yAxis.tickFormat(d3.format('.1f')) + .axisLabel('Breaks'); + + self.d3_chart.yAxis.tickFormat(d3.format('.3f')) + .axisLabel('Frequency') + .axisLabelDistance(30); self.options.svg.datum(data) .call(self.d3_chart); diff -r c58e14ae86d182f8152edbfe2569857da54ccb49 -r 1b8b87437c7e0b8e7a9f6a51b0ec910237e514f1 config/plugins/visualizations/charts/static/library/datasets.js --- a/config/plugins/visualizations/charts/static/library/datasets.js +++ b/config/plugins/visualizations/charts/static/library/datasets.js @@ -115,7 +115,7 @@ // read value from row var v = row[index]; - if(isNaN(v)) { + if(isNaN(v) || !v) { v = 0; } diff -r c58e14ae86d182f8152edbfe2569857da54ccb49 -r 1b8b87437c7e0b8e7a9f6a51b0ec910237e514f1 config/plugins/visualizations/charts/static/models/types.js --- a/config/plugins/visualizations/charts/static/models/types.js +++ b/config/plugins/visualizations/charts/static/models/types.js @@ -14,6 +14,14 @@ } } }, + 'horizontal' : { + title : 'Bar diagram (horizontal)', + columns : { + y : { + title : 'Values for y-axis' + } + } + }, 'histogram' : { title : 'Histogram', mode : 'execute', @@ -23,14 +31,6 @@ } } }, - 'horizontal' : { - title : 'Bar diagram (horizontal)', - columns : { - y : { - title : 'Values for y-axis' - } - } - }, 'line' : { title : 'Line chart', columns : { diff -r c58e14ae86d182f8152edbfe2569857da54ccb49 -r 1b8b87437c7e0b8e7a9f6a51b0ec910237e514f1 config/plugins/visualizations/charts/static/views/viewport.js --- a/config/plugins/visualizations/charts/static/views/viewport.js +++ b/config/plugins/visualizations/charts/static/views/viewport.js @@ -246,13 +246,12 @@ var group_index = 0; chart.groups.each(function(group) { for (var key in chart_settings.columns) { - request_string += key + '_' + (++group_index) + ':' + group.get(key) + ', '; + request_string += key + '_' + (++group_index) + ':' + (parseInt(group.get(key)) + 1) + ', '; } }); // return - return 'columns : 2'; - //return request_string.substring(0, request_string.length - 2); + return request_string.substring(0, request_string.length - 2); }, // create default chart request 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.