1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/0b186ed35995/ changeset: 0b186ed35995 user: jgoecks date: 2012-02-05 20:50:23 summary: Trackster: better attribute display for tracks created when rerunning tools. affected #: 2 files
diff -r 32d1ab3262ea4d45e1cae1f43f44e43d3c8899d8 -r 0b186ed35995002dc50d48a3ee38fd96d13f76bc lib/galaxy/visualization/tracks/data_providers.py --- a/lib/galaxy/visualization/tracks/data_providers.py +++ b/lib/galaxy/visualization/tracks/data_providers.py @@ -945,6 +945,8 @@ """ Process data from an iterator to a format that can be provided to client. """ + filter_cols = from_json_string( kwargs.get( "filter_cols", "[]" ) ) + no_detail = ( "no_detail" in kwargs ) results = [] message = None offset = 0 @@ -956,7 +958,7 @@ message = ERROR_MAX_VALS % ( max_vals, "reads" ) break
- payload = package_gff_feature( feature ) + payload = package_gff_feature( feature, no_detail=no_detail, filter_cols=filter_cols ) payload.insert( 0, offset ) results.append( payload ) offset += feature.raw_size
diff -r 32d1ab3262ea4d45e1cae1f43f44e43d3c8899d8 -r 0b186ed35995002dc50d48a3ee38fd96d13f76bc static/scripts/trackster.js --- a/static/scripts/trackster.js +++ b/static/scripts/trackster.js @@ -2001,6 +2001,8 @@ var new_track = new current_track.constructor(track_name, view, container, "hda"); new_track.init_for_tool_data(); new_track.change_mode(current_track.mode); + new_track.set_filters_manager(current_track.filters_manager.copy(new_track)); + new_track.update_icons(); container.add_drawable(new_track); new_track.content_div.text("Starting job.");
@@ -2259,6 +2261,12 @@ }; extend(NumberFilter.prototype, { /** + * Return a copy of filter. + */ + copy: function() { + return new NumberFilter(this.name, this.index, this.tool_id, this.tool_exp_name); + }, + /** * Get step for slider. */ // FIXME: make this a "static" function. @@ -2414,6 +2422,16 @@
extend(FiltersManager.prototype, { /** + * Return a copy of the manager. + */ + copy: function(new_track) { + var copy = new FiltersManager(new_track); + for (var i = 0; i < this.filters.length; i++) { + copy.add_filter(this.filters[i].copy()); + } + return copy; + }, + /** * Add a filter to the manager. */ add_filter: function(filter) { @@ -3194,12 +3212,9 @@
if (this.header_div) { // - // Create filters div. + // Setup filters. // - if (this.filters_manager) { - this.filters_div = this.filters_manager.parent_div - this.header_div.after(this.filters_div); - } + this.set_filters_manager(this.filters_manager);
// // Create dynamic tool div. @@ -3223,6 +3238,14 @@ new_track.enabled = this.enabled; return new_track; }, + /** + * Set filters manager + HTML elements. + */ + set_filters_manager: function(filters_manager) { + this.filters_manager = filters_manager; + this.filters_div = this.filters_manager.parent_div; + this.header_div.after(this.filters_div); + }, /** * Returns representation of object in a dictionary for easy saving. * Use from_dict to recreate object.
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.