1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/fe12d92febf9/ changeset: fe12d92febf9 user: jgoecks date: 2012-09-16 16:57:30 summary: Trackster and sweepster fixes for vis framework refactoring. affected #: 5 files diff -r 2f63df92248894e78f9113fb79107fcbd6e12ff7 -r fe12d92febf99c19708ab5cb65a527366a2bece5 lib/galaxy/visualization/genome/data_providers.py --- a/lib/galaxy/visualization/genome/data_providers.py +++ b/lib/galaxy/visualization/genome/data_providers.py @@ -1186,6 +1186,12 @@ # Read first line in order to match chrom naming format. line = source.readline() + + # If line empty, assume file is empty and return empty iterator. + if len( line ) == 0: + return iter([]) + + # Determine chromosome naming format. dataset_chrom = line.split()[0] if not _chrom_naming_matches( chrom, dataset_chrom ): chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) diff -r 2f63df92248894e78f9113fb79107fcbd6e12ff7 -r fe12d92febf99c19708ab5cb65a527366a2bece5 lib/galaxy/web/controllers/visualization.py --- a/lib/galaxy/web/controllers/visualization.py +++ b/lib/galaxy/web/controllers/visualization.py @@ -5,6 +5,7 @@ from galaxy.util.sanitize_html import sanitize_html from galaxy.web.controllers.library import LibraryListGrid from galaxy.visualization.genomes import decode_dbkey +from galaxy.visualization.genome.visual_analytics import get_dataset_job # # -- Grids -- diff -r 2f63df92248894e78f9113fb79107fcbd6e12ff7 -r fe12d92febf99c19708ab5cb65a527366a2bece5 static/scripts/viz/sweepster.js --- a/static/scripts/viz/sweepster.js +++ b/static/scripts/viz/sweepster.js @@ -925,6 +925,9 @@ }, output.first().get('track_config')), track_obj = object_from_template(track_config, self, null); + // Track uses only raw data. + track_obj.data_manager.set('data_type', 'raw_data'); + // Set track block colors. track_obj.prefs.block_color = self.block_color; track_obj.prefs.reverse_strand_color = self.reverse_strand_color; diff -r 2f63df92248894e78f9113fb79107fcbd6e12ff7 -r fe12d92febf99c19708ab5cb65a527366a2bece5 static/scripts/viz/trackster.js --- a/static/scripts/viz/trackster.js +++ b/static/scripts/viz/trackster.js @@ -3843,8 +3843,8 @@ // Tool-execution specific post-draw init: - // Reset dataset state, wait time. - self.dataset_state_url = converted_datasets_state_url; + // Reset dataset check, wait time. + self.dataset_check_type = 'converted_datasets_state'; self.data_query_wait = DEFAULT_DATA_QUERY_WAIT; // Reset data URL when dataset indexing has completed/when not pending. @@ -3858,8 +3858,6 @@ $.when(ss_deferred.go()).then(function() { // Dataset is indexed, so use converted data. self.data_manager.set('data_type', 'data'); - self.dataset_check_type = 'converted_datasets_state'; - this.data_query_wait = 5000; }); // Reset post-draw actions function. diff -r 2f63df92248894e78f9113fb79107fcbd6e12ff7 -r fe12d92febf99c19708ab5cb65a527366a2bece5 templates/visualization/sweepster.mako --- a/templates/visualization/sweepster.mako +++ b/templates/visualization/sweepster.mako @@ -108,7 +108,7 @@ ${h.templates( "tool_link", "panel_section", "tool_search", "tool_form" )} ${h.js( "libs/d3", "mvc/data", "mvc/tools", "viz/visualization", "viz/sweepster", - "viz/trackster", "viz/trackster_ui", "libs/jquery/jquery.ui.sortable.slider" )} + "viz/trackster", "viz/trackster_ui", "libs/jquery/jquery-ui-1.8.23.custom.min" )} <script type="text/javascript"> var viz; 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.