1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/3574c1fa4cb3/ changeset: 3574c1fa4cb3 user: carlfeberhard date: 2012-09-22 00:39:04 summary: fixes to ae57c837ab03 affected #: 3 files diff -r 45f11c9b4affd9006f1f7159368567cd412d20b8 -r 3574c1fa4cb3494f82fd1915c63da6154b230756 lib/galaxy/visualization/data_providers/basic.py --- a/lib/galaxy/visualization/data_providers/basic.py +++ b/lib/galaxy/visualization/data_providers/basic.py @@ -90,7 +90,7 @@ if( skip_comments and start_val == 0 and self.original_dataset.metadata.comment_lines ): - start_val = self.original_dataset.metadata.comment_lines + start_val = int( self.original_dataset.metadata.comment_lines ) + 1 response = {} response[ 'data' ] = data = [] @@ -102,6 +102,8 @@ "column index (%d) must be less" % ( column ) + " than the number of columns: %d" % ( self.original_dataset.metadata.columns ) ) + #print columns, start_val, max_vals, skip_comments, kwargs + # alter meta by column_selectors (if any) def cast_val( val, type ): """ Cast value based on type. """ @@ -125,8 +127,9 @@ fields = line.split() fields_len = len( fields ) #TODO: this will return the wrong number of columns for abberrant lines - data.append([ cast_val( fields[c], self.original_dataset.metadata.column_types[c] ) - for c in columns if ( c < fields_len ) ]) + line_data = [ cast_val( fields[c], self.original_dataset.metadata.column_types[c] ) + for c in columns if ( c < fields_len ) ] + data.append( line_data ) response[ 'endpoint' ] = dict( last_line=( count - 1 ), file_ptr=f.tell() ) f.close() diff -r 45f11c9b4affd9006f1f7159368567cd412d20b8 -r 3574c1fa4cb3494f82fd1915c63da6154b230756 lib/galaxy/web/api/datasets.py --- a/lib/galaxy/web/api/datasets.py +++ b/lib/galaxy/web/api/datasets.py @@ -189,13 +189,9 @@ # Return data. data = None data_provider = trans.app.data_provider_registry.get_data_provider( trans, raw=True, original_dataset=dataset ) + print 'data_provider:', data_provider - if data_provider == ColumnDataProvider: - #pre: should have column kwargs - #print 'kwargs:', kwargs - #TODO??: could default to first two here - assert 'cols' in kwargs, ( - "ColumnDataProvider needs a 'cols' parameter in the query string" ) + if isinstance( data_provider, ColumnDataProvider ): data = data_provider.get_data( **kwargs ) else: diff -r 45f11c9b4affd9006f1f7159368567cd412d20b8 -r 3574c1fa4cb3494f82fd1915c63da6154b230756 templates/visualization/scatterplot.mako --- a/templates/visualization/scatterplot.mako +++ b/templates/visualization/scatterplot.mako @@ -2,22 +2,21 @@ <%def name="stylesheets()"> ${parent.stylesheets()} -##${h.css( "history", "autocomplete_tagging", "trackster", "overcast/jquery-ui-1.8.5.custom", "library" )} <style type="text/css"> -* { margin: 0px, padding: 0px; } .title { - margin: 0px; + margin: 0px; padding: 8px; background-color: #ebd9b2; + border: 2px solid #ebd9b2; } .subtitle { - margin: 0px; - padding: 0px, 8px, 8px, 16px; + margin: 0px; + padding: 0px 8px 8px 16px; background-color: #ebd9b2; - color: grey; + color: white; font-size: small; } @@ -25,7 +24,7 @@ /*from width + margin of chart?*/ float: right; width: 100%; - background-color: #ebd9b2; + margin: 0px; padding-top: 1em; } 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.