commit/galaxy-central: 2 new changesets
2 new changesets in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/f8ac9094b145/ changeset: r5331:f8ac9094b145 user: james_taylor date: 2011-04-02 23:35:27 summary: trackster: drawing labels on left at start of chrom works again, tweaks to feature track padding affected #: 1 file (0 bytes) --- a/static/scripts/trackster.js Sat Apr 02 16:43:02 2011 -0400 +++ b/static/scripts/trackster.js Sat Apr 02 17:35:27 2011 -0400 @@ -2776,8 +2776,8 @@ // Calculate new slots incrementally for this new chunk of data and update height if necessary. required_height = rows_required * y_scale; } - // Pad bottom by half a row - return required_height + Math.round( y_scale / 2 ); + // Pad bottom by half a row, at least 5 px + return required_height + Math.max( Math.round( y_scale / 2 ), 5 ); }, draw: function( ctx, width, height, slots ) { @@ -3000,9 +3000,8 @@ // Draw label for Pack mode. if (mode === "Pack" && feature_start > tile_low) { ctx.fillStyle = label_color; - // FIXME: do this without tile_index - var tile_index = 1; - if (tile_index === 0 && f_start - ctx.measureText(feature_name).width < 0) { + // FIXME: assumption here that the entire view starts at 0 + if (tile_low === 0 && f_start - ctx.measureText(feature_name).width < 0) { ctx.textAlign = "left"; ctx.fillText(feature_name, f_end + LABEL_SPACING, y_center + 8); } else { http://bitbucket.org/galaxy/galaxy-central/changeset/8f250815662e/ changeset: r5332:8f250815662e user: james_taylor date: 2011-04-03 00:30:13 summary: trackster: disabling subsetting in data manager, breaks line tracks affected #: 1 file (80 bytes) --- a/static/scripts/trackster.js Sat Apr 02 17:35:27 2011 -0400 +++ b/static/scripts/trackster.js Sat Apr 02 18:30:13 2011 -0400 @@ -291,6 +291,8 @@ // the data was "index" or "data." Also could slice the data so that // only data points in request are returned. // + + /* Disabling for now, more detailed data is never loaded for line tracks if (this.subset) { var key, split_key, entry_low, entry_high, mode, entry; for (var i = 0; i < this.key_ary.length; i++) { @@ -310,6 +312,7 @@ } } } + */ // // Load data from server. 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.
participants (1)
-
Bitbucket