From 4f3acda1ca8faed51a386c2d2edbd7e57a165415 Mon Sep 17 00:00:00 2001 From: Jeremy Goecks Date: Thu, 9 May 2013 11:44:45 -0400 Subject: [PATCH] Visualization framework: replace summary_tree with bigwig datatype for all feature track coverage data, yielding better performance and a standardized approach for working with coverage data. Update Trackster to work with bigwig coverage data. --- datatypes_conf.xml.sample | 24 +- lib/galaxy/datatypes/binary.py | 2 +- .../converters/bam_to_bigwig_converter.xml | 9 +- .../bam_to_summary_tree_converter.xml | 14 - .../bed_gff_or_vcf_to_bigwig_converter.xml | 25 ++ .../bed_to_summary_tree_converter.xml | 14 - .../encodepeak_to_summary_tree_converter.xml | 20 -- .../gff_to_summary_tree_converter.xml | 14 - .../interval_to_summary_tree_converter.py | 63 ----- .../interval_to_summary_tree_converter.xml | 20 -- .../sam_or_bam_to_summary_tree_converter.py | 42 --- .../sam_to_summary_tree_converter.xml | 14 - .../vcf_to_summary_tree_converter.py | 30 --- .../vcf_to_summary_tree_converter.xml | 14 - lib/galaxy/datatypes/interval.py | 10 +- lib/galaxy/datatypes/tabular.py | 4 +- .../visualization/data_providers/genome.py | 74 ------ .../visualization/data_providers/registry.py | 1 - lib/galaxy/visualization/tracks/summary.py | 117 --------- lib/galaxy/webapps/galaxy/api/datasets.py | 49 ++-- static/scripts/utils/config.js | 1 - static/scripts/viz/trackster/painters.js | 44 ---- static/scripts/viz/trackster/tracks.js | 246 +++++++++++------- static/scripts/viz/visualization.js | 5 +- 24 files changed, 227 insertions(+), 629 deletions(-) delete mode 100644 lib/galaxy/datatypes/converters/bam_to_summary_tree_converter.xml create mode 100644 lib/galaxy/datatypes/converters/bed_gff_or_vcf_to_bigwig_converter.xml delete mode 100644 lib/galaxy/datatypes/converters/bed_to_summary_tree_converter.xml delete mode 100644 lib/galaxy/datatypes/converters/encodepeak_to_summary_tree_converter.xml delete mode 100644 lib/galaxy/datatypes/converters/gff_to_summary_tree_converter.xml delete mode 100644 lib/galaxy/datatypes/converters/interval_to_summary_tree_converter.py delete mode 100644 lib/galaxy/datatypes/converters/interval_to_summary_tree_converter.xml delete mode 100644 lib/galaxy/datatypes/converters/sam_or_bam_to_summary_tree_converter.py delete mode 100644 lib/galaxy/datatypes/converters/sam_to_summary_tree_converter.xml delete mode 100644 lib/galaxy/datatypes/converters/vcf_to_summary_tree_converter.py delete mode 100644 lib/galaxy/datatypes/converters/vcf_to_summary_tree_converter.xml delete mode 100644 lib/galaxy/visualization/tracks/summary.py diff --git a/datatypes_conf.xml.sample b/datatypes_conf.xml.sample index 30c8fd0786c..b0d3481001f 100644 --- a/datatypes_conf.xml.sample +++ b/datatypes_conf.xml.sample @@ -9,12 +9,7 @@ - - + @@ -25,7 +20,7 @@ - + @@ -51,7 +46,7 @@ - + @@ -93,7 +88,7 @@ - + @@ -103,7 +98,7 @@ - + @@ -115,7 +110,7 @@ - + @@ -156,7 +151,7 @@ - + @@ -172,7 +167,7 @@ - + @@ -190,7 +185,7 @@ - + @@ -203,7 +198,6 @@ - diff --git a/lib/galaxy/datatypes/binary.py b/lib/galaxy/datatypes/binary.py index 5cbe223c81e..2a478d7f6df 100644 --- a/lib/galaxy/datatypes/binary.py +++ b/lib/galaxy/datatypes/binary.py @@ -103,7 +103,7 @@ class Bam( Binary ): """Class describing a BAM binary file""" file_ext = "bam" track_type = "ReadTrack" - data_sources = { "data": "bai", "index": [ "bigwig", "summary_tree" ] } + data_sources = { "data": "bai", "index": "bigwig" } MetadataElement( name="bam_index", desc="BAM Index File", param=metadata.FileParameter, file_ext="bai", readonly=True, no_value=None, visible=False, optional=True ) diff --git a/lib/galaxy/datatypes/converters/bam_to_bigwig_converter.xml b/lib/galaxy/datatypes/converters/bam_to_bigwig_converter.xml index 739cca3d268..35f7b224083 100644 --- a/lib/galaxy/datatypes/converters/bam_to_bigwig_converter.xml +++ b/lib/galaxy/datatypes/converters/bam_to_bigwig_converter.xml @@ -1,7 +1,14 @@