March 2011 - galaxy-commits - lists.galaxyproject.org

commit/galaxy-central: dan: Enhance Bowtie wrapper to accept non-sanger variant FASTQ files.
by Bitbucket 02 Mar '11

02 Mar '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/7a9476924daf/ changeset: r5157:7a9476924daf user: dan date: 2011-03-02 17:40:58 summary: Enhance Bowtie wrapper to accept non-sanger variant FASTQ files. affected #: 10 files (7.5 KB) --- a/tools/sr_mapping/bowtie_color_wrapper.xml Wed Mar 02 11:34:36 2011 -0500 +++ b/tools/sr_mapping/bowtie_color_wrapper.xml Wed Mar 02 11:40:58 2011 -0500 @@ -7,7 +7,7 @@ --threads="4" ## Outputs --output=$output - #if $singlePaired == "single" + #if str( $singlePaired.sPaired ) == "single" #if $output_unmapped_reads_l --output_unmapped_reads=$output_unmapped_reads_l #end if --- a/tools/sr_mapping/bowtie_wrapper.py Wed Mar 02 11:34:36 2011 -0500 +++ b/tools/sr_mapping/bowtie_wrapper.py Wed Mar 02 11:40:58 2011 -0500 @@ -67,6 +67,11 @@ import optparse, os, shutil, subprocess, sys, tempfile +#Allow more than Sanger encoded variants +DEFAULT_ASCII_ENCODING = '--phred33-quals' +GALAXY_FORMAT_TO_QUALITY_SCORE_ENCODING_ARG = { 'fastqsanger':'--phred33-quals', 'fastqillumina':'--phred64-quals', 'fastqsolexa':'--solexa-quals' } +#FIXME: Integer quality scores are supported only when the '--integer-quals' argument is specified to bowtie; this is not currently able to be set in the tool/wrapper/config + def stop_err( msg ): sys.stderr.write( '%s\n' % msg ) sys.exit() @@ -131,6 +136,7 @@ parser.add_option( '-c', '--icutoff', dest='icutoff', help='Number of first bases of the reference sequence to index' ) parser.add_option( '-x', '--indexSettings', dest='index_settings', help='Whether or not indexing options are to be set' ) parser.add_option( '-H', '--suppressHeader', dest='suppressHeader', help='Suppress header' ) + parser.add_option( '--galaxy_input_format', dest='galaxy_input_format', default="fastqsanger", help='galaxy input format' ) parser.add_option( '--do_not_build_index', dest='do_not_build_index', action="store_true", default=False, help='Flag to specify that provided file is already indexed, use as is' ) (options, args) = parser.parse_args() stdout = '' @@ -255,9 +261,10 @@ mateOrient = '--%s' % options.mateOrient else: mateOrient = '' + quality_score_encoding = GALAXY_FORMAT_TO_QUALITY_SCORE_ENCODING_ARG.get( options.galaxy_input_format, DEFAULT_ASCII_ENCODING ) if options.params == 'preSet': - aligning_cmds = '-q %s %s -p %s -S %s %s ' % \ - ( maxInsert, mateOrient, options.threads, suppressHeader, colorspace ) + aligning_cmds = '-q %s %s -p %s -S %s %s %s ' % \ + ( maxInsert, mateOrient, options.threads, suppressHeader, colorspace, quality_score_encoding ) else: try: if options.skip and int( options.skip ) > 0: @@ -386,14 +393,15 @@ else: keepends = '' aligning_cmds = '-q %s %s -p %s -S %s %s %s %s %s %s %s %s %s %s %s %s ' \ - '%s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s' % \ + '%s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s ' % \ ( maxInsert, mateOrient, options.threads, suppressHeader, colorspace, skip, alignLimit, trimH, trimL, maqSoapAlign, mismatchSeed, mismatchQual, seedLen, rounding, minInsert, maxAlignAttempt, forwardAlign, reverseAlign, maxBacktracks, tryHard, valAlign, allValAligns, suppressAlign, best, strata, offrate, seed, snpphred, snpfrac, keepends, - output_unmapped_reads, output_suppressed_reads ) + output_unmapped_reads, output_suppressed_reads, + quality_score_encoding ) except ValueError, e: # clean up temp dir if os.path.exists( tmp_index_dir ): --- a/tools/sr_mapping/bowtie_wrapper.xml Wed Mar 02 11:34:36 2011 -0500 +++ b/tools/sr_mapping/bowtie_wrapper.xml Wed Mar 02 11:40:58 2011 -0500 @@ -8,13 +8,14 @@ --threads="4" ## Outputs --output=$output - #if $singlePaired == "single" + #if str( $singlePaired.sPaired ) == "single" #if $output_unmapped_reads_l --output_unmapped_reads=$output_unmapped_reads_l #end if #if $output_suppressed_reads_l --output_suppressed_reads=$output_suppressed_reads_l #end if + --galaxy_input_format="${singlePaired.sInput1.ext}" #else #if $output_unmapped_reads_l and $output_unmapped_reads_r --output_unmapped_reads_l=$output_unmapped_reads_l @@ -24,9 +25,10 @@ --output_suppressed_reads_l=$output_suppressed_reads_l --output_suppressed_reads_r=$output_suppressed_reads_r #end if + --galaxy_input_format="${singlePaired.pInput1.ext}" #end if ## Inputs - --dataType="solexa" + --dataType="solexa" ##this indicates that nucleotide base space is used in the wrapper --suppressHeader=$suppressHeader --genomeSource=$refGenomeSource.genomeSource #if $refGenomeSource.genomeSource == "history": @@ -59,7 +61,8 @@ #end if #else ##use pre-built index - --ref="${ filter( lambda x: str( x[0] ) == str( $refGenomeSource.index ), $__app__.tool_data_tables[ 'bowtie_indexes' ].get_fields() )[0][-1] }" + ##--ref="${ filter( lambda x: str( x[0] ) == str( $refGenomeSource.index ), $__app__.tool_data_tables[ 'bowtie_indexes' ].get_fields() )[0][-1] }" + --ref="${ refGenomeSource.index.fields.path }" #end if --paired=$singlePaired.sPaired #if $singlePaired.sPaired == "single": @@ -191,7 +194,7 @@ <option value="paired">Paired-end</option></param><when value="single"> - <param name="sInput1" type="data" format="fastqsanger" label="FASTQ file" help="Must have Sanger-scaled quality values with ASCII offset 33"/> + <param name="sInput1" type="data" format="fastqsanger,fastqillumina,fastqsolexa" label="FASTQ file" help="Must have ASCII encoded quality scores"/><conditional name="sParams"><param name="sSettingsType" type="select" label="Bowtie settings to use" help="For most mapping needs use Commonly used settings. If you want full control use Full parameter list"><option value="preSet">Commonly used</option> @@ -245,8 +248,14 @@ </conditional></when><when value="paired"> - <param name="pInput1" type="data" format="fastqsanger" label="Forward FASTQ file" help="Must have Sanger-scaled quality values with ASCII offset 33"/> - <param name="pInput2" type="data" format="fastqsanger" label="Reverse FASTQ file" help="Must have Sanger-scaled quality values with ASCII offset 33"/> + <param name="pInput1" type="data" format="fastqsanger,fastqillumina,fastqsolexa" label="Forward FASTQ file" help="Must have ASCII encoded quality scores"/> + <param name="pInput2" type="data" format="fastqsanger,fastqillumina,fastqsolexa" label="Reverse FASTQ file" help="File format must match the Forward FASTQ file"> + <options options_filter_attribute="ext" from_parameter="tool.app.datatypes_registry.datatypes_by_extension" transform_lines="obj.keys()">> + <column name="name" index="0"/> + <column name="value" index="0"/> + <filter type="param_value" ref="pInput1" ref_attribute="ext" column="0"/> + </options> + </param><param name="pMaxInsert" type="integer" value="1000" label="Maximum insert size for valid paired-end alignments (-X)" /><param name="pMateOrient" type="select" label="The upstream/downstream mate orientation for valid paired-end alignment against the forward reference strand (--fr/--rf/--ff)"><option value="fr">FR (for Illumina)</option> @@ -333,7 +342,7 @@ </conditional></actions></data> - <data format="fastqsanger" name="output_suppressed_reads_l" label="${tool.name} on ${on_string}: suppressed reads (L)"> + <data format="fastq" name="output_suppressed_reads_l" label="${tool.name} on ${on_string}: suppressed reads (L)"><filter>(( singlePaired['sPaired'] == "single" and singlePaired['sParams']['sSettingsType'] == "full" and @@ -344,13 +353,41 @@ singlePaired['pParams']['pMaxFile'] is True )) </filter> + <actions> + <conditional name="singlePaired.sPaired"> + <when value="single"> + <action type="format"> + <option type="from_param" name="singlePaired.sInput1" param_attribute="ext" /> + </action> + </when> + <when value="paired"> + <action type="format"> + <option type="from_param" name="singlePaired.pInput1" param_attribute="ext" /> + </action> + </when> + </conditional> + </actions></data> - <data format="fastqsanger" name="output_suppressed_reads_r" label="${tool.name} on ${on_string}: suppressed reads (R)"> + <data format="fastq" name="output_suppressed_reads_r" label="${tool.name} on ${on_string}: suppressed reads (R)"><filter>singlePaired['sPaired'] == "paired"</filter><filter>singlePaired['pParams']['pSettingsType'] == "full"</filter><filter>singlePaired['pParams']['pMaxFile'] is True</filter> + <actions> + <conditional name="singlePaired.sPaired"> + <when value="single"> + <action type="format"> + <option type="from_param" name="singlePaired.sInput1" param_attribute="ext" /> + </action> + </when> + <when value="paired"> + <action type="format"> + <option type="from_param" name="singlePaired.pInput1" param_attribute="ext" /> + </action> + </when> + </conditional> + </actions></data> - <data format="fastqsanger" name="output_unmapped_reads_l" label="${tool.name} on ${on_string}: unmapped reads (L)"> + <data format="fastq" name="output_unmapped_reads_l" label="${tool.name} on ${on_string}: unmapped reads (L)"><filter> (( singlePaired['sPaired'] == "single" and @@ -362,11 +399,39 @@ singlePaired['pParams']['pUnmappedFile'] is True )) </filter> + <actions> + <conditional name="singlePaired.sPaired"> + <when value="single"> + <action type="format"> + <option type="from_param" name="singlePaired.sInput1" param_attribute="ext" /> + </action> + </when> + <when value="paired"> + <action type="format"> + <option type="from_param" name="singlePaired.pInput1" param_attribute="ext" /> + </action> + </when> + </conditional> + </actions></data> - <data format="fastqsanger" name="output_unmapped_reads_r" label="${tool.name} on ${on_string}: unmapped reads (R)"> + <data format="fastq" name="output_unmapped_reads_r" label="${tool.name} on ${on_string}: unmapped reads (R)"><filter>singlePaired['sPaired'] == "paired"</filter><filter>singlePaired['pParams']['pSettingsType'] == "full"</filter><filter>singlePaired['pParams']['pUnmappedFile'] is True</filter> + <actions> + <conditional name="singlePaired.sPaired"> + <when value="single"> + <action type="format"> + <option type="from_param" name="singlePaired.sInput1" param_attribute="ext" /> + </action> + </when> + <when value="paired"> + <action type="format"> + <option type="from_param" name="singlePaired.pInput1" param_attribute="ext" /> + </action> + </when> + </conditional> + </actions></data></outputs><tests> @@ -379,6 +444,7 @@ chrM_base needs to be the base location/name of the index files. --><param name="genomeSource" value="indexed" /> + <param name="index" value="equCab2chrM" /><param name="sPaired" value="single" /><param name="sInput1" ftype="fastqsanger" value="bowtie_in2.fastqsanger" /> @@ -437,6 +503,86 @@ <output name="output_unmapped_reads_l" ftype="fastqsanger" file="bowtie_out8_1.fastq" sort="True" /><output name="output_unmapped_reads_r" ftype="fastqsanger" file="bowtie_out8_2.fastq" sort="True" /></test> +  + <test> + <param name="genomeSource" value="history" /> + <param name="ownFile" value="phiX.fasta" /> + <param name="indexSettings" value="indexPreSet" /> + <param name="sPaired" value="paired" /> + <param name="pInput1" ftype="fastqillumina" value="bowtie_in5.fastqillumina" /> + <param name="pInput2" ftype="fastqillumina" value="bowtie_in6.fastqillumina" /> + <param name="pMaxInsert" value="1000" /> + <param name="pMateOrient" value="ff" /> + <param name="pSettingsType" value="full" /> + <param name="pSkip" value="0" /> + <param name="pAlignLimit" value="-1" /> + <param name="pTrimH" value="0" /> + <param name="pTrimL" value="0" /> + <param name="pMismatchSeed" value="2" /> + <param name="pMismatchQual" value="70" /> + <param name="pSeedLen" value="28" /> + <param name="pRounding" value="round" /> + <param name="pMaqSoapAlign" value="-1" /> + <param name="pMinInsert" value="0" /> + <param name="pMaxAlignAttempt" value="100" /> + <param name="pForwardAlign" value="forward" /> + <param name="pReverseAlign" value="reverse" /> + <param name="pTryHard" value="noTryHard" /> + <param name="pValAlign" value="1" /> + <param name="pAllValAligns" value="noAllValAligns" /> + <param name="pSuppressAlign" value="-1" /> + <param name="pUnmappedFile" value="true" /> + <param name="pMaxFile" value="false" /> + <param name="pBest" value="doBest" /> + <param name="pdMaxBacktracks" value="800" /> + <param name="pdStrata" value="noStrata" /> + <param name="pOffrate" value="-1" /> + <param name="pSeed" value="-1" /> + <param name="suppressHeader" value="true" /> + <output name="output" ftype="sam" file="bowtie_out7.sam" sort="True" /> + <output name="output_unmapped_reads_l" ftype="fastqillumna" file="bowtie_out8_1.fastqillumina.sorted" sort="True" /> + <output name="output_unmapped_reads_r" ftype="fastqillumna" file="bowtie_out8_2.fastqillumina.sorted" sort="True" /> + </test> + <test> + <param name="genomeSource" value="history" /> + <param name="ownFile" value="phiX.fasta" /> + <param name="indexSettings" value="indexPreSet" /> + <param name="sPaired" value="paired" /> + <param name="pInput1" ftype="fastqsolexa" value="bowtie_in5.fastqsolexa" /> + <param name="pInput2" ftype="fastqsolexa" value="bowtie_in6.fastqsolexa" /> + <param name="pMaxInsert" value="1000" /> + <param name="pMateOrient" value="ff" /> + <param name="pSettingsType" value="full" /> + <param name="pSkip" value="0" /> + <param name="pAlignLimit" value="-1" /> + <param name="pTrimH" value="0" /> + <param name="pTrimL" value="0" /> + <param name="pMismatchSeed" value="2" /> + <param name="pMismatchQual" value="70" /> + <param name="pSeedLen" value="28" /> + <param name="pRounding" value="round" /> + <param name="pMaqSoapAlign" value="-1" /> + <param name="pMinInsert" value="0" /> + <param name="pMaxAlignAttempt" value="100" /> + <param name="pForwardAlign" value="forward" /> + <param name="pReverseAlign" value="reverse" /> + <param name="pTryHard" value="noTryHard" /> + <param name="pValAlign" value="1" /> + <param name="pAllValAligns" value="noAllValAligns" /> + <param name="pSuppressAlign" value="-1" /> + <param name="pUnmappedFile" value="true" /> + <param name="pMaxFile" value="false" /> + <param name="pBest" value="doBest" /> + <param name="pdMaxBacktracks" value="800" /> + <param name="pdStrata" value="noStrata" /> + <param name="pOffrate" value="-1" /> + <param name="pSeed" value="-1" /> + <param name="suppressHeader" value="true" /> + <output name="output" ftype="sam" file="bowtie_out7.sam" sort="True" /> + <output name="output_unmapped_reads_l" ftype="fastqsolexa" file="bowtie_out8_1.fastqsolexa.sorted" sort="True" /> + <output name="output_unmapped_reads_r" ftype="fastqsolexa" file="bowtie_out8_2.fastqsolexa.sorted" sort="True" /> + </test> + <test><!-- Bowtie command: 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.

1 0

commit/galaxy-central: dan: Allow FromParamToolOutputActionOption and ParamValueToolOutputActionOptionFilter to access attributes of parameter values.
by Bitbucket 02 Mar '11

02 Mar '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/be70b8497349/ changeset: r5156:be70b8497349 user: dan date: 2011-03-02 17:34:36 summary: Allow FromParamToolOutputActionOption and ParamValueToolOutputActionOptionFilter to access attributes of parameter values. affected #: 1 file (532 bytes) --- a/lib/galaxy/tools/parameters/output.py Wed Mar 02 11:34:03 2011 -0500 +++ b/lib/galaxy/tools/parameters/output.py Wed Mar 02 11:34:36 2011 -0500 @@ -179,11 +179,16 @@ self.column = int( self.column ) self.offset = elem.get( 'offset', -1 ) self.offset = int( self.offset ) + self.param_attribute = elem.get( 'param_attribute', [] ) + if self.param_attribute: + self.param_attribute = self.param_attribute.split( '.' ) def get_value( self, other_values ): value = other_values for ref_name in self.name: assert ref_name in value, "Required dependency '%s' not found in incoming values" % ref_name value = value.get( ref_name ) + for attr_name in self.param_attribute: + value = getattr( value, attr_name ) options = [ [ str( value ) ] ] for filter in self.filters: options = filter.filter_options( options, other_values ) @@ -276,6 +281,9 @@ self.keep = util.string_as_bool( elem.get( "keep", 'True' ) ) self.compare = parse_compare_type( elem.get( 'compare', None ) ) self.cast = parse_cast_attribute( elem.get( "cast", None ) ) + self.param_attribute = elem.get( 'param_attribute', [] ) + if self.param_attribute: + self.param_attribute = self.param_attribute.split( '.' ) def filter_options( self, options, other_values ): if self.ref: #find ref value @@ -283,6 +291,8 @@ for ref_name in self.ref: assert ref_name in value, "Required dependency '%s' not found in incoming values" % ref_name value = value.get( ref_name ) + for attr_name in self.param_attribute: + value = getattr( value, attr_name ) value = str( value ) else: value = self.value 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.

1 0

commit/galaxy-central: dan: Allow DataToolParameter to be filtered on attributes other than dbkey.
by Bitbucket 02 Mar '11

02 Mar '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/f1495dd691c2/ changeset: r5155:f1495dd691c2 user: dan date: 2011-03-02 17:34:03 summary: Allow DataToolParameter to be filtered on attributes other than dbkey. affected #: 1 file (1.3 KB) --- a/lib/galaxy/tools/parameters/basic.py Wed Mar 02 09:59:24 2011 -0500 +++ b/lib/galaxy/tools/parameters/basic.py Wed Mar 02 11:34:03 2011 -0500 @@ -1256,8 +1256,14 @@ options = elem.find( 'options' ) if options is None: self.options = None + self.options_filter_attribute = None else: self.options = dynamic_options.DynamicOptions( options, self ) + + #HACK to get around current hardcoded limitation of when a set of dynamic options is defined for a DataToolParameter + #it always causes available datasets to be filtered by dbkey + #this behavior needs to be entirely reworked (in a backwards compatible manner) + self.options_filter_attribute = options.get( 'options_filter_attribute', None ) self.is_dynamic = self.options is not None # Load conversions required for the dataset input self.conversions = [] @@ -1302,7 +1308,7 @@ # associated with the dataset that restrict it's access from "public". if self.tool and self.tool.tool_type == 'data_destination' and not trans.app.security_agent.dataset_is_public( hda.dataset ): continue - if self.options and hda.get_dbkey() != filter_value: + if self.options and self._options_filter_attribute( hda ) != filter_value: continue if isinstance( hda.datatype, self.formats): selected = ( value and ( hda in value ) ) @@ -1363,7 +1369,7 @@ return False for i, data in enumerate( datasets ): if data.visible and not data.deleted and data.state not in [data.states.ERROR, data.states.DISCARDED] and ( isinstance( data.datatype, self.formats) or is_convertable( data ) ): - if self.options and data.get_dbkey() != filter_value: + if self.options and self._options_filter_attribute( data ) != filter_value: continue most_recent_dataset[0] = data # Also collect children via association object @@ -1437,6 +1443,25 @@ self.tool.visit_inputs( other_values, visitor ) return False not in converter_safe + def _options_filter_attribute( self, value ): + #HACK to get around current hardcoded limitation of when a set of dynamic options is defined for a DataToolParameter + #it always causes available datasets to be filtered by dbkey + #this behavior needs to be entirely reworked (in a backwards compatible manner) + options_filter_attribute = self.options_filter_attribute + if options_filter_attribute is None: + return value.get_dbkey() + if options_filter_attribute.endswith( "()" ): + call_attribute = True + options_filter_attribute = options_filter_attribute[:-2] + else: + call_attribute = False + ref = value + for attribute in options_filter_attribute.split( '.' ): + ref = getattr( ref, attribute ) + if call_attribute: + ref = ref() + return ref + # class RawToolParameter( ToolParameter ): # """ # Completely nondescript parameter, HTML representation is provided as text 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.

1 0

commit/galaxy-central: greg: Clarify what's being searched in the tool shed.
by Bitbucket 02 Mar '11

02 Mar '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/a5cfff74d467/ changeset: r5154:a5cfff74d467 user: greg date: 2011-03-02 15:59:24 summary: Clarify what's being searched in the tool shed. affected #: 1 file (24 bytes) --- a/lib/galaxy/webapps/community/controllers/common.py Wed Mar 02 09:40:10 2011 -0500 +++ b/lib/galaxy/webapps/community/controllers/common.py Wed Mar 02 09:59:24 2011 -0500 @@ -30,6 +30,7 @@ # User has previously rated item; update rating. item_rating.rating = rating item_rating.comment = comment + trans.sa_session.add( item_rating ) trans.sa_session.flush() return item_rating @@ -85,12 +86,10 @@ NameColumn( "Name", key="Tool.name", link=( lambda item: dict( operation="view_tool", id=item.id, webapp="community" ) ), - attach_popup=False - ), + attach_popup=False ), DescriptionColumn( "Description", key="description", - attach_popup=False - ), + attach_popup=False ), VersionColumn( "Version", key="version", attach_popup=False, @@ -119,7 +118,7 @@ key="Category.name", visible=False ) ] - columns.append( grids.MulticolFilterColumn( "Search", + columns.append( grids.MulticolFilterColumn( "Search tool name, description, version", cols_to_filter=[ columns[0], columns[1], columns[2] ], key="free-text-search", visible=False, @@ -165,13 +164,11 @@ key="name", link=( lambda item: dict( operation="tools_by_category", id=item.id, webapp="community" ) ), attach_popup=False, - filterable="advanced" - ), + filterable="advanced" ), DescriptionColumn( "Description", key="description", attach_popup=False, - filterable="advanced" - ), + filterable="advanced" ), # Columns that are valid for filtering but are not visible. grids.DeletedColumn( "Deleted", key="deleted", @@ -181,7 +178,7 @@ model_class=model.Tool, attach_popup=False ) ] - columns.append( grids.MulticolFilterColumn( "Search", + columns.append( grids.MulticolFilterColumn( "Search category name, description", cols_to_filter=[ columns[0], columns[1] ], key="free-text-search", visible=False, 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.

1 0

commit/galaxy-central: rc: Fix for vcf_extract tool test
by Bitbucket 02 Mar '11

02 Mar '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/69552e72d144/ changeset: r5153:69552e72d144 user: rc date: 2011-03-02 15:40:10 summary: Fix for vcf_extract tool test affected #: 1 file (15 bytes) --- a/tools/vcf_tools/extract.xml Wed Mar 02 08:38:19 2011 -0500 +++ b/tools/vcf_tools/extract.xml Wed Mar 02 09:40:10 2011 -0500 @@ -40,7 +40,7 @@ <param name="keep_info" value='' /><param name="discard_info" value='' /><param name="pass_filter" value='true' /> - <output name="output" file="test_extract_pass_filter_quality_9_DP_2000_lt.vcf" ftype="vcf" /> + <output name="output" file="test_extract_pass_filter_quality_9_DP_2000_lt.vcf" lines_diff="6" ftype="vcf" /></test><test><param name="input1" value="test.small.vcf" ftype="vcf" /> 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.

1 0

commit/galaxy-central: dannon: Remove ftype from mosaik/freebayes test outputs.
by Bitbucket 02 Mar '11

02 Mar '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/c44bf3bfdec5/ changeset: r5152:c44bf3bfdec5 user: dannon date: 2011-03-02 14:38:19 summary: Remove ftype from mosaik/freebayes test outputs. affected #: 2 files (24 bytes) --- a/tools/human_genome_variation/freebayes.xml Wed Mar 02 08:28:30 2011 -0500 +++ b/tools/human_genome_variation/freebayes.xml Wed Mar 02 08:38:19 2011 -0500 @@ -115,7 +115,7 @@ <param name="reference" ftype="fasta" value="mosaik_test_ref.fasta"/><param name="bamfile" ftype="bam" value="freebayes_in.bam"/><param name="source_select" value="pre_set"/> - <output name="output" ftype="vcf" file="freebayes_out.vcf" lines_diff="4"/> + <output name="output" file="freebayes_out.vcf" lines_diff="4"/></test></tests><help> --- a/tools/sr_mapping/mosaik.xml Wed Mar 02 08:28:30 2011 -0500 +++ b/tools/sr_mapping/mosaik.xml Wed Mar 02 08:38:19 2011 -0500 @@ -94,7 +94,7 @@ <param name="act" value="35"/><param name="bw" value="19"/><param name="mhp" value="100"/> - <output name="output" ftype="sam" file="mosaik_test_out.sam" compare="sim_size" delta="0"/> + <output name="output" file="mosaik_test_out.sam" compare="sim_size" delta="0"/></test></tests><help> 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.

1 0

commit/galaxy-central: natefoo: Drop the ftype attribute from tophat test outputs
by Bitbucket 02 Mar '11

02 Mar '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/0d30654210e9/ changeset: r5151:0d30654210e9 user: natefoo date: 2011-03-02 14:28:30 summary: Drop the ftype attribute from tophat test outputs affected #: 1 file (118 bytes) --- a/tools/ngs_rna/tophat_wrapper.xml Tue Mar 01 16:39:46 2011 -0500 +++ b/tools/ngs_rna/tophat_wrapper.xml Wed Mar 02 08:28:30 2011 -0500 @@ -412,8 +412,8 @@ <param name="sPaired" value="single" /><param name="input1" ftype="fastqsanger" value="tophat_in2.fastqsanger" /><param name="sSettingsType" value="preSet" /> - <output name="junctions" file="tophat_out1j.bed" ftype="bed" /> - <output name="accepted_hits" file="tophat_out1h.bam" compare="sim_size" ftype="bam" /> + <output name="junctions" file="tophat_out1j.bed" /> + <output name="accepted_hits" file="tophat_out1h.bam" compare="sim_size" /></test><test> @@ -428,8 +428,8 @@ <param name="input2" ftype="fastqsanger" value="tophat_in3.fastqsanger" /><param name="mate_inner_distance" value="20" /><param name="pSettingsType" value="preSet" /> - <output name="junctions" file="tophat_out2j.bed" ftype="bed" /> - <output name="accepted_hits" file="tophat_out2h.bam" compare="sim_size" ftype="bam" /> + <output name="junctions" file="tophat_out2j.bed" /> + <output name="accepted_hits" file="tophat_out2h.bam" compare="sim_size" /></test><test> @@ -469,10 +469,10 @@ <param name="min_coverage_intron" value="50" /><param name="max_coverage_intron" value="20000" /><param name="microexon_search" value="Yes" /> - <output name="insertions" file="tophat_out3i.bed" ftype="bed"/> - <output name="deletions" file="tophat_out3d.bed" ftype="bed"/> - <output name="junctions" file="tophat_out3j.bed" ftype="bed" /> - <output name="accepted_hits" file="tophat_out3h.bam" compare="sim_size" ftype="bam" /> + <output name="insertions" file="tophat_out3i.bed" /> + <output name="deletions" file="tophat_out3d.bed" /> + <output name="junctions" file="tophat_out3j.bed" /> + <output name="accepted_hits" file="tophat_out3h.bam" compare="sim_size" /></test><test> @@ -512,8 +512,8 @@ <param name="min_coverage_intron" value="50" /><param name="max_coverage_intron" value="20000" /><param name="microexon_search" value="Yes" /> - <output name="junctions" file="tophat_out4j.bed" ftype="bed" /> - <output name="accepted_hits" file="tophat_out4h.bam" compare="sim_size" ftype="bam" /> + <output name="junctions" file="tophat_out4j.bed" /> + <output name="accepted_hits" file="tophat_out4h.bam" compare="sim_size" /></test></tests> 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.

1 0

commit/galaxy-central: kanwei: trackster: Difference view setting for ReadTracks: only see sequence on reads if they don't match reference. Align sequence with positional ticks.
by Bitbucket 01 Mar '11

01 Mar '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/24028b35c1cc/ changeset: r5150:24028b35c1cc user: kanwei date: 2011-03-01 22:39:46 summary: trackster: Difference view setting for ReadTracks: only see sequence on reads if they don't match reference. Align sequence with positional ticks. affected #: 1 file (1.1 KB) --- a/static/scripts/trackster.js Tue Mar 01 15:46:35 2011 -0500 +++ b/static/scripts/trackster.js Tue Mar 01 16:39:46 2011 -0500 @@ -9,15 +9,16 @@ * rectangles instead. */ CanvasRenderingContext2D.prototype.dashedLine = function(x1, y1, x2, y2, dashLen) { - if (dashLen == undefined) { dashLen = 4; } + if (dashLen === undefined) { dashLen = 4; } var dX = x2 - x1; var dY = y2 - y1; var dashes = Math.floor(Math.sqrt(dX * dX + dY * dY) / dashLen); var dashX = dX / dashes; var dashY = dY / dashes; + var q; - for (var q= 0; q < dashes; q++, x1 += dashX, y1 += dashY) { - if (q % 2 != 0) { + for (q = 0; q < dashes; q++, x1 += dashX, y1 += dashY) { + if (q % 2 !== 0) { continue; } this.fillRect(x1, y1, dashLen, 1); @@ -45,7 +46,7 @@ this.fill(); this.stroke(); this.closePath(); -} +}; /** * Make `element` sortable in parent by dragging `handle` (a selector) @@ -54,8 +55,9 @@ element.bind( "drag", { handle: handle, relative: true }, function ( e, d ) { var parent = $(this).parent(); var children = parent.children(); + var i; // Determine new position - for ( var i = 0; i < children.length; i++ ) { + for ( i = 0; i < children.length; i++ ) { if ( d.offsetY < $(children.get(i)).position().top ) { break; } @@ -63,12 +65,12 @@ // If not already in the right place, move. Need // to handle the end specially since we don't have // insert at index - if ( i == children.length ) { - if ( this != children.get( i - 1 ) ) { + if ( i === children.length ) { + if ( this !== children.get( i - 1 ) ) { parent.append( this ); } } - else if ( this != children.get( i ) ) { + else if ( this !== children.get( i ) ) { $(this).insertBefore( children.get( i ) ); } }); @@ -115,7 +117,7 @@ * Returns true if there is any overlap between regions. */ function is_overlap(first_region, second_region) { - return (compute_overlap(first_region, second_region) != NO_OVERLAP); + return (compute_overlap(first_region, second_region) !== NO_OVERLAP); } /** @@ -129,7 +131,8 @@ NO_DETAIL_TRACK_HEIGHT = 3, SQUISH_TRACK_HEIGHT = 5, PACK_TRACK_HEIGHT = 10, - NO_DETAIL_FEATURE_HEIGHT = DENSE_FEATURE_HEIGHT = 1, + NO_DETAIL_FEATURE_HEIGHT = 1, + DENSE_FEATURE_HEIGHT = 1, SQUISH_FEATURE_HEIGHT = 3, PACK_FEATURE_HEIGHT = 9, LABEL_SPACING = 2, @@ -206,7 +209,7 @@ $.extend(Cache.prototype, { get: function(key) { var index = this.key_ary.indexOf(key); - if (index != -1) { + if (index !== -1) { this.move_key_to_end(key, index); } return this.obj_cache[key]; @@ -558,11 +561,11 @@ // // If user is navigating to previous/next set of chroms, load new chrom set and return. // - if (chrom == "previous") { + if (chrom === "previous") { view.load_chroms({low: this.chrom_start_index - MAX_CHROMS_SELECTABLE}); return; } - if (chrom == "next") { + if (chrom === "next") { view.load_chroms({low: this.chrom_start_index + MAX_CHROMS_SELECTABLE}); return; } @@ -797,7 +800,7 @@ // Uses a dictionary to construct a tool object. var get_tool_from_dict = function(tool_dict) { - if (obj_length(tool_dict) == 0) { + if (obj_length(tool_dict) === 0) { return undefined; } @@ -901,7 +904,7 @@ for (var i = 0; i < filters_dict.length; i++) { var filter_dict = filters_dict[i]; var name = filter_dict.name, type = filter_dict.type, index = filter_dict.index; - if (type == 'int' || type == 'float') { + if (type === 'int' || type === 'float') { filters[i] = new NumberFilter(name, index); } else { filters[i] = new Filter(name, index, type); @@ -938,9 +941,9 @@ var id = 'param_' + index; var row = $("<div class='form-row' />").appendTo( container ); row.append( $('<label />').attr("for", id ).text( param.label + ":" ) ); - if ( param.type == 'bool' ) { + if ( param.type === 'bool' ) { row.append( $('<input type="checkbox" />').attr("id", id ).attr("name", id ).attr( 'checked', track_config.values[ param.key ] ) ); - } else if ( param.type == 'color' ) { + } else if ( param.type === 'color' ) { var value = track_config.values[ param.key ]; var input = $('<input />').attr("id", id ).attr("name", id ).val( value ); // Color picker in tool tip style float @@ -978,11 +981,11 @@ // Parse value from form element var id = 'param_' + index; var value = container.find( '#' + id ).val(); - if ( param.type == 'float' ) { + if ( param.type === 'float' ) { value = parseFloat( value ); - } else if ( param.type == 'int' ) { + } else if ( param.type === 'int' ) { value = parseInt( value ); - } else if ( param.type == 'bool' ) { + } else if ( param.type === 'bool' ) { value = container.find( '#' + id ).is( ':checked' ); } // Save value only if changed @@ -1066,7 +1069,7 @@ return; } - if ( track.view.chrom != null ) { + if ( track.view.chrom !== null ) { // Get dataset state; if state is fine, enable and draw track. Otherwise, show message // about track status. $.getJSON(converted_datasets_state_url, { hda_ldda: track.hda_ldda, dataset_id: track.dataset_id, chrom: track.view.chrom}, @@ -1636,7 +1639,7 @@ new_track; // TODO: add support for other kinds of tool data tracks. - if (current_track.track_type == 'FeatureTrack') { + if (current_track.track_type === 'FeatureTrack') { new_track = new ToolDataFeatureTrack(track_name, view, undefined, {}, {}, current_track); } @@ -1647,7 +1650,7 @@ // Run tool. var json_run_tool = function() { $.getJSON(run_tool_url, url_params, function(track_data) { - if (track_data == "no converter") { + if (track_data === "no converter") { // No converter available for input datasets, so cannot run tool. new_track.container_div.addClass("error"); new_track.content_div.text(DATA_NOCONVERTER); @@ -1657,7 +1660,7 @@ new_track.container_div.addClass("error"); new_track.content_div.text(DATA_CANNOT_RUN_TOOL + track_data.message); } - else if (track_data == "pending") { + else if (track_data === "pending") { // Converting/indexing input datasets; show message and try again. new_track.container_div.addClass("pending"); new_track.content_div.text("Converting input data so that it can be easily reused."); @@ -1739,8 +1742,10 @@ Track.call( this, null, view, view.top_labeltrack ); TiledTrack.call( this ); + view.reference_track = this; this.left_offset = 200; this.height_px = 12; + this.font = DEFAULT_FONT; this.container_div.addClass( "reference-track" ); this.content_div.css("background", "none"); this.content_div.css("min-height", "0px"); @@ -1750,19 +1755,21 @@ this.tile_cache = new Cache(CACHED_TILES_LINE); }; $.extend( ReferenceTrack.prototype, TiledTrack.prototype, { - get_data: function(resolution, position) { + get_data: function(resolution, tile_index, key) { var track = this, - low = position * DENSITY * resolution, - high = ( position + 1 ) * DENSITY * resolution, - key = resolution + "_" + position; - - if (!track.data_queue[key]) { - track.data_queue[key] = true; + low = tile_index * DENSITY * resolution, + high = ( tile_index + 1 ) * DENSITY * resolution, + internal_key = low + "_" + high; + + if (key === undefined) { key = internal_key; } + if (!track.data_queue[internal_key]) { + track.data_queue[internal_key] = true; $.ajax({ 'url': reference_url, 'dataType': 'json', 'data': { "chrom": this.view.chrom, "low": low, "high": high, "dbkey": this.view.dbkey }, success: function (seq) { track.data_cache.set(key, seq); - delete track.data_queue[key]; + track.data_cache.set(internal_key, seq); + delete track.data_queue[internal_key]; track.draw(); }, error: function(r, t, e) { console.log(r, t, e); @@ -1770,6 +1777,12 @@ }); } }, + range_data: function(low, high) { + var key = low + "_" + high; + + var data = this.data_cache.get(key); + return data; + }, draw_tile: function( resolution, tile_index, parent_element, w_scale ) { var tile_low = tile_index * DENSITY * resolution, tile_length = DENSITY * resolution, @@ -1783,7 +1796,7 @@ if (w_scale > CHAR_WIDTH_PX) { if (this.data_cache.get(key) === undefined) { - this.get_data( resolution, tile_index ); + this.get_data(resolution, tile_index, key); return; } @@ -1795,11 +1808,12 @@ canvas.get(0).width = Math.ceil( tile_length * w_scale + this.left_offset); canvas.get(0).height = this.height_px; - + ctx.font = DEFAULT_FONT; + ctx.textAlign = "center"; for (var c = 0, str_len = seq.length; c < str_len; c++) { - var c_start = Math.round(c * w_scale), - gap = Math.round(w_scale / 2); - ctx.fillText(seq[c], c_start + this.left_offset + gap, 10); + var c_start = Math.round(c * w_scale); + + ctx.fillText(seq[c], c_start + this.left_offset, 10); } parent_element.append(canvas); return canvas; @@ -2225,7 +2239,7 @@ // if slot can be found. // TODO: are there any checks we need to do to ensure that text // will fit on tile? - if (text_align == "left") { + if (text_align === "left") { f_start -= text_len; f_end -= text_len; text_align = "right"; @@ -2346,11 +2360,11 @@ // Set vars that depend on mode. var thin_height, thick_height; - if (mode == "Squish") { + if (mode === "Squish") { thin_height = 1; thick_height = SQUISH_FEATURE_HEIGHT; } - else { // mode == "Pack" + else { // mode === "Pack" thin_height = 5; thick_height = PACK_FEATURE_HEIGHT; } @@ -2359,9 +2373,9 @@ if (!feature_blocks) { // If there are no blocks, treat the feature as one big exon. if ( feature.strand ) { - if (feature.strand == "+") { + if (feature.strand === "+") { ctx.fillStyle = RIGHT_STRAND_INV; - } else if (feature.strand == "-") { + } else if (feature.strand === "-") { ctx.fillStyle = LEFT_STRAND_INV; } } @@ -2381,18 +2395,18 @@ // Draw whole feature as connector/intron. var cur_y_center, cur_height; - if (mode == "Squish") { + if (mode === "Squish") { ctx.fillStyle = CONNECTOR_COLOR; cur_y_center = y_center + Math.floor(SQUISH_FEATURE_HEIGHT/2) + 1; cur_height = 1; } - else { // mode == "Pack" + else { // mode === "Pack" if (feature_strand) { var cur_y_center = y_center; var cur_height = thick_height; - if (feature_strand == "+") { + if (feature_strand === "+") { ctx.fillStyle = RIGHT_STRAND; - } else if (feature_strand == "-") { + } else if (feature_strand === "-") { ctx.fillStyle = LEFT_STRAND; } } @@ -2546,7 +2560,7 @@ // canvas.get(0).width = width + left_offset; canvas.get(0).height = required_height; - if (result.dataset_type == "summary_tree") { + if (result.dataset_type === "summary_tree") { // Increase canvas height in order to display max label. canvas.get(0).height += LABEL_SPACING + CHAR_HEIGHT_PX; } @@ -2697,6 +2711,7 @@ var ReadTrack = function (name, view, hda_ldda, dataset_id, prefs, filters) { FeatureTrack.call(this, name, view, hda_ldda, dataset_id, prefs, filters); this.track_type = "ReadTrack"; + this.difference_mode = true; }; $.extend(ReadTrack.prototype, TiledTrack.prototype, FeatureTrack.prototype, { /** @@ -2704,17 +2719,22 @@ */ draw_read: function(ctx, mode, w_scale, tile_low, tile_high, feature_start, cigar, orig_seq, y_center) { ctx.textAlign = "center"; - var - tile_region = [tile_low, tile_high], - base_offset = 0, + var tile_region = [tile_low, tile_high], + base_offset = 0, seq_offset = 0, - gap = Math.round(w_scale / 2); + gap = 0, + seq_data; // Keep list of triangles that need to be drawn on top of initial drawing layer. // TODO: Eventually, we'll probably want to keep an ordered list of items to draw and then draw all // items at once. var draw_last = []; - + if (view.reference_track) { + seq_data = view.reference_track.range_data(tile_low, tile_high); + } + if ((mode === "Pack" || this.mode === "Auto") && orig_seq !== undefined && w_scale > CHAR_WIDTH_PX) { + gap = Math.round(w_scale/2); + } for (var cig_id = 0, len = cigar.length; cig_id < len; cig_id++) { var cig = cigar[cig_id], cig_op = "MIDNSHP=X"[cig[0]], @@ -2737,28 +2757,31 @@ case "M": // Match. case "=": // Equals. var seq_tile_overlap = compute_overlap([seq_start, seq_start + cig_len], tile_region); - if (seq_tile_overlap != NO_OVERLAP) { + if (seq_tile_overlap !== NO_OVERLAP) { // Draw. var seq = orig_seq.slice(seq_offset, seq_offset + cig_len); - if ( (mode === "Pack" || this.mode === "Auto") && orig_seq !== undefined && w_scale > CHAR_WIDTH_PX) { + if (gap > 0) { ctx.fillStyle = this.prefs.block_color; - ctx.fillRect(s_start + this.left_offset, y_center + 1, s_end - s_start, 9); + ctx.fillRect(s_start + this.left_offset - gap, y_center + 1, s_end - s_start, 9); ctx.fillStyle = CONNECTOR_COLOR; // TODO: this can be made much more efficient by computing the complete sequence // to draw and then drawing it. for (var c = 0, str_len = seq.length; c < str_len; c++) { + if (this.difference_mode && seq_data && seq_data[seq_start - tile_low + c] === seq[c]) { + continue; + } if (seq_start + c >= tile_low && seq_start + c <= tile_high) { var c_start = Math.floor( Math.max(0, (seq_start + c - tile_low) * w_scale) ); - ctx.fillText(seq[c], c_start + this.left_offset + gap, y_center + 9); + ctx.fillText(seq[c], c_start + this.left_offset, y_center + 9); } } } else { ctx.fillStyle = this.prefs.block_color; // TODO: This is a pretty hack-ish way to fill rectangle based on mode. ctx.fillRect(s_start + this.left_offset, - y_center + (this.mode != "Dense" ? 4 : 5), + y_center + (this.mode !== "Dense" ? 4 : 5), s_end - s_start, - (mode != "Dense" ? SQUISH_FEATURE_HEIGHT : DENSE_FEATURE_HEIGHT) ); + (mode !== "Dense" ? SQUISH_FEATURE_HEIGHT : DENSE_FEATURE_HEIGHT) ); } } seq_offset += cig_len; @@ -2766,14 +2789,14 @@ break; case "N": // Skipped bases. ctx.fillStyle = CONNECTOR_COLOR; - ctx.fillRect(s_start + this.left_offset, y_center + 5, s_end - s_start, 1); + ctx.fillRect(s_start + this.left_offset - gap, y_center + 5, s_end - s_start, 1); //ctx.dashedLine(s_start + this.left_offset, y_center + 5, this.left_offset + s_end, y_center + 5); // No change in seq_offset because sequence not used when skipping. base_offset += cig_len; break; case "D": // Deletion. ctx.fillStyle = "red"; - ctx.fillRect(s_start + this.left_offset, y_center + 4, s_end - s_start, 3); + ctx.fillRect(s_start + this.left_offset - gap, y_center + 4, s_end - s_start, 3); // TODO: is this true? No change in seq_offset because sequence not used when skipping. base_offset += cig_len; break; @@ -2788,7 +2811,7 @@ // Check to see if sequence should be drawn at all by looking at the overlap between // the sequence region and the tile region. var seq_tile_overlap = compute_overlap([seq_start, seq_start + cig_len], tile_region); - if (seq_tile_overlap != NO_OVERLAP) { + if (seq_tile_overlap !== NO_OVERLAP) { // Draw sequence. var seq = orig_seq.slice(seq_offset, seq_offset + cig_len); // X center is offset + start - <half_sequence_length> @@ -2796,7 +2819,7 @@ if ( (mode === "Pack" || this.mode === "Auto") && orig_seq !== undefined && w_scale > CHAR_WIDTH_PX) { // Draw sequence container. ctx.fillStyle = "yellow"; - ctx.fillRect(x_center, y_center - 9, s_end - s_start, 9); + ctx.fillRect(x_center - gap, y_center - 9, s_end - s_start, 9); draw_last[draw_last.length] = [x_center + (s_end - s_start)/2, y_center + 4, 5]; ctx.fillStyle = CONNECTOR_COLOR; // Based on overlap b/t sequence and tile, get sequence to be drawn. @@ -2817,15 +2840,15 @@ // Draw sequence. for (var c = 0, str_len = seq.length; c < str_len; c++) { var c_start = Math.floor( Math.max(0, (seq_start + c - tile_low) * w_scale) ); - ctx.fillText(seq[c], c_start + this.left_offset + gap - (s_end - s_start)/2, y_center); + ctx.fillText(seq[c], c_start + this.left_offset - (s_end - s_start)/2 - gap, y_center); } } else { // Draw block. ctx.fillStyle = "yellow"; // TODO: This is a pretty hack-ish way to fill rectangle based on mode. - ctx.fillRect(x_center, y_center + (this.mode != "Dense" ? 2 : 5), - s_end - s_start, (mode != "Dense" ? SQUISH_FEATURE_HEIGHT : DENSE_FEATURE_HEIGHT)); + ctx.fillRect(x_center, y_center + (this.mode !== "Dense" ? 2 : 5), + s_end - s_start, (mode !== "Dense" ? SQUISH_FEATURE_HEIGHT : DENSE_FEATURE_HEIGHT)); } } seq_offset += cig_len; @@ -2861,6 +2884,7 @@ y_center = (mode === "Dense" ? 1 : (1 + slot)) * y_scale, block_color = this.prefs.block_color, label_color = this.prefs.label_color; + gap = 0; // Left-gap for label text since we align chrom text to the position tick // Draw read. ctx.fillStyle = block_color; @@ -2893,12 +2917,15 @@ if (mode === "Pack" && feature_start > tile_low) { // Draw label. ctx.fillStyle = this.prefs.label_color; + if ( (mode === "Pack" || this.mode === "Auto") && w_scale > CHAR_WIDTH_PX) { + var gap = Math.round(w_scale/2); + } if (tile_index === 0 && f_start - ctx.measureText(feature_name).width < 0) { ctx.textAlign = "left"; - ctx.fillText(feature_name, f_end + left_offset + LABEL_SPACING, y_center + 8); + ctx.fillText(feature_name, f_end + left_offset + LABEL_SPACING - gap, y_center + 8); } else { ctx.textAlign = "right"; - ctx.fillText(feature_name, f_start + left_offset - LABEL_SPACING, y_center + 8); + ctx.fillText(feature_name, f_start + left_offset - LABEL_SPACING - gap, y_center + 8); } ctx.fillStyle = block_color; } @@ -2927,7 +2954,7 @@ // Postdraw init: once data has been fetched, reset data url, wait time and start indexing. var track = this; var post_init = function() { - if (track.data_cache.size() == 0) { + if (track.data_cache.size() === 0) { // Track still drawing initial data, so do nothing. setTimeout(post_init, 300); } 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.

1 0

commit/galaxy-central: natefoo: Enable the ftype attribute for test outputs, fixes the sam-to-bam test.
by Bitbucket 01 Mar '11

01 Mar '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/9e717f1746c8/ changeset: r5149:9e717f1746c8 user: natefoo date: 2011-03-01 21:46:35 summary: Enable the ftype attribute for test outputs, fixes the sam-to-bam test. affected #: 2 files (116 bytes) --- a/lib/galaxy/tools/__init__.py Tue Mar 01 15:21:25 2011 -0500 +++ b/lib/galaxy/tools/__init__.py Tue Mar 01 15:46:35 2011 -0500 @@ -642,6 +642,8 @@ attributes['delta'] = int( attrib.pop( 'delta', '10000' ) ) attributes['sort'] = util.string_as_bool( attrib.pop( 'sort', False ) ) attributes['extra_files'] = [] + if 'ftype' in attrib: + attributes['ftype'] = attrib['ftype'] for extra in output_elem.findall( 'extra_files' ): # File or directory, when directory, compare basename # by basename --- a/tools/samtools/sam_to_bam.xml Tue Mar 01 15:21:25 2011 -0500 +++ b/tools/samtools/sam_to_bam.xml Tue Mar 01 15:46:35 2011 -0500 @@ -60,7 +60,7 @@ --><param name="index_source" value="cached" /><param name="input1" value="3.sam" ftype="sam" dbkey="equCab2" /> - <output name="output1" file="sam_to_bam_out2.bam" /> + <output name="output1" file="sam_to_bam_out2.bam" ftype="bam" /></test></tests><help> 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.

1 0

commit/galaxy-central: natefoo: Update bwa_color_wrapper cached indices name to match the key used in the test data repository
by Bitbucket 01 Mar '11

01 Mar '11

1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/dd69759ef4a6/ changeset: r5148:dd69759ef4a6 user: natefoo date: 2011-03-01 21:21:25 summary: Update bwa_color_wrapper cached indices name to match the key used in the test data repository affected #: 1 file (6 bytes) --- a/tools/sr_mapping/bwa_color_wrapper.xml Tue Mar 01 13:00:27 2011 -0500 +++ b/tools/sr_mapping/bwa_color_wrapper.xml Tue Mar 01 15:21:25 2011 -0500 @@ -168,7 +168,7 @@ python -c "import sys; lines=file(sys.argv[1],'rb').readlines(); lines.sort(); file(sys.argv[2],'wb').write(''.join(lines))" bwa_wrapper_out5.u.sam bwa_wrapper_out5.sam --><param name="refGenomeSource" value="indexed" /> - <param name="indices" value="equCab2chrM_cs" /> + <param name="indices" value="equCab2chrM" /><param name="sPaired" value="paired" /><param name="input1" value="bwa_wrapper_in5.fastqcssanger" ftype="fastqcssanger" /><param name="input2" value="bwa_wrapper_in6.fastqcssanger" ftype="fastqcssanger" /> @@ -188,7 +188,7 @@ python -c "import sys; lines=file(sys.argv[1],'rb').readlines(); lines.sort(); file(sys.argv[2],'wb').write(''.join(lines))" bwa_wrapper_out6.u.sam bwa_wrapper_out6.sam --><param name="refGenomeSource" value="indexed" /> - <param name="indices" value="hg19chrX_midpart_cs" /> + <param name="indices" value="hg19chrX_midpart" /><param name="sPaired" value="single" /><param name="input1" value="bwa_wrapper_in4.fastqcssanger" ftype="fastqcssanger" /><param name="source_select" value="full" /> 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.

1 0