mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Cleanup: (a) remove debugging statements; (b) use Galaxy app; and (c) fix offset issue for LinePainter using floor instead of ceil.
This commit is contained in:
@@ -15,7 +15,7 @@ define( ["viz/visualization", "libs/bbi/bigwig"],
|
||||
var deferred = $.Deferred();
|
||||
this.set_data(region, deferred);
|
||||
|
||||
var url = galaxy_config.root + 'datasets/' + this.get('dataset').id + '/display',
|
||||
var url = Galaxy.root + 'datasets/' + this.get('dataset').id + '/display',
|
||||
self = this;
|
||||
var promise = new $.Deferred();
|
||||
$.when(bigwig.makeBwg(url)).then(function(bb, err) {
|
||||
|
||||
@@ -223,7 +223,7 @@ LinePainter.prototype.draw = function(ctx, width, height, w_scale) {
|
||||
top_overflow = bot_overflow = false;
|
||||
delta_x_px = delta_x_pxs[i];
|
||||
|
||||
x_scaled = Math.ceil((data[i][0] - view_start - 0.5) * w_scale);
|
||||
x_scaled = Math.floor((data[i][0] - view_start - 0.5) * w_scale);
|
||||
y = data[i][1];
|
||||
|
||||
// Process Y (scaler) value.
|
||||
|
||||
@@ -200,7 +200,6 @@ function supportsByteRanges(url) {
|
||||
xhr.setRequestHeader("Range", "bytes=0-10");
|
||||
},
|
||||
success: function(result, status, xhr) {
|
||||
console.log("BYTE RANGE SUPPORT", xhr.status === 206)
|
||||
promise.resolve(xhr.status === 206);
|
||||
}
|
||||
});
|
||||
@@ -3628,10 +3627,9 @@ var LineTrack = function (view, container, obj_dict) {
|
||||
// If server has byte-range support, use BBI data manager to read directly from the BBI file.
|
||||
// FIXME: there should be a flag to wait for this check to complete before loading the track.
|
||||
var self = this;
|
||||
$.when(supportsByteRanges(galaxy_config.root + 'datasets/' + this.dataset.id + '/display'))
|
||||
$.when(supportsByteRanges(Galaxy.root + 'datasets/' + this.dataset.id + '/display'))
|
||||
.then(function(supportsByteRanges) {
|
||||
if (supportsByteRanges) {
|
||||
console.log("BBI DATA MANAGER");
|
||||
self.data_manager = new bbi.BBIDataManager({
|
||||
dataset: self.dataset
|
||||
});
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"version":3,"file":"bbi-data-manager.js","sources":["../../src/viz/bbi-data-manager.js"],"names":["define","visualization","bigwig","BBIDataManager","GenomeDataManager","extend","load_data","region","deferred","$","Deferred","this","set_data","url","galaxy_config","root","get","id","self","when","makeBwg","then","bb","readWigData","data","result","prev","max","Number","MIN_VALUE","forEach","d","min","push","score","entry","dataset_type","resolve"],"mappings":"AAAAA,QAAS,oBAAqB,mBACtB,SAASC,EAAeC,GAK5B,GAAIC,GAAiBF,EAAcG,kBAAkBC,QAOjDC,UAAW,SAASC,GAChB,GAAIC,GAAWC,EAAEC,UACjBC,MAAKC,SAASL,EAAQC,EAEtB,EAAA,GAAIK,GAAMC,cAAcC,KAAO,YAAcJ,KAAKK,IAAI,WAAWC,GAAK,WAClEC,EAAOP,IACO,IAAIF,GAAEC,SAuCxB,MAtCID,GAAEU,KAAKjB,EAAOkB,QAAQP,IAAMQ,KAAK,SAASC,GACtCb,EAAEU,KAAKG,EAAGC,YAAYhB,EAAOS,IAAI,SAAUT,EAAOS,IAAI,SAAUT,EAAOS,IAAI,SAASK,KAAK,SAASG,GAGlG,GAAIC,MACAC,GAASC,IAAKC,OAAOC,UACzBL,GAAKM,QAAQ,SAASC,GAGdL,EAAKC,MAAQI,EAAEC,IAAM,IAErBP,EAAOQ,MAAMP,EAAKC,IAAM,EAAG,IAG3BF,EAAOQ,MAAMF,EAAEC,IAAM,EAAG,KAK5BP,EAAOQ,MAAMF,EAAEC,IAAM,EAAGD,EAAEG,QAG1BT,EAAOQ,MAAMF,EAAEJ,IAAKI,EAAEG,QAEtBR,EAAOK,GAGX,IAAII,IACIX,KAAMC,EACNlB,OAAQA,EACR6B,aAAc,SAGtBlB,GAAKN,SAASL,EAAQ4B,GACtB3B,EAAS6B,QAAQF,OAIlB3B,IAIf,QACIL,eAAgBA"}
|
||||
{"version":3,"file":"bbi-data-manager.js","sources":["../../src/viz/bbi-data-manager.js"],"names":["define","visualization","bigwig","BBIDataManager","GenomeDataManager","extend","load_data","region","deferred","$","Deferred","this","set_data","url","Galaxy","root","get","id","self","when","makeBwg","then","bb","readWigData","data","result","prev","max","Number","MIN_VALUE","forEach","d","min","push","score","entry","dataset_type","resolve"],"mappings":"AAAAA,QAAS,oBAAqB,mBACtB,SAASC,EAAeC,GAK5B,GAAIC,GAAiBF,EAAcG,kBAAkBC,QAOjDC,UAAW,SAASC,GAChB,GAAIC,GAAWC,EAAEC,UACjBC,MAAKC,SAASL,EAAQC,EAEtB,EAAA,GAAIK,GAAMC,OAAOC,KAAO,YAAcJ,KAAKK,IAAI,WAAWC,GAAK,WAC3DC,EAAOP,IACO,IAAIF,GAAEC,SAuCxB,MAtCID,GAAEU,KAAKjB,EAAOkB,QAAQP,IAAMQ,KAAK,SAASC,GACtCb,EAAEU,KAAKG,EAAGC,YAAYhB,EAAOS,IAAI,SAAUT,EAAOS,IAAI,SAAUT,EAAOS,IAAI,SAASK,KAAK,SAASG,GAGlG,GAAIC,MACAC,GAASC,IAAKC,OAAOC,UACzBL,GAAKM,QAAQ,SAASC,GAGdL,EAAKC,MAAQI,EAAEC,IAAM,IAErBP,EAAOQ,MAAMP,EAAKC,IAAM,EAAG,IAG3BF,EAAOQ,MAAMF,EAAEC,IAAM,EAAG,KAK5BP,EAAOQ,MAAMF,EAAEC,IAAM,EAAGD,EAAEG,QAG1BT,EAAOQ,MAAMF,EAAEJ,IAAKI,EAAEG,QAEtBR,EAAOK,GAGX,IAAII,IACIX,KAAMC,EACNlB,OAAQA,EACR6B,aAAc,SAGtBlB,GAAKN,SAASL,EAAQ4B,GACtB3B,EAAS6B,QAAQF,OAIlB3B,IAIf,QACIL,eAAgBA"}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,2 +1,2 @@
|
||||
define(["viz/visualization","libs/bbi/bigwig"],function(a,b){var c=a.GenomeDataManager.extend({load_data:function(a){var c=$.Deferred();this.set_data(a,c);{var d=galaxy_config.root+"datasets/"+this.get("dataset").id+"/display",e=this;new $.Deferred}return $.when(b.makeBwg(d)).then(function(b){$.when(b.readWigData(a.get("chrom"),a.get("start"),a.get("end"))).then(function(b){var d=[],f={max:Number.MIN_VALUE};b.forEach(function(a){f.max!==a.min-1&&(d.push([f.max+1,0]),d.push([a.min-2,0])),d.push([a.min-1,a.score]),d.push([a.max,a.score]),f=a});var g={data:d,region:a,dataset_type:"bigwig"};e.set_data(a,g),c.resolve(g)})}),c}});return{BBIDataManager:c}});
|
||||
define(["viz/visualization","libs/bbi/bigwig"],function(a,b){var c=a.GenomeDataManager.extend({load_data:function(a){var c=$.Deferred();this.set_data(a,c);{var d=Galaxy.root+"datasets/"+this.get("dataset").id+"/display",e=this;new $.Deferred}return $.when(b.makeBwg(d)).then(function(b){$.when(b.readWigData(a.get("chrom"),a.get("start"),a.get("end"))).then(function(b){var d=[],f={max:Number.MIN_VALUE};b.forEach(function(a){f.max!==a.min-1&&(d.push([f.max+1,0]),d.push([a.min-2,0])),d.push([a.min-1,a.score]),d.push([a.max,a.score]),f=a});var g={data:d,region:a,dataset_type:"bigwig"};e.set_data(a,g),c.resolve(g)})}),c}});return{BBIDataManager:c}});
|
||||
//# sourceMappingURL=../../maps/viz/bbi-data-manager.js.map
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user