1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/b3338ccd9c79/ Changeset: b3338ccd9c79 User: jgoecks Date: 2013-05-01 20:04:23 Summary: Visualization framework: (1) fix disappearing Y axis labels for line tracks and (2) update dataset dict to correspond with new description. Affected #: 2 files
diff -r c2c22e38826b65c67202b39e2f7e789c1761c892 -r b3338ccd9c793bb44cab686645e6cdeef8976ee8 lib/galaxy/web/base/controller.py --- a/lib/galaxy/web/base/controller.py +++ b/lib/galaxy/web/base/controller.py @@ -703,17 +703,18 @@ # -- Validate config. --
if vis.type == 'trackster': - def unpack_track( track_json ): + def unpack_track( track_dict ): """ Unpack a track from its json. """ + dataset_dict = track_dict[ 'dataset' ] return { - "dataset_id": trans.security.decode_id( track_json['dataset_id'] ), - "hda_ldda": track_json.get('hda_ldda', 'hda'), - "name": track_json['name'], - "track_type": track_json['track_type'], - "prefs": track_json['prefs'], - "mode": track_json['mode'], - "filters": track_json['filters'], - "tool_state": track_json['tool_state'] + "dataset_id": trans.security.decode_id( dataset_dict['id'] ), + "hda_ldda": dataset_dict.get('hda_ldda', 'hda'), + "name": track_dict['name'], + "track_type": track_dict['track_type'], + "prefs": track_dict['prefs'], + "mode": track_dict['mode'], + "filters": track_dict['filters'], + "tool_state": track_dict['tool_state'] }
def unpack_collection( collection_json ):
diff -r c2c22e38826b65c67202b39e2f7e789c1761c892 -r b3338ccd9c793bb44cab686645e6cdeef8976ee8 static/scripts/viz/trackster/tracks.js --- a/static/scripts/viz/trackster/tracks.js +++ b/static/scripts/viz/trackster/tracks.js @@ -2765,14 +2765,16 @@ */ to_dict: function() { return { - "track_type": this.get_type(), - "name": this.name, - "hda_ldda": this.dataset.get('hda_ldda'), - "dataset_id": this.dataset.id, - "prefs": this.prefs, - "mode": this.mode, - "filters": this.filters_manager.to_dict(), - "tool_state": (this.tool ? this.tool.state_dict() : {}) + track_type: this.get_type(), + name: this.name, + dataset: { + id: this.dataset.id, + hda_ldda: this.dataset.get('hda_ldda') + }, + prefs: this.prefs, + mode: this.mode, + filters: this.filters_manager.to_dict(), + tool_state: (this.tool ? this.tool.state_dict() : {}) }; }, /** @@ -2943,10 +2945,13 @@ // // If using SummaryTree tiles, show max and make it editable. // - this.container_div.find(".yaxislabel").remove(); var track = this, first_tile = tiles[0]; if (first_tile instanceof SummaryTreeTile) { + // Remove old max. + this.container_div.find(".yaxislabel").remove(); + + // Add new max. var max_val = (this.prefs.histogram_max ? this.prefs.histogram_max : first_tile.max_val), max_label = $("<div/>").text(max_val).make_text_editable({ num_cols: 12,
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.