- galaxy-dev - lists.galaxyproject.org

[hg] galaxy 2726: Allow array_tree.py to still load with older b...
by Greg Von Kuster 21 Sep '09

21 Sep '09

details: http://www.bx.psu.edu/hg/galaxy/rev/891e1e2a407d changeset: 2726:891e1e2a407d user: James Taylor <james(a)jamestaylor.org> date: Fri Sep 18 16:09:14 2009 -0400 description: Allow array_tree.py to still load with older bx (but track browser won't work) 1 file(s) affected in this change: lib/galaxy/visualization/tracks/data/array_tree.py diffs (15 lines): diff -r cb9b12f8e127 -r 891e1e2a407d lib/galaxy/visualization/tracks/data/array_tree.py --- a/lib/galaxy/visualization/tracks/data/array_tree.py Fri Sep 18 16:07:17 2009 -0400 +++ b/lib/galaxy/visualization/tracks/data/array_tree.py Fri Sep 18 16:09:14 2009 -0400 @@ -3,7 +3,10 @@ """ import pkg_resources; pkg_resources.require( "bx-python" ) -from bx.arrays.array_tree import FileArrayTreeDict +try: + from bx.arrays.array_tree import FileArrayTreeDict +except: + pass from math import floor, ceil, log # Maybe this should be included in the datatype itself, so users can add their

1 0

[hg] galaxy 2727: Comment out references to track store from app.py
by Greg Von Kuster 21 Sep '09

21 Sep '09

details: http://www.bx.psu.edu/hg/galaxy/rev/71dbd24649e4 changeset: 2727:71dbd24649e4 user: James Taylor <james(a)jamestaylor.org> date: Fri Sep 18 21:04:58 2009 -0400 description: Comment out references to track store from app.py 1 file(s) affected in this change: lib/galaxy/app.py diffs (21 lines): diff -r 891e1e2a407d -r 71dbd24649e4 lib/galaxy/app.py --- a/lib/galaxy/app.py Fri Sep 18 16:09:14 2009 -0400 +++ b/lib/galaxy/app.py Fri Sep 18 21:04:58 2009 -0400 @@ -1,7 +1,7 @@ import sys, os, atexit from galaxy import config, jobs, util, tools, web -from galaxy.tracks import store +## from galaxy.tracks import store from galaxy.web import security import galaxy.model import galaxy.datatypes.registry @@ -69,7 +69,7 @@ self.job_queue = self.job_manager.job_queue self.job_stop_queue = self.job_manager.job_stop_queue # Track Store - self.track_store = store.TrackStoreManager( self.config.track_store_path ) + ## self.track_store = store.TrackStoreManager( self.config.track_store_path ) def shutdown( self ): self.job_manager.shutdown()

1 0

[hg] galaxy 2725: Backed out changeset 4e93d6c5665b
by Greg Von Kuster 21 Sep '09

21 Sep '09

details: http://www.bx.psu.edu/hg/galaxy/rev/cb9b12f8e127 changeset: 2725:cb9b12f8e127 user: James Taylor <james(a)jamestaylor.org> date: Fri Sep 18 16:07:17 2009 -0400 description: Backed out changeset 4e93d6c5665b 1 file(s) affected in this change: eggs.ini diffs (18 lines): diff -r 4e93d6c5665b -r cb9b12f8e127 eggs.ini --- a/eggs.ini Fri Sep 18 15:59:19 2009 -0400 +++ b/eggs.ini Fri Sep 18 16:07:17 2009 -0400 @@ -57,12 +57,12 @@ MySQL_python = _5.0.67_static python_lzo = _static flup = .dev_r2311 -bx_python = _dev_r405b4a48b824 +bx_python = _dev_r4bf1f32e6b76 nose = .dev_r101 ; source location, necessary for scrambling [source] -bx_python = http://bitbucket.org/james_taylor/bx-python/get/405b4a48b824.gz +bx_python = http://bitbucket.org/james_taylor/bx-python/get/4bf1f32e6b76.bz2 Cheetah = http://voxel.dl.sourceforge.net/sourceforge/cheetahtemplate/Cheetah-1.0.tar… DRMAA_python = http://gridengine.sunsource.net/files/documents/7/36/DRMAA-python-0.2.tar.gz MySQL_python = http://superb-west.dl.sourceforge.net/sourceforge/mysql-python/MySQL-python… http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.67.tar.gz

1 0

[hg] galaxy 2723: Commenting out functional test for fastx_colla...
by Greg Von Kuster 21 Sep '09

21 Sep '09

details: http://www.bx.psu.edu/hg/galaxy/rev/5e78a1fd1351 changeset: 2723:5e78a1fd1351 user: guru date: Fri Sep 18 15:48:06 2009 -0400 description: Commenting out functional test for fastx_collapser tool as the order of sequences in the output seems to differ between 32 bit and 64 bit machines. 1 file(s) affected in this change: tools/fastx_toolkit/fastx_collapser.xml diffs (19 lines): diff -r 6ed5f088a2ad -r 5e78a1fd1351 tools/fastx_toolkit/fastx_collapser.xml --- a/tools/fastx_toolkit/fastx_collapser.xml Fri Sep 18 15:28:18 2009 -0400 +++ b/tools/fastx_toolkit/fastx_collapser.xml Fri Sep 18 15:48:06 2009 -0400 @@ -6,13 +6,14 @@ <param format="fastqsolexa,fasta" name="input" type="data" label="Library to collapse" /> </inputs> +  <outputs> <data format="fasta" name="output" metadata_source="input" /> </outputs>

1 0

[hg] galaxy 2724: Update bx egg
by Greg Von Kuster 21 Sep '09

21 Sep '09

details: http://www.bx.psu.edu/hg/galaxy/rev/4e93d6c5665b changeset: 2724:4e93d6c5665b user: Nate Coraor <nate(a)bx.psu.edu> date: Fri Sep 18 15:59:19 2009 -0400 description: Update bx egg 1 file(s) affected in this change: eggs.ini diffs (18 lines): diff -r 5e78a1fd1351 -r 4e93d6c5665b eggs.ini --- a/eggs.ini Fri Sep 18 15:48:06 2009 -0400 +++ b/eggs.ini Fri Sep 18 15:59:19 2009 -0400 @@ -57,12 +57,12 @@ MySQL_python = _5.0.67_static python_lzo = _static flup = .dev_r2311 -bx_python = _dev_r4bf1f32e6b76 +bx_python = _dev_r405b4a48b824 nose = .dev_r101 ; source location, necessary for scrambling [source] -bx_python = http://bitbucket.org/james_taylor/bx-python/get/4bf1f32e6b76.bz2 +bx_python = http://bitbucket.org/james_taylor/bx-python/get/405b4a48b824.gz Cheetah = http://voxel.dl.sourceforge.net/sourceforge/cheetahtemplate/Cheetah-1.0.tar… DRMAA_python = http://gridengine.sunsource.net/files/documents/7/36/DRMAA-python-0.2.tar.gz MySQL_python = http://superb-west.dl.sourceforge.net/sourceforge/mysql-python/MySQL-python… http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.67.tar.gz

1 0

[hg] galaxy 2721: More work on server side for tracks. Now uses ...
by Greg Von Kuster 21 Sep '09

21 Sep '09

details: http://www.bx.psu.edu/hg/galaxy/rev/bed484895e2d changeset: 2721:bed484895e2d user: James Taylor <james(a)jamestaylor.org> date: Fri Sep 18 15:15:39 2009 -0400 description: More work on server side for tracks. Now uses converters instead of indexers. A wiggle to array_tree converter is provided. Still need to purge indexer stuff. This will not work without new bx egg (or likely at all) 12 file(s) affected in this change: datatypes_conf.xml.sample lib/galaxy/datatypes/converters/wiggle_to_array_tree_converter.py lib/galaxy/datatypes/converters/wiggle_to_array_tree_converter.xml lib/galaxy/tracks/__init__.py lib/galaxy/tracks/messages.py lib/galaxy/tracks/store.py lib/galaxy/visualization/__init__.py lib/galaxy/visualization/tracks/__init__.py lib/galaxy/visualization/tracks/data/__init__.py lib/galaxy/visualization/tracks/data/array_tree.py lib/galaxy/web/controllers/tracks.py static/scripts/trackster.js diffs (626 lines): diff -r 3f3712d36034 -r bed484895e2d datatypes_conf.xml.sample --- a/datatypes_conf.xml.sample Fri Sep 18 15:18:57 2009 -0400 +++ b/datatypes_conf.xml.sample Fri Sep 18 15:15:39 2009 -0400 @@ -58,8 +58,9 @@ <datatype extension="blastxml" type="galaxy.datatypes.xml:BlastXml" display_in_upload="true"/> <datatype extension="txtseq.zip" type="galaxy.datatypes.images:Txtseq" mimetype="application/zip" display_in_upload="true"/> <datatype extension="wig" type="galaxy.datatypes.interval:Wiggle" display_in_upload="true"> - <indexer file="wiggle.xml" /> + <converter file="wiggle_to_array_tree_converter.xml" target_datatype="array_tree"/> </datatype> + <datatype extension="array_tree" type="galaxy.datatypes.data:Data" />  <datatype extension="acedb" type="galaxy.datatypes.data:Text"/> <datatype extension="asn1" type="galaxy.datatypes.data:Text"/> diff -r 3f3712d36034 -r bed484895e2d lib/galaxy/datatypes/converters/wiggle_to_array_tree_converter.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/galaxy/datatypes/converters/wiggle_to_array_tree_converter.py Fri Sep 18 15:15:39 2009 -0400 @@ -0,0 +1,29 @@ +#!/usr/bin/env python + +from __future__ import division + +import sys + +import pkg_resources; pkg_resources.require( "bx-python" ) +from bx.arrays.array_tree import * +from bx.arrays.wiggle import IntervalReader + +def main(): + + input_fname = sys.argv[1] + out_fname = sys.argv[2] + + reader = IntervalReader( open( input_fname ) ) + + # Fill array from wiggle + d = array_tree_dict_from_wiggle_reader( reader, {} ) + + for value in d.itervalues(): + value.root.build_summary() + + f = open( out_fname, "w" ) + FileArrayTreeDict.dict_to_file( d, f ) + f.close() + +if __name__ == "__main__": + main() \ No newline at end of file diff -r 3f3712d36034 -r bed484895e2d lib/galaxy/datatypes/converters/wiggle_to_array_tree_converter.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/galaxy/datatypes/converters/wiggle_to_array_tree_converter.xml Fri Sep 18 15:15:39 2009 -0400 @@ -0,0 +1,14 @@ +<tool id="INDEXER_Wiggle_0" name="Index Wiggle for Track Viewer"> +  + <command interpreter="python">wiggle_to_array_tree_converter.py $input $output</command> + <inputs> + <page> + <param format="wiggle" name="input" type="data" label="Choose wiggle"/> + </page> + </inputs> + <outputs> + <data format="array_tree" name="output"/> + </outputs> + <help> + </help> +</tool> \ No newline at end of file diff -r 3f3712d36034 -r bed484895e2d lib/galaxy/tracks/messages.py --- a/lib/galaxy/tracks/messages.py Fri Sep 18 15:18:57 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -PENDING = "pending" -NO_DATA = "no data" -NO_CHROMOSOME = "no chromosome" -DATA = "data" diff -r 3f3712d36034 -r bed484895e2d lib/galaxy/tracks/store.py --- a/lib/galaxy/tracks/store.py Fri Sep 18 15:18:57 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ -import os -import re -from string import Template -from galaxy.util import sanitize_text - -# extra mappings/escape to keep users from traversing around the -# filesystem and wreaking havoc -extra_mappings = { r"/": "__fs__", r"^manifest.tab$": "__manifest.tab__" } - -def sanitize_name( name ): - name = sanitize_text( name ) - for key, value in extra_mappings.items(): - name = re.sub( key, value, name ) - return name - -class TemplateSubber( object ): - def __init__(self, obj): - self.obj = obj - def get( self, key, default=None ): - return getattr(self.obj, key, default) - def __getitem__(self, key): - return self.get(key) - -class TrackStoreManager( object ): - def __init__(self, path=""): - self.path = path - - def get( self, dataset ): - s = Template(self.path) - return TrackStore( path=s.substitute(TemplateSubber(dataset)) ) - -class TrackStore( object ): - MANIFEST_NAME = "manifest.tab" - - def __init__(self, path=""): - self.path = path - - def get_manifest( self ): - if not self.exists: raise self.DoesNotExist("TrackStore at %s does not exist." % self.path) - manifest_path = os.path.join( self.path, self.MANIFEST_NAME ) - if os.path.exists( manifest_path ): - manifest = {} - for line in open( manifest_path ): - line = line.rstrip("\n\r") - fields = line.split("\t") - manifest[fields[0]] = fields[1:] - return manifest - else: - raise self.DoesNotExist( "Manifest for TrackStore object could not be found." ) - - def get(self, chrom="chr1", resolution=None, **kwargs): - if not self.exists: raise self.DoesNotExist("TrackStore at %s does not exist." % self.path) - object_path = self._get_object_path( chrom, resolution ) - if os.path.exists( object_path ): - return open( object_path, "rb" ) - else: - try: - return kwargs['default'] - except KeyError: - raise self.DoesNotExist("TrackStore object at %s does not exist." % object_path ) - - def set(self, chrom="chr1", resolution=None, data=None): - if not self.exists: self._build_path( self.path ) - if not data: return - object_path = self._get_object_path( chrom, resolution ) - fd = open( object_path, "wb" ) - fd.write( data ) - fd.close() - - def _get_object_path( self, chrom, resolution ): - object_name = sanitize_name(chrom) - if resolution: object_name += "_%d" % resolution - return os.path.join( self.path, object_name ) - - def _build_path( self, path ): - try: - os.mkdir( path ) - except OSError: - self._build_path( os.path.dirname( path ) ) - os.mkdir( path ) - - @property - def exists(self): - return os.path.exists( self.path ) - - class DoesNotExist( Exception ): - pass diff -r 3f3712d36034 -r bed484895e2d lib/galaxy/visualization/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/galaxy/visualization/__init__.py Fri Sep 18 15:15:39 2009 -0400 @@ -0,0 +1,3 @@ +""" +Package for Galaxy visulization plugins. +""" \ No newline at end of file diff -r 3f3712d36034 -r bed484895e2d lib/galaxy/visualization/tracks/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/galaxy/visualization/tracks/__init__.py Fri Sep 18 15:15:39 2009 -0400 @@ -0,0 +1,3 @@ +""" +Package for track style visulization using the trackster UI. +""" \ No newline at end of file diff -r 3f3712d36034 -r bed484895e2d lib/galaxy/visualization/tracks/data/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/galaxy/visualization/tracks/data/__init__.py Fri Sep 18 15:15:39 2009 -0400 @@ -0,0 +1,3 @@ +""" +Package for track data providers +""" \ No newline at end of file diff -r 3f3712d36034 -r bed484895e2d lib/galaxy/visualization/tracks/data/array_tree.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/galaxy/visualization/tracks/data/array_tree.py Fri Sep 18 15:15:39 2009 -0400 @@ -0,0 +1,50 @@ +""" +Array tree data provider for Galaxy track browser. +""" + +import pkg_resources; pkg_resources.require( "bx-python" ) +from bx.arrays.array_tree import FileArrayTreeDict +from math import floor, ceil, log + +# Maybe this should be included in the datatype itself, so users can add their +# own types to the browser as long as they return the right format of data? + +# FIXME: Assuming block size is always 1000 for the moment +BLOCK_SIZE = 1000 + +class ArrayTreeDataProvider( object ): + def __init__( self, dataset ): + self.dataset = dataset + def get_data( self, chrom, start, end ): + start = int( start ) + end = int( end ) + level = int( ceil( log( end - start, BLOCK_SIZE ) ) ) - 1 + print "!!!!", start, end, level + # Open the file + print self.dataset.file_name + d = FileArrayTreeDict( open( self.dataset.file_name ) ) + # Get the right chromosome + try: + chrom_array_tree = d[chrom] + except KeyError: + return None + # Is the requested level valid? + assert 0 <= level <= chrom_array_tree.levels + # Calculate the actual start/range/step of the block we're getting + size = BLOCK_SIZE ** (level+1) + block_start = ( start // BLOCK_SIZE ) * BLOCK_SIZE + block_step = size // BLOCK_SIZE + indexes = range( block_start, block_start + size, block_step ) + # Return either data point or a summary depending on the level + if level > 0: + s = chrom_array_tree.get_summary( start, level ) + if s is not None: + return zip( indexes, map( float, s.sums / s.counts ) ) + else: + return None + else: + v = chrom_array_tree.get_leaf( start ) + if v is not None: + return zip( indexes, map( float, v ) ) + else: + return None \ No newline at end of file diff -r 3f3712d36034 -r bed484895e2d lib/galaxy/web/controllers/tracks.py --- a/lib/galaxy/web/controllers/tracks.py Fri Sep 18 15:18:57 2009 -0400 +++ b/lib/galaxy/web/controllers/tracks.py Fri Sep 18 15:15:39 2009 -0400 @@ -9,18 +9,44 @@ Problems -------- - - Assumes that the only indexing type in Galaxy is for this particular - application. Thus, datatypes can only have one indexer, and the presence - of an indexer results in assuming that datatype can be displayed as a track. - + - Only line tracks supported + - Resolutions are a bit wonky + - Must have a LEN file, not currently able to infer from data (not sure we + need to support that, but need to make user defined build support better) """ import math -from galaxy.tracks import messages from galaxy.util.json import to_json_string from galaxy.web.base.controller import * from galaxy.web.framework import simplejson +from galaxy.util.bunch import Bunch + +from galaxy.visualization.tracks.data.array_tree import ArrayTreeDataProvider + +# Message strings returned to browser +messages = Bunch( + PENDING = "pending", + NO_DATA = "no data", + NO_CHROMOSOME = "no chromosome", + DATA = "data" +) + +# Dataset type required for each track type. This needs to be more flexible, +# there might be mutliple types of indexes that suffice for a given track type. +track_type_to_dataset_type = { + "line": "array_tree" +} + +# Mapping from dataset type to a class that can fetch data from a file of that +# type. This also needs to be more flexible. +dataset_type_to_data_provider = { + "array_tree": ArrayTreeDataProvider +} + +# FIXME: hardcoding this for now, but it should be derived from the available +# converters +browsable_types = set( ["wig" ] ) class TracksController( BaseController ): """ @@ -41,24 +67,26 @@ session = trans.sa_session # If the user clicked the submit button explicately, try to build the browser if browse and dataset_ids: + if not isinstance( dataset_ids, list ): + dataset_ids = [ dataset_ids ] dataset_ids = ",".join( map( str, dataset_ids ) ) trans.response.send_redirect( web.url_for( controller='tracks', action='browser', chrom="", dataset_ids=dataset_ids ) ) - return - # Determine the set of all dbkeys that are used in the current history - dbkeys = [ d.metadata.dbkey for d in trans.get_history().datasets if not d.deleted ] - dbkey_set = set( dbkeys ) - # If a dbkey argument was not provided, or is no longer valid, default - # to the first one - if dbkey is None or dbkey not in dbkey_set: - dbkey = dbkeys[0] - # Find all datasets in the current history that are of that dbkey and - # have an indexer. - datasets = {} - for dataset in session.query( model.HistoryDatasetAssociation ).filter_by( deleted=False, history_id=trans.history.id ): - if dataset.metadata.dbkey == dbkey and trans.app.datatypes_registry.get_indexers_by_datatype( dataset.extension ): - datasets[dataset.id] = dataset.name - # Render the template - return trans.fill_template( "tracks/new_browser.mako", dbkey=dbkey, dbkey_set=dbkey_set, datasets=datasets ) + else: + # Determine the set of all dbkeys that are used in the current history + dbkeys = [ d.metadata.dbkey for d in trans.get_history().datasets if not d.deleted ] + dbkey_set = set( dbkeys ) + # If a dbkey argument was not provided, or is no longer valid, default + # to the first one + if dbkey is None or dbkey not in dbkey_set: + dbkey = dbkeys[0] + # Find all datasets in the current history that are of that dbkey + # and can be displayed + datasets = {} + for dataset in session.query( model.HistoryDatasetAssociation ).filter_by( deleted=False, history_id=trans.history.id ): + if dataset.metadata.dbkey == dbkey and dataset.extension in browsable_types: + datasets[dataset.id] = dataset.name + # Render the template + return trans.fill_template( "tracks/new_browser.mako", dbkey=dbkey, dbkey_set=dbkey_set, datasets=datasets ) @web.expose def browser(self, trans, dataset_ids, chrom=""): @@ -75,13 +103,15 @@ "id": dataset.id } ) dbkey = dataset.dbkey - LEN = self._chroms(trans, dbkey ).get(chrom,0) + chrom_lengths = self._chroms( trans, dbkey ) + if chrom_lengths is None: + error( "No chromosome lengths file found for '%s'" ) return trans.fill_template( 'tracks/browser.mako', dataset_ids=dataset_ids, tracks=tracks, chrom=chrom, dbkey=dbkey, - LEN=LEN ) + LEN=chrom_lengths.get( chrom, 0 ) ) @web.json def chroms(self, trans, dbkey=None ): @@ -91,85 +121,86 @@ """ Called by the browser to get a list of valid chromosomes and lengths """ + # If there is any dataset in the history of extension `len`, this will + # use it db_manifest = trans.db_dataset_for( dbkey ) if not db_manifest: db_manifest = os.path.join( trans.app.config.tool_data_path, 'shared','ucsc','chrom', "%s.len" % dbkey ) else: db_manifest = db_manifest.file_name manifest = {} - if os.path.exists( db_manifest ): - for line in open( db_manifest ): - if line.startswith("#"): continue - line = line.rstrip("\r\n") - fields = line.split("\t") - manifest[fields[0]] = int(fields[1]) - else: - # try to fake a manifest by reading track stores - datasets = trans.app.model.HistoryDatasetAssociation.filter_by(deleted=False, history_id=trans.history.id).all() - for dataset in datasets: - if not dataset.metadata.dbkey == dbkey: continue - track_store = trans.app.track_store.get( dataset ) - if track_store.exists: - try: - for chrom, fields in track_store.get_manifest().items(): - manifest[chrom] = max(manifest.get(chrom, 0), int(fields[0])) - except track_store.DoesNotExist: - pass + if not os.path.exists( db_manifest ): + return None + for line in open( db_manifest ): + if line.startswith("#"): continue + line = line.rstrip("\r\n") + fields = line.split("\t") + manifest[fields[0]] = int(fields[1]) return manifest - - @web.json - def data( self, trans, dataset_id, chrom="", low="", high="" ): + + @web.json + def data( self, trans, dataset_id, track_type, chrom, low, high ): """ Called by the browser to request a block of data """ + # Load the requested dataset dataset = trans.app.model.HistoryDatasetAssociation.get( dataset_id ) - if not dataset: return messages.NO_DATA + # No dataset for that id + if not dataset: + return messages.NO_DATA + # Dataset is in error state, can't display if dataset.state == trans.app.model.Job.states.ERROR: return messages.NO_DATA - if not dataset.state == trans.app.model.Job.states.OK: + # Dataset is still being generated + if dataset.state != trans.app.model.Job.states.OK: return messages.PENDING - track_store = trans.app.track_store.get( dataset ) - if not track_store.exists: - # Test if we can make a track - indexers = trans.app.datatypes_registry.get_indexers_by_datatype( dataset.extension ) - if indexers: - tool = indexers[0] # They are sorted by class chain so use the top one - # If we can, return pending and launch job - job = trans.app.model.Job() - job.session_id = trans.get_galaxy_session().id - job.history_id = trans.history.id - job.tool_id = tool.id - job.tool_version = "1.0.0" - job.add_input_dataset( "input_dataset", dataset ) - job.add_parameter( "input_dataset", to_json_string( dataset.id ) ) - # This is odd - # job.add_output_dataset( "input_dataset", dataset ) - # create store path, this is rather unclear? - track_store.set() - job.add_parameter( "store_path", to_json_string( track_store.path ) ) - job.flush() - trans.app.job_manager.job_queue.put( job.id, tool ) - return messages.PENDING - else: - return messages.NO_DATA - else: - # Data for that chromosome or resolution does not exist? - # HACK: we're "pending" because the store exists without a manifest - try: - track_store.get_manifest() - except track_store.DoesNotExist: - return messages.PENDING - if chrom and low and high: - low = math.floor(float(low)) - high = math.ceil(float(high)) - resolution = dataset.datatype.get_track_resolution( dataset, low, high ) - try: - data = track_store.get( chrom, resolution ) - except track_store.DoesNotExist: - return messages.NO_DATA - window = dataset.datatype.get_track_window( dataset, data, low, high ) - glob = {"data":window, "type":dataset.datatype.get_track_type()}; - if resolution: glob["resolution"] = resolution - return window - else: - return messages.DATA + # Determine what to return based on the type of track being drawn. + converted_dataset_type = track_type_to_dataset_type[track_type] + converted_dataset = self.__dataset_as_type( trans, dataset, converted_dataset_type ) + # If at this point we still don't have an `array_tree_dataset`, there + # is now way we can display this data as an array tree + if converted_dataset is None: + return messages.NO_DATA + # Need to check states again for the converted version + if converted_dataset.state == model.Dataset.states.ERROR: + return messages.NO_DATA + if converted_dataset.state != model.Dataset.states.OK: + return messages.PENDING + # We have a dataset in the right format that is ready to use, wrap in + # a data provider that knows how to access it + data_provider = dataset_type_to_data_provider[ converted_dataset_type ]( converted_dataset ) + # Get the requested chunk of data + data = data_provider.get_data( chrom, low, high ) + # Pack into a dictionary and return + return data + + def __dataset_as_type( self, trans, dataset, type ): + """ + Given a dataset, try to find a way to adapt it to a different type. If the + dataset is already of that type it is returned, if it can be converted a + converted dataset (possibly new) is returned, if it cannot be converted, + None is returned. + """ + # Already of correct type + if dataset.extension == type: + return dataset + # See if we can convert the dataset + if type not in dataset.get_converter_types(): + log.debug( "Converstion from '%s' to '%d' not possible", dataset.extension, type ) + return None + # See if converted dataset already exists + converted_datasets = dataset.get_converted_files_by_type( type ) + if converted_datasets: + for d in converted_datasets: + if d and d.state != 'error': + return d + # Conversion is possible but doesn't exist yet, run converter here + # FIXME: this is largely duplicated from DefaultToolAction + assoc = model.ImplicitlyConvertedDatasetAssociation( parent = dataset, file_type = type, metadata_safe = False ) + new_dataset = dataset.datatype.convert_dataset( trans, dataset, type, return_output = True, visible = False ).values()[0] + new_dataset.hid = dataset.hid # Hrrmmm.... + new_dataset.name = dataset.name + new_dataset.flush() + assoc.dataset = new_dataset + assoc.flush() + return new_dataset diff -r 3f3712d36034 -r bed484895e2d static/scripts/trackster.js --- a/static/scripts/trackster.js Fri Sep 18 15:18:57 2009 -0400 +++ b/static/scripts/trackster.js Fri Sep 18 15:15:39 2009 -0400 @@ -1,4 +1,8 @@ var DENSITY = 1000; + +var BLOCK_SIZE = 1000; + +var log = function( x, b ) { return Math.log( x ) / Math.log( b ) } var View = function( chr, length, low, high ) { this.chr = chr; @@ -83,9 +87,12 @@ high = this.view.high, range = high - low; - var resolution = Math.pow( 10, Math.ceil( Math.log( range / DENSITY ) / Math.log( 10 ) ) ); + var resolution = Math.pow( BLOCK_SIZE, Math.floor( log( range, BLOCK_SIZE ) ) ); + // Math.pow( 10, Math.ceil( Math.log( range / DENSITY ) / Math.log( 10 ) ) ); + + console//.log( "resolution:", resolution ); resolution = Math.max( resolution, 1 ); - resolution = Math.min( resolution, 100000 ); + resolution = Math.min( resolution, 1000000 ); var parent_element = $("<div style='position: relative;'></div>"); this.content_div.children( ":first" ).remove(); @@ -155,7 +162,7 @@ // use closure to preserve this and parameters for getJSON var fetcher = function (ref) { return function () { - $.getJSON( TRACKSTER_DATA_URL + ref.type, { chrom: ref.view.chr, low: low, high: high, dataset_id: ref.track.dataset_id }, function ( data ) { + $.getJSON( TRACKSTER_DATA_URL, { track_type: ref.type, chrom: ref.view.chr, low: low, high: high, dataset_id: ref.track.dataset_id }, function ( data ) { if( data == "pending" ) { setTimeout( fetcher, 5000 ); } else { @@ -175,7 +182,7 @@ Track.call( this, name, view, parent_element ); this.container_div.addClass( "line-track" ); this.dataset_id = dataset_id; - this.cache = new DataCache( "", this, view ); + this.cache = new DataCache( "line", this, view ); }; $.extend( LineTrack.prototype, TiledTrack.prototype, { make_container: function () { @@ -209,35 +216,37 @@ var canvas = element; canvas.get(0).width = canvas.width(); canvas.get(0).height = canvas.height(); - var ctx = canvas.get(0).getContext("2d"); - var in_path = false; - ctx.beginPath(); - var data = chunk.values; - for ( var i = 0; i < data.length - 1; i++ ) { - var x1 = data[i][0] - tile_low; - var y1 = data[i][1]; - var x2 = data[i+1][0] - tile_low; - var y2 = data[i+1][1]; - console.log( x1, y1, x2, y2 ); - // Missing data causes us to stop drawing - if ( isNaN( y1 ) || isNaN( y2 ) ) { - in_path = false; - } else { - // Translate - x1 = x1 * w_scale; - x2 = x2 * w_scale; - y1 = h_scale - y1 * ( h_scale ); - y2 = h_scale - y2 * ( h_scale ); - if ( in_path ) { - ctx.lineTo( x1, y1, x2, y2 ); - } else { - ctx.moveTo( x1, y1, x2, y2 ); - in_path = true; - } - } - } - ctx.stroke(); - return element; + var data = chunk.values; + if ( data ) { + var ctx = canvas.get(0).getContext("2d"); + var in_path = false; + ctx.beginPath(); + // console.log( "Drawing tile" ); + for ( var i = 0; i < data.length - 1; i++ ) { + var x1 = data[i][0] - tile_low; + var y1 = data[i][1]; + var x2 = data[i+1][0] - tile_low; + var y2 = data[i+1][1]; + // Missing data causes us to stop drawing + if ( isNaN( y1 ) || isNaN( y2 ) ) { + in_path = false; + } else { + // Translate + x1 = x1 * w_scale; + x2 = x2 * w_scale; + y1 = h_scale - y1 * ( h_scale ); + y2 = h_scale - y2 * ( h_scale ); + if ( in_path ) { + ctx.lineTo( x1, y1, x2, y2 ); + } else { + ctx.moveTo( x1, y1, x2, y2 ); + in_path = true; + } + } + } + ctx.stroke(); + } + return element; } });

1 0

[hg] galaxy 2722: Fixed a bug in fasta_formatter tool test case, ...
by Greg Von Kuster 21 Sep '09

21 Sep '09

details: http://www.bx.psu.edu/hg/galaxy/rev/6ed5f088a2ad changeset: 2722:6ed5f088a2ad user: guru date: Fri Sep 18 15:28:18 2009 -0400 description: Fixed a bug in fasta_formatter tool test case, which was causing the functional tests to fail. 1 file(s) affected in this change: tools/fastx_toolkit/fasta_formatter.xml diffs (12 lines): diff -r bed484895e2d -r 6ed5f088a2ad tools/fastx_toolkit/fasta_formatter.xml --- a/tools/fastx_toolkit/fasta_formatter.xml Fri Sep 18 15:15:39 2009 -0400 +++ b/tools/fastx_toolkit/fasta_formatter.xml Fri Sep 18 15:28:18 2009 -0400 @@ -21,7 +21,7 @@  <param name="input" value="fasta_formatter1.fasta" /> <param name="width" value="0" /> - <output name="output" file="fastx_formatter1.out" /> + <output name="output" file="fasta_formatter1.out" /> </test> <test>

1 0

[hg] galaxy 2720: Galaxy AMQP Listener, first pass
by Greg Von Kuster 21 Sep '09

21 Sep '09

details: http://www.bx.psu.edu/hg/galaxy/rev/3f3712d36034 changeset: 2720:3f3712d36034 user: rc date: Fri Sep 18 15:18:57 2009 -0400 description: Galaxy AMQP Listener, first pass Added a check for testing completed requests in Requests functional tests 7 file(s) affected in this change: lib/galaxy/web/controllers/requests_admin.py lib/galaxy/web/framework/helpers/grids.py run_galaxy_listener.sh scripts/galaxy_messaging/amqp_consumer.py scripts/galaxy_messaging/galaxydb_interface.py test/functional/test_forms_and_requests.py universe_wsgi.ini.sample diffs (300 lines): diff -r 7f18940a4821 -r 3f3712d36034 lib/galaxy/web/controllers/requests_admin.py --- a/lib/galaxy/web/controllers/requests_admin.py Fri Sep 18 14:21:59 2009 -0400 +++ b/lib/galaxy/web/controllers/requests_admin.py Fri Sep 18 15:18:57 2009 -0400 @@ -98,7 +98,6 @@ else: self.request_grid.default_filter = dict(state=kwargs['show_filter'], deleted=False) self.request_grid.show_filter = kwargs.get('show_filter', trans.app.model.Request.states.SUBMITTED) - self.__update_request_state(trans) # Render the list view return self.request_grid( trans, **kwargs ) @web.expose @@ -980,12 +979,6 @@ request_id=request.id, msg='Bar codes has been saved for this request', messagetype='done')) - - def __update_request_state(self, trans): - requests = trans.app.model.Request.query.filter_by(deleted=False, - state=trans.app.model.Request.states.SUBMITTED) - for request in requests: - self.__set_request_state(request) def __set_request_state(self, request): # check if all the samples of the current request are in the final state diff -r 7f18940a4821 -r 3f3712d36034 lib/galaxy/web/framework/helpers/grids.py --- a/lib/galaxy/web/framework/helpers/grids.py Fri Sep 18 14:21:59 2009 -0400 +++ b/lib/galaxy/web/framework/helpers/grids.py Fri Sep 18 15:18:57 2009 -0400 @@ -121,7 +121,7 @@ return None def build_initial_query( self, session ): return session.query( self.model_class ) - def apply_default_filter( self, trans, query ): + def apply_default_filter( self, trans, query, **kwargs): return query class GridColumn( object ): diff -r 7f18940a4821 -r 3f3712d36034 run_galaxy_listener.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/run_galaxy_listener.sh Fri Sep 18 15:18:57 2009 -0400 @@ -0,0 +1,3 @@ +#!/bin/sh + +python scripts/galaxy_messaging/amqp_consumer.py \ No newline at end of file diff -r 7f18940a4821 -r 3f3712d36034 scripts/galaxy_messaging/amqp_consumer.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/galaxy_messaging/amqp_consumer.py Fri Sep 18 15:18:57 2009 -0400 @@ -0,0 +1,68 @@ +from amqplib import client_0_8 as amqp +import ConfigParser +import sys +import optparse +import xml.dom.minidom +from galaxydb_interface import GalaxyDbInterface + +galaxy_config_file = 'universe_wsgi.ini' +global dbconnstr + +def get_value(dom, tag_name): + ''' + This method extracts the tag value from the xml message + ''' + nodelist = dom.getElementsByTagName(tag_name)[0].childNodes + rc = "" + for node in nodelist: + if node.nodeType == node.TEXT_NODE: + rc = rc + node.data + return rc + +def recv_callback(msg): + #print 'Received: ' + msg.body + ' from channel #' + str(msg.channel.channel_id) + dom = xml.dom.minidom.parseString(msg.body) + barcode = get_value(dom, 'barcode') + state = get_value(dom, 'state') + print barcode, state + # update the galaxy db + galaxy = GalaxyDbInterface(dbconnstr) + sample_id = galaxy.get_sample_id(field_name='bar_code', value=barcode) + if sample_id == -1: + print 'Invalid barcode.' + return + galaxy.change_state(sample_id, state) + +def main(): + config = ConfigParser.ConfigParser() + config.read(galaxy_config_file) + global dbconnstr + dbconnstr = config.get("app:main", "database_connection") + amqp_config = {} + for option in config.options("galaxy:amqp"): + amqp_config[option] = config.get("galaxy:amqp", option) + print amqp_config + conn = amqp.Connection(host=amqp_config['host']+":"+amqp_config['port'], + userid=amqp_config['userid'], + password=amqp_config['password'], + virtual_host=amqp_config['virtual_host'], + insist=False) + chan = conn.channel() + chan.queue_declare(queue=amqp_config['queue'], durable=True, exclusive=True, auto_delete=False) + chan.exchange_declare(exchange=amqp_config['exchange'], type="direct", durable=True, auto_delete=False,) + chan.queue_bind(queue=amqp_config['queue'], + exchange=amqp_config['exchange'], + routing_key=amqp_config['routing_key']) + + chan.basic_consume(queue=amqp_config['queue'], + no_ack=True, + callback=recv_callback, + consumer_tag="testtag") + while True: + chan.wait() + chan.basic_cancel("testtag") + chan.close() + conn.close() + +if __name__ == '__main__': + main() \ No newline at end of file diff -r 7f18940a4821 -r 3f3712d36034 scripts/galaxy_messaging/galaxydb_interface.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/galaxy_messaging/galaxydb_interface.py Fri Sep 18 15:18:57 2009 -0400 @@ -0,0 +1,141 @@ +#/usr/bin/python + +from sqlalchemy import * +from sqlalchemy.orm import sessionmaker +from datetime import datetime, timedelta +import sys +import optparse +import os +import time +import logging + +logging.basicConfig(level=logging.DEBUG) +log = logging.getLogger( 'GalaxyDbInterface' ) + +class GalaxyDbInterface(object): + + def __init__(self, dbstr): + self.dbstr = dbstr + self.db_engine = create_engine(self.dbstr) +# self.db_engine.echo = True + self.metadata = MetaData(self.db_engine) + self.session = sessionmaker(bind=self.db_engine) + self.event_table = Table('sample_event', self.metadata, autoload=True ) + self.sample_table = Table('sample', self.metadata, autoload=True ) + self.request_table = Table('request', self.metadata, autoload=True ) + self.state_table = Table('sample_state', self.metadata, autoload=True ) + + def get_sample_id(self, field_name='bar_code', value=None): + if not value: + return -1 + sample_id = -1 + if field_name =='name': + stmt = select(columns=[self.sample_table.c.id], + whereclause=self.sample_table.c.name==value) + result = stmt.execute() + sample_id = result.fetchone()[0] + elif field_name == 'bar_code': + stmt = select(columns=[self.sample_table.c.id], + whereclause=self.sample_table.c.bar_code==value) + result = stmt.execute() + x = result.fetchone() + if x: + sample_id = x[0] + log.debug('Sample ID: %i' % sample_id) + return sample_id + log.warning('This sample %s %s does not belong to any sample in the database.' % (field_name, value)) + return -1 + + def current_state(self, sample_id): + ''' + This method returns the current state of the sample for the given sample_id + ''' + stmt = select(columns=[self.event_table.c.sample_state_id], + whereclause=self.event_table.c.sample_id==sample_id, + order_by=self.event_table.c.update_time.desc()) + result = stmt.execute() + all_states = result.fetchall() + current_state_id = all_states[0][0] + return current_state_id + + def all_possible_states(self, sample_id): + subsubquery = select(columns=[self.sample_table.c.request_id], + whereclause=self.sample_table.c.id==sample_id) + self.request_id = subsubquery.execute().fetchall()[0][0] + log.debug('REQUESTID: %i' % self.request_id) + subquery = select(columns=[self.request_table.c.request_type_id], + whereclause=self.request_table.c.id==self.request_id) + request_type_id = subquery.execute().fetchall()[0][0] + log.debug('REQUESTTYPEID: %i' % request_type_id) + query = select(columns=[self.state_table.c.id, self.state_table.c.name], + whereclause=self.state_table.c.request_type_id==request_type_id, + order_by=self.state_table.c.id.asc()) + states = query.execute().fetchall() + log.debug('POSSIBLESTATES: '+ str(states)) + return states + + def change_state(self, sample_id, new_state=None): + ''' + This method changes the state of the sample to the the 'new_state' + ''' + if not new_state: + return + new_state_id = -1 + # find the state_id for this new state in the list of possible states + possible_states = self.all_possible_states(sample_id) + for state_id, state_name in possible_states: + if new_state == state_name: + new_state_id = state_id + if new_state_id == -1: + return + log.debug('Updating sample_id %i state to %s' % (sample_id, new_state)) + d = timedelta(hours=4) + i = self.event_table.insert() + i.execute(update_time=datetime.now()+d, + create_time=datetime.now()+d, + sample_id=sample_id, + sample_state_id=int(new_state_id), + comment='bar code scanner') + # if all the samples for this request are in the final state + # then change the request state to 'Complete' + result = select(columns=[self.sample_table.c.id], + whereclause=self.sample_table.c.request_id==self.request_id).execute() + sample_id_list = result.fetchall() + request_complete = True + for sid in sample_id_list: + current_state_id = self.current_state(sid[0]) + if current_state_id != possible_states[-1][0]: + request_complete = False + break + if request_complete: + request_state = 'Complete' + else: + request_state = 'Submitted' + log.debug('Updating request_id %i state to "%s"' % (self.request_id, request_state)) + d = timedelta(hours=4) + i = self.request_table.update(whereclause=self.request_table.c.id==self.request_id, + values={self.request_table.c.state: request_state}) + i.execute() + + + +if __name__ == '__main__': + print '''This file should not be run directly. To start the Galaxy AMQP Listener: + %sh run_galaxy_listener.sh''' +# dbstr = 'postgres://postgres:postgres@localhost/galaxy_ft' +# +# parser = optparse.OptionParser() +# parser.add_option('-n', '--name', help='name of the sample field', dest='name', \ +# action='store', default='bar_code') +# parser.add_option('-v', '--value', help='value of the sample field', dest='value', \ +# action='store') +# parser.add_option('-s', '--state', help='new state of the sample', dest='state', \ +# action='store') +# (opts, args) = parser.parse_args() +# +# gs = GalaxyDbInterface(dbstr) +# sample_id = gs.get_sample_id(field_name=opts.name, value=opts.value) +# gs.change_state(sample_id, opts.state) + + + diff -r 7f18940a4821 -r 3f3712d36034 test/functional/test_forms_and_requests.py --- a/test/functional/test_forms_and_requests.py Fri Sep 18 14:21:59 2009 -0400 +++ b/test/functional/test_forms_and_requests.py Fri Sep 18 15:18:57 2009 -0400 @@ -247,6 +247,8 @@ self.home() request_one.refresh() # check if the request's state is now set to 'complete' + self.visit_url('%s/requests_admin/list?show_filter=Complete' % self.url) + self.check_page_for_string( request_one.name ) assert request_one.state is not request_one.states.COMPLETE, "The state of the request '%s' should be set to '%s'" % ( request_one.name, request_one.states.COMPLETE ) # def test_40_admin_create_request_on_behalf_of_regular_user( self ): # """Testing creating and submitting a request as an admin on behalf of a regular user""" diff -r 7f18940a4821 -r 3f3712d36034 universe_wsgi.ini.sample --- a/universe_wsgi.ini.sample Fri Sep 18 14:21:59 2009 -0400 +++ b/universe_wsgi.ini.sample Fri Sep 18 15:18:57 2009 -0400 @@ -240,3 +240,22 @@ ucsc_table_direct_archaea1 = local:/// ucsc_table_direct_test1 = local:/// upload1 = local:/// + + +# Galaxy Message Queue +# Galaxy uses AMQ protocol to receive messages from external sources like +# bar code scanners. Galaxy has been tested against RabbitMQ AMQP implementation. +# For Galaxy to receive messages from a message queue the RabbitMQ server has +# to be set up with a user account and other parameters listed below. The 'host' +# and 'port' fields should point to where the RabbitMQ server is running. + +#[galaxy:amqp] +#host = 127.0.0.1 +#port = 5672 +#userid = galaxy +#password = galaxy +#virtual_host = galaxy_messaging_engine +#queue = galaxy_queue +#exchange = galaxy_exchange +#routing_key = bar_code_scanner +

1 0

[hg] galaxy 2719: Adding qualsolid_boxplot_graph.sh script used ...
by Greg Von Kuster 21 Sep '09

21 Sep '09

details: http://www.bx.psu.edu/hg/galaxy/rev/7f18940a4821 changeset: 2719:7f18940a4821 user: guru date: Fri Sep 18 14:21:59 2009 -0400 description: Adding qualsolid_boxplot_graph.sh script used by SOLiD quality boxplot tool to the distribution. 2 file(s) affected in this change: tools/solid_tools/qualsolid_boxplot_graph.sh tools/solid_tools/solid_qual_boxplot.xml diffs (110 lines): diff -r cbf8667219a4 -r 7f18940a4821 tools/solid_tools/qualsolid_boxplot_graph.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/solid_tools/qualsolid_boxplot_graph.sh Fri Sep 18 14:21:59 2009 -0400 @@ -0,0 +1,94 @@ +#!/bin/sh + +# Modified fastq_quality_boxplot_graph.sh from FASTX-toolkit - FASTA/FASTQ preprocessing tools. +# Copyright (C) 2009 A. Gordon (gordon(a)cshl.edu) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +function usage() +{ + echo "SOLiD-Quality BoxPlot plotter" + echo "Generates a SOLiD quality score box-plot graph " + echo + echo "Usage: $0 [-i INPUT.TXT] [-t TITLE] [-p] [-o OUTPUT]" + echo + echo " [-p] - Generate PostScript (.PS) file. Default is PNG image." + echo " [-i INPUT.TXT] - Input file. Should be the output of \"solid_qual_stats\" program." + echo " [-o OUTPUT] - Output file name. default is STDOUT." + echo " [-t TITLE] - Title (usually the solid file name) - will be plotted on the graph." + echo + exit +} + +# +# Input Data columns: #pos cnt min max sum mean Q1 med Q3 IQR lW rW +# As produced by "solid_qual_stats" program + +TITLE="" # default title is empty +FILENAME="" +OUTPUTTERM="set term png size 800,600" +OUTPUTFILE="/dev/stdout" # Default output file is simply "stdout" +while getopts ":t:i:o:ph" Option + do + case $Option in + # w ) CMD=$OPTARG; FILENAME="PIMSLogList.txt"; TARGET="logfiles"; ;; + t ) TITLE="for $OPTARG" ;; + i ) FILENAME=$OPTARG ;; + o ) OUTPUTFILE="$OPTARG" ;; + p ) OUTPUTTERM="set term postscript enhanced color \"Helvetica\" 4" ;; + h ) usage ;; + * ) echo "unrecognized argument. use '-h' for usage information."; exit -1 ;; + esac +done +shift $(($OPTIND - 1)) + + +if [ "$FILENAME" == "" ]; then + usage +fi + +if [ ! -r "$FILENAME" ]; then + echo "Error: can't open input file ($1)." >&2 + exit 1 +fi + +#Read number of cycles from the stats file (each line is a cycle, minus the header line) +#But for the graph, I want xrange to reach (num_cycles+1), so I don't subtract 1 now. +NUM_CYCLES=$(cat "$FILENAME" | wc -l) + +GNUPLOTCMD=" +$OUTPUTTERM +set boxwidth 0.8 +set size 1,1 +set key Left inside +set xlabel \"read position\" +set ylabel \"Quality Score \" +set title \"Quality Scores $TITLE\" +#set auto x +set bars 4.0 +set xrange [ 0: $NUM_CYCLES ] +set yrange [-2:45] +set y2range [-2:45] +set xtics 1 +set x2tics 1 +set ytics 2 +set y2tics 2 +set tics out +set grid ytics +set style fill empty +plot '$FILENAME' using 1:7:11:12:9 with candlesticks lt 1 lw 1 title 'Quartiles' whiskerbars, \ + '' using 1:8:8:8:8 with candlesticks lt -1 lw 2 title 'Medians' +" + +echo "$GNUPLOTCMD" | gnuplot > "$OUTPUTFILE" diff -r cbf8667219a4 -r 7f18940a4821 tools/solid_tools/solid_qual_boxplot.xml --- a/tools/solid_tools/solid_qual_boxplot.xml Fri Sep 18 13:59:50 2009 -0400 +++ b/tools/solid_tools/solid_qual_boxplot.xml Fri Sep 18 14:21:59 2009 -0400 @@ -1,7 +1,7 @@ <tool id="solid_qual_boxplot" name="Quality Boxplot" version="1.0.0"> <description>for SOLiD data</description> - <command>qualsolid_boxplot_graph.sh -t '$input.name' -i $input -o $output</command> + <command interpreter="bash">qualsolid_boxplot_graph.sh -t '$input.name' -i $input -o $output</command> <inputs> <param format="txt" name="input" type="data" label="Statistics report file (output of 'Quality Statistics for SOLiD data' tool)" />

1 0

[hg] galaxy 2717: Added pileup-to-interval tool to tool_conf.xml...
by Greg Von Kuster 21 Sep '09

21 Sep '09

details: http://www.bx.psu.edu/hg/galaxy/rev/99b5db852719 changeset: 2717:99b5db852719 user: Kelly Vincent <kpvincent(a)bx.psu.edu> date: Fri Sep 18 13:58:43 2009 -0400 description: Added pileup-to-interval tool to tool_conf.xml.sample 1 file(s) affected in this change: tool_conf.xml.sample diffs (11 lines): diff -r 079541496366 -r 99b5db852719 tool_conf.xml.sample --- a/tool_conf.xml.sample Fri Sep 18 13:45:14 2009 -0400 +++ b/tool_conf.xml.sample Fri Sep 18 13:58:43 2009 -0400 @@ -207,6 +207,7 @@ <tool file="samtools/sam_merge.xml" /> <tool file="samtools/sam_pileup.xml" /> <tool file="samtools/pileup_parser.xml" /> + <tool file="samtools/pileup_interval.xml" /> </section> <section name="Rg Data" id="rgData1"> <tool file="rgenetics/rgenetics_import.xml"/>

1 0