opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 02:04:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge next-stable --> default

Browse Source
This commit is contained in:
Jeremy Goecks
2014-04-04 16:33:32 -04:00
parent 38f1cba0c9 086e37c557
commit 99d94c5220
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/scripts/packed/viz/trackster/tracks.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/viz/trackster/tracks.js
+19 -14
View File
@@ -3797,26 +3797,30 @@ extend(FeatureTrack.prototype, Drawable.prototype, TiledTrack.prototype, {
TiledTrack.prototype.postdraw_actions.call(this, tiles, width, w_scale, clear_after);
var track = this,
i;
i,
line_track_tiles = _.filter(tiles, function(t) {
return (t instanceof LineTrackTile);
});
//
// Draw incomplete features across tiles.
//
// Gather incomplete features together.
var all_incomplete_features = {};
_.each(_.pluck(tiles, 'incomplete_features'), function(inc_features) {
_.each(inc_features, function(feature) {
all_incomplete_features[feature[0]] = feature;
if (line_track_tiles.length === 0) {
// Gather incomplete features together.
var all_incomplete_features = {};
_.each(_.pluck(tiles, 'incomplete_features'), function(inc_features) {
_.each(inc_features, function(feature) {
all_incomplete_features[feature[0]] = feature;
});
});
});
// Draw features on each tile.
var self = this;
_.each(tiles, function(tile) {
self.draw_tile({ 'data': _.values(all_incomplete_features) }, tile.canvas.getContext('2d'),
tile.mode, tile.region, w_scale, tile.seq_data, true);
});
// Draw features on each tile.
var self = this;
_.each(tiles, function(tile) {
self.draw_tile({ 'data': _.values(all_incomplete_features) }, tile.canvas.getContext('2d'),
tile.mode, tile.region, w_scale, tile.seq_data, true);
});
}
// If mode is Coverage and tiles do not share max, redraw tiles as necessary using new max.
/*
@@ -3993,6 +3997,7 @@ extend(FeatureTrack.prototype, Drawable.prototype, TiledTrack.prototype, {
* @param region region to draw on tile
* @param w_scale pixels per base
* @param ref_seq reference sequence data
* @param cur_tile true if drawing is occurring on a currently visible tile.
*/
draw_tile: function(result, ctx, mode, region, w_scale, ref_seq, cur_tile) {
var track = this,