3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/9635e2cc9a24/ changeset: 9635e2cc9a24 user: jgoecks date: 2012-10-09 18:33:02 summary: Trackster: accurately calculate track/tile heights by clearing previously set height before calculating new height. affected #: 1 file diff -r 79bb2432133f9b18450e142fc6b80ddab364b57e -r 9635e2cc9a249aea5d939c0f4ca955c5faa3dd58 static/scripts/viz/trackster/tracks.js --- a/static/scripts/viz/trackster/tracks.js +++ b/static/scripts/viz/trackster/tracks.js @@ -3020,13 +3020,10 @@ * an existing tile rather than reshowing it. */ show_tile: function(tile, parent_element, w_scale) { - var - track = this, + var track = this, tile_element = tile.html_elt; - // - // Show/move tile element. - // + // -- Show/move tile element. -- tile.predisplay_actions(); @@ -3046,14 +3043,12 @@ // Showing new tile. parent_element.append(tile_element); } + + // -- Update track, tile heights based on new tile. -- - track.after_show_tile(tile); - }, - - /** - * Actions to be taken after showing tile. - */ - after_show_tile: function(tile) { + // Clear any previous height settings for tile. + tile.html_elt.height('auto'); + // Update max height based on current tile. this.max_height_px = Math.max(this.max_height_px, tile.html_elt.height()); https://bitbucket.org/galaxy/galaxy-central/changeset/437b0d9ccb60/ changeset: 437b0d9ccb60 user: jgoecks date: 2012-10-09 20:16:16 summary: For Circster: only preload data if indexing is complete. affected #: 1 file diff -r 9635e2cc9a249aea5d939c0f4ca955c5faa3dd58 -r 437b0d9ccb60141d9378642893ce13bd50187cea lib/galaxy/webapps/galaxy/controllers/visualization.py --- a/lib/galaxy/webapps/galaxy/controllers/visualization.py +++ b/lib/galaxy/webapps/galaxy/controllers/visualization.py @@ -772,14 +772,18 @@ # Add genome-wide summary tree data to each track in viz. tracks = viz_config.get( 'tracks', [] ) for track in tracks: - # Get dataset and indexed datatype. + # Get dataset and data sources. dataset = self.get_hda_or_ldda( trans, track[ 'hda_ldda'], track[ 'dataset_id' ] ) data_sources = dataset.get_datasources( trans ) - data_provider = trans.app.data_provider_registry.get_data_provider( trans, - original_dataset=dataset, - source='index' ) - # HACK: pass in additional params, which are only used for summary tree data, not BBI data. - track[ 'preloaded_data' ] = data_provider.get_genome_data( chroms_info, level=4, detail_cutoff=0, draw_cutoff=0 ) + + # If there are no messages (messages indicate data is not ready/available), preload data. + messages_list = [ data_source_dict[ 'message' ] for data_source_dict in data_sources.values() ] + if not get_highest_priority_msg( messages_list ): + data_provider = trans.app.data_provider_registry.get_data_provider( trans, + original_dataset=dataset, + source='index' ) + # HACK: pass in additional params, which are only used for summary tree data, not BBI data. + track[ 'preloaded_data' ] = data_provider.get_genome_data( chroms_info, level=4, detail_cutoff=0, draw_cutoff=0 ) return trans.fill_template( 'visualization/circster.mako', viz_config=viz_config, genome=genome ) https://bitbucket.org/galaxy/galaxy-central/changeset/dcb22217c175/ changeset: dcb22217c175 user: jgoecks date: 2012-10-09 20:16:27 summary: Merge affected #: 2 files diff -r 437b0d9ccb60141d9378642893ce13bd50187cea -r dcb22217c17527427c17f4ca3edeb5d6a98f6f4d lib/galaxy/datatypes/metadata.py --- a/lib/galaxy/datatypes/metadata.py +++ b/lib/galaxy/datatypes/metadata.py @@ -345,13 +345,13 @@ def get_html_field( self, value=None, context={}, other_values={}, values=None, **kwd ): if values is None and context: - column_range = range( 1, context.columns+1, 1 ) + column_range = range( 1, ( context.columns or 0 ) + 1, 1 ) values = zip( column_range, column_range ) return RangeParameter.get_html_field( self, value=value, context=context, other_values=other_values, values=values, **kwd ) def get_html( self, value, context={}, other_values={}, values=None, **kwd ): if values is None and context: - column_range = range( 1, context.columns+1, 1 ) + column_range = range( 1, ( context.columns or 0 ) + 1, 1 ) values = zip( column_range, column_range ) return RangeParameter.get_html( self, value, context=context, other_values=other_values, values=values, **kwd ) diff -r 437b0d9ccb60141d9378642893ce13bd50187cea -r dcb22217c17527427c17f4ca3edeb5d6a98f6f4d lib/galaxy/datatypes/tabular.py --- a/lib/galaxy/datatypes/tabular.py +++ b/lib/galaxy/datatypes/tabular.py @@ -274,12 +274,18 @@ column_names = dataset.metadata.column_names elif hasattr(dataset.datatype, 'column_names'): column_names = dataset.datatype.column_names + column_types = dataset.metadata.column_types + if not column_types: + column_types = [] + column_number = dataset.metadata.columns + if column_number is None: + column_number = 'null' return trans.fill_template( "/dataset/tabular_chunked.mako", dataset = dataset, chunk = self.get_chunk(trans, dataset, 0), - column_number = dataset.metadata.columns, + column_number = column_number, column_names = column_names, - column_types = dataset.metadata.column_types) + column_types = column_types ) def set_peek( self, dataset, line_count=None, is_multi_byte=False): super(Tabular, self).set_peek( dataset, line_count=line_count, is_multi_byte=is_multi_byte) 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.