- galaxy-commits - lists.galaxyproject.org

commit/galaxy-central: guerler: Charts: Hide control elements
by commits-noreply＠bitbucket.org 08 Mar '14

08 Mar '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/e162e15c7d2e/ Changeset: e162e15c7d2e User: guerler Date: 2014-03-08 16:18:01 Summary: Charts: Hide control elements Affected #: 1 file diff -r 9d29df33bac909a04f172214934b6cb1c60db0e0 -r e162e15c7d2ef94e132e369c59d0d6f1dd42b329 config/plugins/visualizations/charts/static/charts/_nvd3/nvd3.js --- a/config/plugins/visualizations/charts/static/charts/_nvd3/nvd3.js +++ b/config/plugins/visualizations/charts/static/charts/_nvd3/nvd3.js @@ -37,6 +37,12 @@ nvd3_model.yAxis.axisLabel(chart.settings.get('y_axis_label')) .axisLabelDistance(30); + if (chart.groups.length == 1) { + nvd3_model.options({ showControls: false }); + } + + //nvd3_model.useInteractiveGuideline(true); + if (callback) { callback(nvd3_model); } 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.

1 0

commit/galaxy-central: guerler: Charts: Cache datasets
by commits-noreply＠bitbucket.org 08 Mar '14

08 Mar '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/9d29df33bac9/ Changeset: 9d29df33bac9 User: guerler Date: 2014-03-08 11:39:36 Summary: Charts: Cache datasets Affected #: 3 files diff -r 0e7b5c5cfcd9bb3fc13c9087d661597c064ba546 -r 9d29df33bac909a04f172214934b6cb1c60db0e0 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 @@ -4,6 +4,9 @@ // widget return Backbone.Collection.extend( { + // list of datasets + list: {}, + // initialize initialize: function(app, options) { @@ -19,22 +22,31 @@ // link this var self = this; - // wait for dataset - Utils.request('GET', config.root + 'api/datasets/' + options.id, {}, function(dataset) { - switch (dataset.state) { - case 'error': - if (error) { - error(dataset); - } - break; - default: - if (options.groups) { - self._fetch(options, success); - } else { + // check if column data is requested + if (options.groups) { + this._fetch(options, success); + } else { + // check if dataset is available from cache + var dataset = this.list[options.id]; + if (dataset) { + success(dataset); + return; + } + + // request dataset + Utils.request('GET', config.root + 'api/datasets/' + options.id, {}, function(dataset) { + switch (dataset.state) { + case 'error': + if (error) { + error(dataset); + } + break; + default: + self.list[options.id] = dataset; success(dataset); - } - } - }); + } + }); + } }, // fetch data columns into dataset object diff -r 0e7b5c5cfcd9bb3fc13c9087d661597c064ba546 -r 9d29df33bac909a04f172214934b6cb1c60db0e0 config/plugins/visualizations/charts/static/library/ui-table-form.js --- a/config/plugins/visualizations/charts/static/library/ui-table-form.js +++ b/config/plugins/visualizations/charts/static/library/ui-table-form.js @@ -92,7 +92,7 @@ // combine field and info var $input = $('<div/>'); $input.append(field.$el); - $input.append('<div class="toolParamHelp">' + settings_def.info + '</div>'); + $input.append('<div class="toolParamHelp" style="font-size: 0.9em;">' + settings_def.info + '</div>'); // add row to table this.table.add('<span style="white-space: nowrap;">' + settings_def.title + '</span>'); diff -r 0e7b5c5cfcd9bb3fc13c9087d661597c064ba546 -r 9d29df33bac909a04f172214934b6cb1c60db0e0 config/plugins/visualizations/charts/templates/charts.mako --- a/config/plugins/visualizations/charts/templates/charts.mako +++ b/config/plugins/visualizations/charts/templates/charts.mako @@ -1,5 +1,6 @@ <% scripts = [ 'jquery/jquery.js', + 'jquery/select2.js', 'bootstrap.js', 'require.js', 'underscore.js', 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.

1 0

commit/galaxy-central: guerler: Charts: Validate column datatypes
by commits-noreply＠bitbucket.org 08 Mar '14

08 Mar '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/0e7b5c5cfcd9/ Changeset: 0e7b5c5cfcd9 User: guerler Date: 2014-03-08 08:43:54 Summary: Charts: Validate column datatypes Affected #: 2 files diff -r 5459de70fd325cbde3937034880266e36d98e97d -r 0e7b5c5cfcd9bb3fc13c9087d661597c064ba546 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 @@ -127,7 +127,7 @@ result[j].values.push(value); } } - + // callback callback(result); }); diff -r 5459de70fd325cbde3937034880266e36d98e97d -r 0e7b5c5cfcd9bb3fc13c9087d661597c064ba546 config/plugins/visualizations/charts/static/views/group.js --- a/config/plugins/visualizations/charts/static/views/group.js +++ b/config/plugins/visualizations/charts/static/views/group.js @@ -111,17 +111,21 @@ // add select field to list list[id] = select; } - + // get dataset this.app.datasets.request({id : dataset_id}, function(dataset) { // configure columns self.columns = []; var meta = dataset.metadata_column_types; - for (var key in meta){ - self.columns.push({ - 'label' : key + ' [' + meta[key] + ']', - 'value' : key - }); + for (var key in meta) { + // check type + if(meta[key] == 'int' || meta[key] == 'float') { + // add to selection + self.columns.push({ + 'label' : 'Column: ' + (parseInt(key) + 1) + ' [' + meta[key] + ']', + 'value' : key + }); + } } // update select fields 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.

1 0

commit/galaxy-central: guerler: Charts: Fix histogram column label
by commits-noreply＠bitbucket.org 08 Mar '14

08 Mar '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/5459de70fd32/ Changeset: 5459de70fd32 User: guerler Date: 2014-03-08 08:33:06 Summary: Charts: Fix histogram column label Affected #: 1 file diff -r f744a6191603bfa6cdbd2c5b5bddba74aa66866d -r 5459de70fd325cbde3937034880266e36d98e97d config/plugins/visualizations/charts/static/charts/histogram/config.js --- a/config/plugins/visualizations/charts/static/charts/histogram/config.js +++ b/config/plugins/visualizations/charts/static/charts/histogram/config.js @@ -4,8 +4,8 @@ title : 'Histogram', mode : 'execute', columns : { - x : { - title : 'Values for x-axis' + y : { + title : 'Observations' } }, settings : { 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.

1 0

commit/galaxy-central: guerler: Charts: Switch to options tab on double click
by commits-noreply＠bitbucket.org 08 Mar '14

08 Mar '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/f744a6191603/ Changeset: f744a6191603 User: guerler Date: 2014-03-08 08:25:04 Summary: Charts: Switch to options tab on double click Affected #: 1 file diff -r ee10590fc2bad868ed46db49f2dd29346672ab26 -r f744a6191603bfa6cdbd2c5b5bddba74aa66866d config/plugins/visualizations/charts/static/views/chart.js --- a/config/plugins/visualizations/charts/static/views/chart.js +++ b/config/plugins/visualizations/charts/static/views/chart.js @@ -64,6 +64,9 @@ // update chart type self.chart.set({type: type}); }, + ondblclick : function(chart_id) { + self.tabs.show('settings'); + }, content: 'No chart types available' }); 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.

1 0

commit/galaxy-central: guerler: Charts: Set default axis labels
by commits-noreply＠bitbucket.org 08 Mar '14

08 Mar '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ee10590fc2ba/ Changeset: ee10590fc2ba User: guerler Date: 2014-03-08 08:22:30 Summary: Charts: Set default axis labels Affected #: 1 file diff -r def038539c985774345ae0a7382c61b9d3dfde6e -r ee10590fc2bad868ed46db49f2dd29346672ab26 config/plugins/visualizations/charts/static/charts/_nvd3/config.js --- a/config/plugins/visualizations/charts/static/charts/_nvd3/config.js +++ b/config/plugins/visualizations/charts/static/charts/_nvd3/config.js @@ -16,7 +16,7 @@ title : 'Axis label', info : 'Provide a label for the axis.', type : 'text', - init : '', + init : 'X-axis', placeholder : 'Axis label' }, x_axis_type : { @@ -96,7 +96,7 @@ title : 'Axis label', info : 'Provide a label for the axis.', type : 'text', - init : '', + init : 'Y-axis', placeholder : 'Axis label' }, y_axis_type : { 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.

1 0

commit/galaxy-central: guerler: Charts: Add title to configuration panel
by commits-noreply＠bitbucket.org 08 Mar '14

08 Mar '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/def038539c98/ Changeset: def038539c98 User: guerler Date: 2014-03-08 08:12:43 Summary: Charts: Add title to configuration panel Affected #: 4 files diff -r a384ace015505cdea2dafa907a04e9689aa4ec20 -r def038539c985774345ae0a7382c61b9d3dfde6e config/plugins/visualizations/charts/static/charts/histogram/config.js --- a/config/plugins/visualizations/charts/static/charts/histogram/config.js +++ b/config/plugins/visualizations/charts/static/charts/histogram/config.js @@ -9,8 +9,17 @@ } }, settings : { + x_axis_label : { + init : 'Breaks' + }, + y_axis_label : { + init : 'Density' + }, + y_axis_tick : { + init : '.3' + }, separator_custom : { - title : 'Histogram settings', + title : 'Advanced', type : 'separator' }, bin_size : { diff -r a384ace015505cdea2dafa907a04e9689aa4ec20 -r def038539c985774345ae0a7382c61b9d3dfde6e config/plugins/visualizations/charts/static/library/ui-table-form.js --- a/config/plugins/visualizations/charts/static/library/ui-table-form.js +++ b/config/plugins/visualizations/charts/static/library/ui-table-form.js @@ -8,17 +8,23 @@ // initialize initialize: function(options) { // ui elements + this.table_title = new Ui.Label({title: options.title}); this.table = new Table({content: options.content}); // create element var $view = $('<div/>'); - $view.append(Utils.wrap((new Ui.Label({title: options.title})).$el)); + $view.append(Utils.wrap(this.table_title.$el)); $view.append(Utils.wrap(this.table.$el)); // add element this.setElement($view); }, + // title + title: function(new_title) { + this.table_title.title(new_title); + }, + // update update: function(settings, model) { // reset table diff -r a384ace015505cdea2dafa907a04e9689aa4ec20 -r def038539c985774345ae0a7382c61b9d3dfde6e config/plugins/visualizations/charts/static/library/ui.js --- a/config/plugins/visualizations/charts/static/library/ui.js +++ b/config/plugins/visualizations/charts/static/library/ui.js @@ -18,6 +18,11 @@ this.setElement(this._template(this.options)); }, + // title + title: function(new_title) { + this.$el.find('b').html(new_title); + }, + // template _template: function(options) { return '<label><b>' + options.title + '</b></label>'; diff -r a384ace015505cdea2dafa907a04e9689aa4ec20 -r def038539c985774345ae0a7382c61b9d3dfde6e config/plugins/visualizations/charts/static/views/settings.js --- a/config/plugins/visualizations/charts/static/views/settings.js +++ b/config/plugins/visualizations/charts/static/views/settings.js @@ -40,9 +40,13 @@ if (!chart_type) { return; } + // get settings + var chart_definition = this.app.types.get(chart_type); + + // set title + this.form.title(chart_definition.title + ':'); // update table form model - var chart_definition = this.app.types.get(chart_type); this.form.update(chart_definition.settings, this.chart.settings); } }); 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.

1 0

commit/galaxy-central: guerler: Charts: Improve chart customization
by commits-noreply＠bitbucket.org 08 Mar '14

08 Mar '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a384ace01550/ Changeset: a384ace01550 User: guerler Date: 2014-03-08 07:53:04 Summary: Charts: Improve chart customization Affected #: 12 files diff -r a2f88681c8d9a3bf8d5f124be7ddf365c2e33eab -r a384ace015505cdea2dafa907a04e9689aa4ec20 config/plugins/visualizations/charts/static/charts/_nvd3/config.js --- a/config/plugins/visualizations/charts/static/charts/_nvd3/config.js +++ b/config/plugins/visualizations/charts/static/charts/_nvd3/config.js @@ -8,20 +8,166 @@ } }, settings : { + separator_label : { + title : 'X axis', + type : 'separator' + }, x_axis_label : { - title : 'Axis label (x)', - info : 'Provide a label for the \'x\' axis.', + title : 'Axis label', + info : 'Provide a label for the axis.', type : 'text', init : '', placeholder : 'Axis label' }, + x_axis_type : { + title : 'Axis value type', + info : 'Select the value type of the axis.', + type : 'select', + init : 'f', + data : [ + { + label : '-- Do not show values --', + value : 'hide' + }, + { + label : 'Float', + value : 'f' + }, + { + label : 'Exponent', + value : 'e' + }, + { + label : 'Integer', + value : 'd' + }, + { + label : 'Percentage', + value : 'p' + }, + { + label : 'Rounded', + value : 'r' + }, + { + label : 'SI-prefix', + value : 's' + } + ] + }, + x_axis_tick : { + title : 'Axis tick format', + info : 'Select the tick format for the axis.', + type : 'select', + init : '.1', + data : [ + { + label : '0.00001', + value : '.5' + }, + { + label : '0.0001', + value : '.4' + }, + { + label : '0.001', + value : '.3' + }, + { + label : '0.01', + value : '.2' + }, + { + label : '0.1', + value : '.1' + }, + { + label : '1', + value : '1' + } + ] + + }, + separator_tick : { + title : 'Y axis', + type : 'separator' + }, y_axis_label : { - title : 'Axis label (y)', - info : 'Provide a label for the \'y\' axis.', + title : 'Axis label', + info : 'Provide a label for the axis.', type : 'text', init : '', placeholder : 'Axis label' - } + }, + y_axis_type : { + title : 'Axis value type', + info : 'Select the value type of the axis.', + type : 'select', + init : 'f', + data : [ + { + label : '-- Do not show values --', + value : 'hide' + }, + { + label : 'Float', + value : 'f' + }, + { + label : 'Exponent', + value : 'e' + }, + { + label : 'Integer', + value : 'd' + }, + { + label : 'Percentage', + value : 'p' + }, + { + label : 'Rounded', + value : 'r' + }, + { + label : 'SI-prefix', + value : 's' + } + ] + }, + y_axis_tick : { + title : 'Axis tick format', + info : 'Select the tick format for the axis.', + type : 'select', + init : '.1', + data : [ + { + label : '0.00001', + value : '.5' + }, + { + label : '0.0001', + value : '.4' + }, + { + label : '0.001', + value : '.3' + }, + { + label : '0.01', + value : '.2' + }, + { + label : '0.1', + value : '.1' + }, + { + label : '1', + value : '1' + } + ] + + }, } }; diff -r a2f88681c8d9a3bf8d5f124be7ddf365c2e33eab -r a384ace015505cdea2dafa907a04e9689aa4ec20 config/plugins/visualizations/charts/static/charts/_nvd3/nvd3.js --- a/config/plugins/visualizations/charts/static/charts/_nvd3/nvd3.js +++ b/config/plugins/visualizations/charts/static/charts/_nvd3/nvd3.js @@ -18,12 +18,24 @@ this.app.datasets.request(request_dictionary, function(data) { nv.addGraph(function() { - nvd3_model.yAxis.tickFormat(d3.format('.1f')) - .axisLabel(chart.settings.get('y_axis_label', 'Frequency')) - .axisLabelDistance(30); + if (chart.settings.get('x_axis_type') == 'hide') { + nvd3_model.xAxis.tickFormat(function() { return '' }); + } else { + var tick = chart.settings.get('x_axis_tick') + chart.settings.get('x_axis_type'); + nvd3_model.xAxis.tickFormat(d3.format(tick)); + } - nvd3_model.xAxis.tickFormat(d3.format('.2f')) - .axisLabel(chart.settings.get('x_axis_label', 'Breaks')); + nvd3_model.xAxis.axisLabel(chart.settings.get('x_axis_label')); + + if (chart.settings.get('y_axis_type') == 'hide') { + nvd3_model.yAxis.tickFormat(function() { return '' }); + } else { + var tick = chart.settings.get('y_axis_tick') + chart.settings.get('y_axis_type'); + nvd3_model.yAxis.tickFormat(d3.format(tick)); + } + + nvd3_model.yAxis.axisLabel(chart.settings.get('y_axis_label')) + .axisLabelDistance(30); if (callback) { callback(nvd3_model); diff -r a2f88681c8d9a3bf8d5f124be7ddf365c2e33eab -r a384ace015505cdea2dafa907a04e9689aa4ec20 config/plugins/visualizations/charts/static/charts/histogram/config.js --- a/config/plugins/visualizations/charts/static/charts/histogram/config.js +++ b/config/plugins/visualizations/charts/static/charts/histogram/config.js @@ -9,8 +9,12 @@ } }, settings : { + separator_custom : { + title : 'Histogram settings', + type : 'separator' + }, bin_size : { - title : 'Number of Bins', + title : 'Number of bins', info : 'Provide the number of histogram bins. The parsed data will be evenly distributed into bins according to the minimum and maximum values of the dataset.', type : 'slider', init : 10, diff -r a2f88681c8d9a3bf8d5f124be7ddf365c2e33eab -r a384ace015505cdea2dafa907a04e9689aa4ec20 config/plugins/visualizations/charts/static/charts/histogram/histogram.js --- a/config/plugins/visualizations/charts/static/charts/histogram/histogram.js +++ b/config/plugins/visualizations/charts/static/charts/histogram/histogram.js @@ -27,10 +27,7 @@ } var nvd3 = new NVD3(this.app, this.options); - nvd3.draw(nv.models.multiBarChart(), chart, request_dictionary, function(nvd3_model) { - nvd3_model.xAxis.tickFormat(d3.format('.2f')); - nvd3_model.yAxis.tickFormat(d3.format('.3f')); - }); + nvd3.draw(nv.models.multiBarChart(), chart, request_dictionary); } }); diff -r a2f88681c8d9a3bf8d5f124be7ddf365c2e33eab -r a384ace015505cdea2dafa907a04e9689aa4ec20 config/plugins/visualizations/charts/static/charts/horizontal/config.js --- a/config/plugins/visualizations/charts/static/charts/horizontal/config.js +++ b/config/plugins/visualizations/charts/static/charts/horizontal/config.js @@ -2,6 +2,11 @@ return $.extend(true, {}, nvd3_config, { title : 'Bar diagram (horizontal)', + settings : { + x_axis_type : { + init : 'hide' + } + } }); }); \ No newline at end of file diff -r a2f88681c8d9a3bf8d5f124be7ddf365c2e33eab -r a384ace015505cdea2dafa907a04e9689aa4ec20 config/plugins/visualizations/charts/static/charts/horizontal/horizontal.js --- a/config/plugins/visualizations/charts/static/charts/horizontal/horizontal.js +++ b/config/plugins/visualizations/charts/static/charts/horizontal/horizontal.js @@ -14,9 +14,7 @@ draw : function(chart, request_dictionary) { var nvd3 = new NVD3(this.app, this.options); - nvd3.draw(nv.models.multiBarHorizontalChart(), chart, request_dictionary, function(nvd3_model) { - nvd3_model.xAxis.tickFormat(function() { return ''; }); - }); + nvd3.draw(nv.models.multiBarHorizontalChart(), chart, request_dictionary); } }); diff -r a2f88681c8d9a3bf8d5f124be7ddf365c2e33eab -r a384ace015505cdea2dafa907a04e9689aa4ec20 config/plugins/visualizations/charts/static/charts/scatterplot/scatterplot.js --- a/config/plugins/visualizations/charts/static/charts/scatterplot/scatterplot.js +++ b/config/plugins/visualizations/charts/static/charts/scatterplot/scatterplot.js @@ -18,9 +18,6 @@ nvd3_model.showDistX(true) .showDistY(true) .color(d3.scale.category10().range()); - nvd3_model.xAxis.tickFormat(d3.format('.02f')); - nvd3_model.yAxis.tickFormat(d3.format('.02f')); - }); } }); diff -r a2f88681c8d9a3bf8d5f124be7ddf365c2e33eab -r a384ace015505cdea2dafa907a04e9689aa4ec20 config/plugins/visualizations/charts/static/charts/stackedarea/config.js --- a/config/plugins/visualizations/charts/static/charts/stackedarea/config.js +++ b/config/plugins/visualizations/charts/static/charts/stackedarea/config.js @@ -1,7 +1,7 @@ define(['plugin/charts/_nvd3/config'], function(nvd3_config) { return $.extend(true, {}, nvd3_config, { - title : 'Stacked area', + title : 'Stacked area' }); }); \ No newline at end of file diff -r a2f88681c8d9a3bf8d5f124be7ddf365c2e33eab -r a384ace015505cdea2dafa907a04e9689aa4ec20 config/plugins/visualizations/charts/static/charts/stackedarea/stackedarea.js --- a/config/plugins/visualizations/charts/static/charts/stackedarea/stackedarea.js +++ b/config/plugins/visualizations/charts/static/charts/stackedarea/stackedarea.js @@ -19,7 +19,6 @@ nvd3_model.x(function(d) { return d.x }) .y(function(d) { return d.y }) .clipEdge(true); - nvd3_model.xAxis.tickFormat(function() { return ''; }); }); } }); diff -r a2f88681c8d9a3bf8d5f124be7ddf365c2e33eab -r a384ace015505cdea2dafa907a04e9689aa4ec20 config/plugins/visualizations/charts/static/library/ui-table-form.js --- a/config/plugins/visualizations/charts/static/library/ui-table-form.js +++ b/config/plugins/visualizations/charts/static/library/ui-table-form.js @@ -36,7 +36,8 @@ var field = null; // create select field - switch(settings_def.type) { + var type = settings_def.type; + switch(type) { // text input field case 'text' : field = new Ui.Input({ @@ -46,6 +47,15 @@ } }); break; + // select field + case 'select' : + field = new Ui.Select.View({ + data: settings_def.data, + onchange: function() { + model.set(id, field.value()); + } + }); + break; // slider input field case 'slider' : field = new Ui.Input({ @@ -55,6 +65,10 @@ } }); break; + // slider input field + case 'separator' : + field = $('<div/>'); + break; // skip unkown types default: console.log('ui-table-form:_add', 'Unknown setting type (' + settings_def.type + ')'); @@ -63,19 +77,26 @@ } // set value - if (!model.get(id)) { - model.set(id, settings_def.init); + if (type != 'separator') { + if (!model.get(id)) { + model.set(id, settings_def.init); + } + field.value(model.get(id)); + + // combine field and info + var $input = $('<div/>'); + $input.append(field.$el); + $input.append('<div class="toolParamHelp">' + settings_def.info + '</div>'); + + // add row to table + this.table.add('<span style="white-space: nowrap;">' + settings_def.title + '</span>'); + this.table.add($input); + } else { + this.table.add('<h6 style="white-space: nowrap;">' + settings_def.title + ':<h6/>'); + this.table.add($('<div/>')); } - field.value(model.get(id)); - // combine field and info - var $input = $('<div/>'); - $input.append(field.$el); - $input.append('<div class="toolParamHelp">' + settings_def.info + '</div>'); - - // add row to table - this.table.add('<span style="white-space: nowrap;">' + settings_def.title + ':</span>'); - this.table.add($input); + // add to table this.table.append(id); } }); diff -r a2f88681c8d9a3bf8d5f124be7ddf365c2e33eab -r a384ace015505cdea2dafa907a04e9689aa4ec20 config/plugins/visualizations/charts/static/library/ui.select.js --- a/config/plugins/visualizations/charts/static/library/ui.select.js +++ b/config/plugins/visualizations/charts/static/library/ui.select.js @@ -2,7 +2,7 @@ define(['utils/utils'], function(Utils) { // plugin -return Backbone.View.extend( +var View = Backbone.View.extend( { // options optionsDefault: { @@ -213,4 +213,8 @@ } }); +return { + View: View +} + }); diff -r a2f88681c8d9a3bf8d5f124be7ddf365c2e33eab -r a384ace015505cdea2dafa907a04e9689aa4ec20 config/plugins/visualizations/charts/static/views/group.js --- a/config/plugins/visualizations/charts/static/views/group.js +++ b/config/plugins/visualizations/charts/static/views/group.js @@ -93,7 +93,7 @@ // create select field var data_def = chart_settings.columns[id]; - var select = new Ui.Select({ + var select = new Ui.Select.View({ id : 'select_' + id, gid : id, onchange : function(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.

1 0

commit/galaxy-central: guerler: Charts: Modularize option form fields
by commits-noreply＠bitbucket.org 08 Mar '14

08 Mar '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a2f88681c8d9/ Changeset: a2f88681c8d9 User: guerler Date: 2014-03-08 05:53:16 Summary: Charts: Modularize option form fields Affected #: 2 files diff -r 7efdd4019ed122743ca920d2d30811737277d6a8 -r a2f88681c8d9a3bf8d5f124be7ddf365c2e33eab config/plugins/visualizations/charts/static/library/ui-table-form.js --- /dev/null +++ b/config/plugins/visualizations/charts/static/library/ui-table-form.js @@ -0,0 +1,87 @@ +// dependencies +define(['plugin/library/table', 'plugin/library/ui', 'utils/utils'], + function(Table, Ui, Utils) { + +// widget +var View = Backbone.View.extend( +{ + // initialize + initialize: function(options) { + // ui elements + this.table = new Table({content: options.content}); + + // create element + var $view = $('<div/>'); + $view.append(Utils.wrap((new Ui.Label({title: options.title})).$el)); + $view.append(Utils.wrap(this.table.$el)); + + // add element + this.setElement($view); + }, + + // update + update: function(settings, model) { + // reset table + this.table.removeAll(); + + // load settings elements into table + for (var id in settings) { + this._add(id, settings[id], model); + } + }, + + // add table row + _add: function(id, settings_def, model) { + // field wrapper + var field = null; + + // create select field + switch(settings_def.type) { + // text input field + case 'text' : + field = new Ui.Input({ + placeholder: settings_def.placeholder, + onchange: function() { + model.set(id, field.value()); + } + }); + break; + // slider input field + case 'slider' : + field = new Ui.Input({ + placeholder: settings_def.placeholder, + onchange: function() { + model.set(id, field.value()); + } + }); + break; + // skip unkown types + default: + console.log('ui-table-form:_add', 'Unknown setting type (' + settings_def.type + ')'); + return; + + } + + // set value + if (!model.get(id)) { + model.set(id, settings_def.init); + } + field.value(model.get(id)); + + // combine field and info + var $input = $('<div/>'); + $input.append(field.$el); + $input.append('<div class="toolParamHelp">' + settings_def.info + '</div>'); + + // add row to table + this.table.add('<span style="white-space: nowrap;">' + settings_def.title + ':</span>'); + this.table.add($input); + this.table.append(id); + } +}); + +return { + View : View +} + +}); \ No newline at end of file diff -r 7efdd4019ed122743ca920d2d30811737277d6a8 -r a2f88681c8d9a3bf8d5f124be7ddf365c2e33eab config/plugins/visualizations/charts/static/views/settings.js --- /dev/null +++ b/config/plugins/visualizations/charts/static/views/settings.js @@ -0,0 +1,50 @@ +// dependencies +define(['plugin/library/ui', 'plugin/library/ui-table-form', 'utils/utils'], + function(Ui, TableForm, Utils) { + +// widget +return Backbone.View.extend( +{ + // initialize + initialize: function(app, options) { + // link app + this.app = app; + + // link this + var self = this; + + // get current chart object + this.chart = this.app.chart; + + this.form = new TableForm.View({ + title : 'Chart options:', + content : 'This chart type does not provide any options.' + }); + + // set element + this.setElement(this.form.$el); + + // change + var self = this; + this.chart.on('change', function() { + self._refreshTable(); + }); + }, + + // update dataset + _refreshTable: function() { + // identify datasets + var chart_type = this.chart.get('type'); + + // check if dataset is available + if (!chart_type) { + return; + } + + // update table form model + var chart_definition = this.app.types.get(chart_type); + this.form.update(chart_definition.settings, this.chart.settings); + } +}); + +}); \ No newline at end of file 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.

1 0

commit/galaxy-central: guerler: Charts: Unify chart options
by commits-noreply＠bitbucket.org 07 Mar '14

07 Mar '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/7efdd4019ed1/ Changeset: 7efdd4019ed1 User: guerler Date: 2014-03-08 00:48:30 Summary: Charts: Unify chart options Affected #: 19 files diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/_nvd3/config.js --- /dev/null +++ b/config/plugins/visualizations/charts/static/charts/_nvd3/config.js @@ -0,0 +1,28 @@ +define([], function() { + +return { + title : '', + columns : { + y : { + title : 'Values for y-axis' + } + }, + settings : { + x_axis_label : { + title : 'Axis label (x)', + info : 'Provide a label for the \'x\' axis.', + type : 'text', + init : '', + placeholder : 'Axis label' + }, + y_axis_label : { + title : 'Axis label (y)', + info : 'Provide a label for the \'y\' axis.', + type : 'text', + init : '', + placeholder : 'Axis label' + } + } +}; + +}); \ No newline at end of file diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/_nvd3/nvd3.js --- /dev/null +++ b/config/plugins/visualizations/charts/static/charts/_nvd3/nvd3.js @@ -0,0 +1,44 @@ +// dependencies +define([], function() { + +// widget +return Backbone.View.extend( +{ + // initialize + initialize: function(app, options) { + this.app = app; + this.options = options; + }, + + // render + draw : function(nvd3_model, chart, request_dictionary, callback) + { + // request data + var self = this; + this.app.datasets.request(request_dictionary, function(data) { + nv.addGraph(function() { + + nvd3_model.yAxis.tickFormat(d3.format('.1f')) + .axisLabel(chart.settings.get('y_axis_label', 'Frequency')) + .axisLabelDistance(30); + + nvd3_model.xAxis.tickFormat(d3.format('.2f')) + .axisLabel(chart.settings.get('x_axis_label', 'Breaks')); + + if (callback) { + callback(nvd3_model); + } + + self.options.svg.datum(data) + .call(nvd3_model); + + nv.utils.windowResize(nvd3_model.update); + + // set chart state + chart.set('state', 'ok'); + }); + }); + } +}); + +}); \ No newline at end of file diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/bardiagram/bardiagram.js --- a/config/plugins/visualizations/charts/static/charts/bardiagram/bardiagram.js +++ b/config/plugins/visualizations/charts/static/charts/bardiagram/bardiagram.js @@ -1,5 +1,5 @@ // dependencies -define([], function() { +define(['plugin/charts/_nvd3/nvd3'], function(NVD3) { // widget return Backbone.View.extend( @@ -13,28 +13,8 @@ // render draw : function(chart, request_dictionary) { - // request data - var self = this; - this.app.datasets.request(request_dictionary, function(data) { - nv.addGraph(function() { - self.d3_chart = nv.models.multiBarChart(); - - self.d3_chart.yAxis.tickFormat(d3.format('.1f')) - .axisLabel(chart.settings.get('y_axis_label', 'Frequency')) - .axisLabelDistance(30); - - self.d3_chart.xAxis.tickFormat(d3.format('.2f')) - .axisLabel(chart.settings.get('x_axis_label', 'Breaks')); - - self.options.svg.datum(data) - .call(self.d3_chart); - - nv.utils.windowResize(self.d3_chart.update); - - // set chart state - chart.set('state', 'ok'); - }); - }); + var nvd3 = new NVD3(this.app, this.options); + nvd3.draw(nv.models.multiBarChart(), chart, request_dictionary); } }); diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/bardiagram/config.js --- a/config/plugins/visualizations/charts/static/charts/bardiagram/config.js +++ b/config/plugins/visualizations/charts/static/charts/bardiagram/config.js @@ -1,28 +1,7 @@ -define([], function() { +define(['plugin/charts/_nvd3/config'], function(nvd3_config) { -return { +return $.extend(true, {}, nvd3_config, { title : 'Bar diagram', - columns : { - y : { - title : 'Values for y-axis' - } - }, - settings : { - x_axis_label : { - title : 'Axis label (x)', - info : 'Provide a label for the \'x\' axis.', - type : 'text', - init : '', - placeholder : 'Axis label' - }, - y_axis_label : { - title : 'Axis label (y)', - info : 'Provide a label for the \'y\' axis.', - type : 'text', - init : '', - placeholder : 'Axis label' - } - } -}; +}); }); \ No newline at end of file diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/histogram/config.js --- a/config/plugins/visualizations/charts/static/charts/histogram/config.js +++ b/config/plugins/visualizations/charts/static/charts/histogram/config.js @@ -1,21 +1,14 @@ -define([], function() { +define(['plugin/charts/_nvd3/config'], function(nvd3_config) { -return { +return $.extend(true, {}, nvd3_config, { title : 'Histogram', mode : 'execute', columns : { - y : { - title : 'Derive frequencies' + x : { + title : 'Values for x-axis' } }, settings : { - x_axis_label : { - title : 'Axis label (x)', - info : 'Provide a label for the \'x\' axis.', - type : 'text', - init : 'Breaks', - placeholder : 'Axis label' - }, bin_size : { title : 'Number of Bins', info : 'Provide the number of histogram bins. The parsed data will be evenly distributed into bins according to the minimum and maximum values of the dataset.', @@ -25,6 +18,6 @@ max : 1000, } } -}; +}); }); \ No newline at end of file diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/histogram/histogram.js --- a/config/plugins/visualizations/charts/static/charts/histogram/histogram.js +++ b/config/plugins/visualizations/charts/static/charts/histogram/histogram.js @@ -1,5 +1,5 @@ // dependencies -define([], function() { +define(['plugin/charts/_nvd3/nvd3'], function(NVD3) { // widget return Backbone.View.extend( @@ -9,10 +9,10 @@ this.app = app; this.options = options; }, - - // draw - draw: function(chart, request_dictionary) { - + + // render + draw : function(chart, request_dictionary) + { // update request dataset id request_dictionary.id = chart.get('dataset_id_job'); @@ -25,29 +25,11 @@ y: index++ } } - - // send request - var self = this; - this.app.datasets.request(request_dictionary, function(data) { - // set chart state - chart.set('state', 'ok'); - - // draw graph - nv.addGraph(function() { - self.d3_chart = nv.models.multiBarChart(); - - self.d3_chart.xAxis.tickFormat(d3.format('.2f')) - .axisLabel('Breaks'); - - self.d3_chart.yAxis.tickFormat(d3.format('.3f')) - .axisLabel('Frequency') - .axisLabelDistance(30); - - self.options.svg.datum(data) - .call(self.d3_chart); - - nv.utils.windowResize(self.d3_chart.update); - }); + + var nvd3 = new NVD3(this.app, this.options); + nvd3.draw(nv.models.multiBarChart(), chart, request_dictionary, function(nvd3_model) { + nvd3_model.xAxis.tickFormat(d3.format('.2f')); + nvd3_model.yAxis.tickFormat(d3.format('.3f')); }); } }); diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/horizontal/config.js --- a/config/plugins/visualizations/charts/static/charts/horizontal/config.js +++ b/config/plugins/visualizations/charts/static/charts/horizontal/config.js @@ -1,12 +1,7 @@ -define([], function() { +define(['plugin/charts/_nvd3/config'], function(nvd3_config) { -return { +return $.extend(true, {}, nvd3_config, { title : 'Bar diagram (horizontal)', - columns : { - y : { - title : 'Values for y-axis' - } - } -}; +}); }); \ No newline at end of file diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/horizontal/horizontal.js --- a/config/plugins/visualizations/charts/static/charts/horizontal/horizontal.js +++ b/config/plugins/visualizations/charts/static/charts/horizontal/horizontal.js @@ -1,5 +1,5 @@ // dependencies -define(['utils/utils'], function(Utils) { +define(['plugin/charts/_nvd3/nvd3'], function(NVD3) { // widget return Backbone.View.extend( @@ -13,23 +13,9 @@ // render draw : function(chart, request_dictionary) { - // request data - var self = this; - this.app.datasets.request(request_dictionary, function(data) { - // add graph to screen - nv.addGraph(function() { - self.d3_chart = nv.models.multiBarHorizontalChart(); - - self.d3_chart.xAxis.tickFormat(function() { return ''; }); - - self.options.svg.datum(data) - .call(self.d3_chart); - - nv.utils.windowResize(self.d3_chart.update); - - // set chart state - chart.set('state', 'ok'); - }); + var nvd3 = new NVD3(this.app, this.options); + nvd3.draw(nv.models.multiBarHorizontalChart(), chart, request_dictionary, function(nvd3_model) { + nvd3_model.xAxis.tickFormat(function() { return ''; }); }); } }); diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/line/config.js --- a/config/plugins/visualizations/charts/static/charts/line/config.js +++ b/config/plugins/visualizations/charts/static/charts/line/config.js @@ -1,12 +1,7 @@ -define([], function() { +define(['plugin/charts/_nvd3/config'], function(nvd3_config) { -return { +return $.extend(true, {}, nvd3_config, { title : 'Line chart', - columns : { - y : { - title : 'Values for y-axis' - } - } -}; +}); }); \ No newline at end of file diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/line/line.js --- a/config/plugins/visualizations/charts/static/charts/line/line.js +++ b/config/plugins/visualizations/charts/static/charts/line/line.js @@ -1,5 +1,5 @@ // dependencies -define(['utils/utils'], function(Utils) { +define(['plugin/charts/_nvd3/nvd3'], function(NVD3) { // widget return Backbone.View.extend( @@ -13,27 +13,8 @@ // render draw : function(chart, request_dictionary) { - // request data - var self = this; - this.app.datasets.request(request_dictionary, function(data) { - nv.addGraph(function() { - self.chart_3d = nv.models.lineChart(); - - self.chart_3d.xAxis - .tickFormat(d3.format(',f')); - - self.chart_3d.yAxis - .tickFormat(d3.format(',.2f')); - - self.options.svg.datum(data) - .call(self.chart_3d); - - nv.utils.windowResize(self.chart_3d.update); - - // set chart state - chart.set('state', 'ok'); - }); - }); + var nvd3 = new NVD3(this.app, this.options); + nvd3.draw(nv.models.lineChart(), chart, request_dictionary); } }); diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/linewithfocus/config.js --- a/config/plugins/visualizations/charts/static/charts/linewithfocus/config.js +++ b/config/plugins/visualizations/charts/static/charts/linewithfocus/config.js @@ -1,12 +1,7 @@ -define([], function() { +define(['plugin/charts/_nvd3/config'], function(nvd3_config) { -return { - title : 'Line chart (with focus)', - columns : { - y : { - title : 'Values for y-axis' - } - } -}; +return $.extend(true, {}, nvd3_config, { + title : 'Line with focus', +}); }); \ No newline at end of file diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/linewithfocus/linewithfocus.js --- a/config/plugins/visualizations/charts/static/charts/linewithfocus/linewithfocus.js +++ b/config/plugins/visualizations/charts/static/charts/linewithfocus/linewithfocus.js @@ -1,5 +1,5 @@ // dependencies -define(['utils/utils'], function(Utils) { +define(['plugin/charts/_nvd3/nvd3'], function(NVD3) { // widget return Backbone.View.extend( @@ -13,27 +13,8 @@ // render draw : function(chart, request_dictionary) { - // request data - var self = this; - this.app.datasets.request(request_dictionary, function(data) { - nv.addGraph(function() { - self.chart_3d = nv.models.lineWithFocusChart(); - - self.chart_3d.xAxis - .tickFormat(d3.format(',f')); - - self.chart_3d.yAxis - .tickFormat(d3.format(',.2f')); - - self.options.svg.datum(data) - .call(self.chart_3d); - - nv.utils.windowResize(self.chart_3d.update); - - // set chart state - chart.set('state', 'ok'); - }); - }); + var nvd3 = new NVD3(this.app, this.options); + nvd3.draw(nv.models.lineWithFocusChart(), chart, request_dictionary); } }); diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/piechart/config.js --- a/config/plugins/visualizations/charts/static/charts/piechart/config.js +++ b/config/plugins/visualizations/charts/static/charts/piechart/config.js @@ -1,12 +1,7 @@ -define([], function() { +define(['plugin/charts/_nvd3/config'], function(nvd3_config) { -return { +return $.extend(true, {}, nvd3_config, { title : 'Pie chart', - columns : { - y : { - title : 'Values for y-axis' - } - } -}; +}); }); \ No newline at end of file diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/scatterplot/config.js --- a/config/plugins/visualizations/charts/static/charts/scatterplot/config.js +++ b/config/plugins/visualizations/charts/static/charts/scatterplot/config.js @@ -1,15 +1,12 @@ -define([], function() { +define(['plugin/charts/_nvd3/config'], function(nvd3_config) { -return { +return $.extend(true, {}, nvd3_config, { title : 'Scatter plot', columns : { x : { title : 'Values for x-axis' - }, - y : { - title : 'Values for y-axis' } } -}; +}); }); \ No newline at end of file diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/scatterplot/scatterplot.js --- a/config/plugins/visualizations/charts/static/charts/scatterplot/scatterplot.js +++ b/config/plugins/visualizations/charts/static/charts/scatterplot/scatterplot.js @@ -1,5 +1,5 @@ // dependencies -define(['utils/utils'], function(Utils) { +define(['plugin/charts/_nvd3/nvd3'], function(NVD3) { // widget return Backbone.View.extend( @@ -13,26 +13,14 @@ // render draw : function(chart, request_dictionary) { - // request data - var self = this; - this.app.datasets.request(request_dictionary, function(data) { - nv.addGraph(function() { - self.d3_chart = nv.models.scatterChart() - .showDistX(true) - .showDistY(true) - .color(d3.scale.category10().range()); - - self.d3_chart.xAxis.tickFormat(d3.format('.02f')) - self.d3_chart.yAxis.tickFormat(d3.format('.02f')) + var nvd3 = new NVD3(this.app, this.options); + nvd3.draw(nv.models.scatterChart(), chart, request_dictionary, function(nvd3_model) { + nvd3_model.showDistX(true) + .showDistY(true) + .color(d3.scale.category10().range()); + nvd3_model.xAxis.tickFormat(d3.format('.02f')); + nvd3_model.yAxis.tickFormat(d3.format('.02f')); - self.options.svg.datum(data) - .call(self.d3_chart); - - nv.utils.windowResize(self.d3_chart.update); - - // set chart state - chart.set('state', 'ok'); - }); }); } }); diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/stackedarea/config.js --- a/config/plugins/visualizations/charts/static/charts/stackedarea/config.js +++ b/config/plugins/visualizations/charts/static/charts/stackedarea/config.js @@ -1,12 +1,7 @@ -define([], function() { +define(['plugin/charts/_nvd3/config'], function(nvd3_config) { -return { +return $.extend(true, {}, nvd3_config, { title : 'Stacked area', - columns : { - y : { - title : 'Values for y-axis' - } - } -}; +}); }); \ No newline at end of file diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/charts/stackedarea/stackedarea.js --- a/config/plugins/visualizations/charts/static/charts/stackedarea/stackedarea.js +++ b/config/plugins/visualizations/charts/static/charts/stackedarea/stackedarea.js @@ -1,5 +1,5 @@ // dependencies -define(['utils/utils'], function(Utils) { +define(['plugin/charts/_nvd3/nvd3'], function(NVD3) { // widget return Backbone.View.extend( @@ -13,30 +13,13 @@ // render draw : function(chart, request_dictionary) { - // request data - var self = this; - this.app.datasets.request(request_dictionary, function(data) { - nv.addGraph(function() { - // make plot - self.d3_chart = nv.models.stackedAreaChart() - .x(function(d) { - return d.x - }) - .y(function(d) { - return d.y - }) - .clipEdge(true); - - self.d3_chart.xAxis.tickFormat(function() { return ''; }); - - self.options.svg.datum(data) - .call(self.d3_chart); - - nv.utils.windowResize(self.d3_chart.update); - - // set chart state - chart.set('state', 'ok'); - }); + var nvd3 = new NVD3(this.app, this.options); + nvd3.draw(nv.models.stackedAreaChart(), chart, request_dictionary, function(nvd3_model) { + // make plot + nvd3_model.x(function(d) { return d.x }) + .y(function(d) { return d.y }) + .clipEdge(true); + nvd3_model.xAxis.tickFormat(function() { return ''; }); }); } }); diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/library/utils.js --- a/config/plugins/visualizations/charts/static/library/utils.js +++ /dev/null @@ -1,152 +0,0 @@ -/** - * Galaxy utilities comprises small functions, which at this point - * do not require their own classes/files -*/ - -// dependencies -define(["libs/underscore"], function(_) { - -// generic function to recieve json from url -function get (url, success, error) { - request('GET', url, {}, success, error); -}; - -// generic function to send json to url -function request (method, url, data, success, error) { - - // encode data into url - if (method == 'GET' || method == 'DELETE') { - if (url.indexOf('?') == -1) { - url += '?'; - } else { - url += '&'; - } - url += $.param(data) - } - - // prepare request - var xhr = new XMLHttpRequest(); - xhr.open(method, url, true); - xhr.setRequestHeader('Accept', 'application/json'); - xhr.setRequestHeader('Cache-Control', 'no-cache'); - xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); - xhr.setRequestHeader('Content-Type', 'application/json'); - xhr.onloadend = function() { - var status = xhr.status; - if (status == 200) { - try { - response = jQuery.parseJSON(xhr.responseText); - } catch (e) { - response = xhr.responseText; - } - success && success(response); - } else { - error && error(status); - } - }; - - // make request - if (method == 'GET' || method == 'DELETE') { - xhr.send(); - } else { - xhr.send(JSON.stringify(data)); - } -}; - -// get css value -function cssGetAttribute (classname, name) { - // place dummy element - var el = $('<div class="' + classname + '"></div>'); - - // required append - el.appendTo(':eq(0)'); - - // get value - var value = el.css(name); - - // remove element - el.remove(); - - // return css value - return value; -}; - -// load css -function cssLoadFile (url) { - // check if css is already available - if (!$('link[href^="' + url + '"]').length) - $('<link href="' + galaxy_config.root + url + '" rel="stylesheet">').appendTo('head'); -}; - -// merge -function merge (options, optionsDefault) { - if (options) - return _.defaults(options, optionsDefault); - else - return optionsDefault; -}; - -// to string -function bytesToString (size, normal_font) { - // identify unit - var unit = ""; - if (size >= 100000000000) { size = size / 100000000000; unit = 'TB'; } else - if (size >= 100000000) { size = size / 100000000; unit = 'GB'; } else - if (size >= 100000) { size = size / 100000; unit = 'MB'; } else - if (size >= 100) { size = size / 100; unit = 'KB'; } else - if (size > 0) { size = size * 10; unit = 'b'; } else - return '<strong>-</strong>'; - - // return formatted string - var rounded = (Math.round(size) / 10); - if (normal_font) { - return rounded + ' ' + unit; - } else { - return '<strong>' + rounded + '</strong> ' + unit; - } -}; - -// unique ide -function uuid(){ - return (new Date().getTime()).toString(36); -}; - -// wrap -function wrap($el) { - var wrapper = $('<p></p>'); - wrapper.append($el); - return wrapper; -}; - -// time -function time() { - // get date object - var d = new Date(); - - // format items - var hours = (d.getHours() < 10 ? "0" : "") + d.getHours(); - var minutes = (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() - - // format final stamp - var datetime = d.getDate() + "/" - + (d.getMonth() + 1) + "/" - + d.getFullYear() + ", " - + hours + ":" - + minutes; - return datetime; -}; - -// return -return { - cssLoadFile : cssLoadFile, - cssGetAttribute : cssGetAttribute, - get : get, - merge : merge, - bytesToString: bytesToString, - uuid: uuid, - time: time, - wrap: wrap, - request: request -}; - -}); diff -r 8ffa9ee618649b042292610cf8d10cff161c5235 -r 7efdd4019ed122743ca920d2d30811737277d6a8 config/plugins/visualizations/charts/static/views/group.js --- a/config/plugins/visualizations/charts/static/views/group.js +++ b/config/plugins/visualizations/charts/static/views/group.js @@ -2,7 +2,7 @@ define(['plugin/library/table', 'plugin/library/ui', 'utils/utils'], function(Table, Ui, Utils) { -// chart config +// widget return Backbone.View.extend( { // columns 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.

1 0