Skip to content

Commit e67a9cc

Browse files
authored
Merge pull request #631 from hechth/patch-1
Add "use_header_names" option to histogram
2 parents 77055a0 + 07b3f13 commit e67a9cc

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

tools/histogram/.shed.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ long_description: |
77
name: histogram
88
owner: devteam
99
remote_repository_url: https://github.com/galaxyproject/tools-devteam/tree/master/tools/histogram
10+
homepage_url: https://github.com/galaxyproject/tools-devteam/tree/master/tools/histogram
1011
type: unrestricted

tools/histogram/histogram2.xml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<tool id="histogram_rpy" name="Histogram" version="1.0.4">
1+
<tool id="histogram_rpy" name="Histogram" version="1.0.5">
22
<description>of a numeric column</description>
33
<requirements>
44
<requirement type="package" version="3.3.2">rpy2</requirement>
@@ -17,7 +17,18 @@ python '$__tool_directory__/histogram.py'
1717
</command>
1818
<inputs>
1919
<param name="input" type="data" format="tabular" label="Dataset" help="Dataset missing? See TIP below"/>
20-
<param name="numerical_column" type="data_column" data_ref="input" numerical="True" label="Numerical column for x axis" />
20+
<conditional name="cols">
21+
<param name="header" type="select" label="Does the table have a header?" refresh_on_change="true" help="If the table has a header, the column can be selected using the name instead of the index.">
22+
<option value="yes">yes</option>
23+
<option value="no">no</option>
24+
</param>
25+
<when value="yes">
26+
<param name="numerical_column" type="data_column" data_ref="input" numerical="True" use_header_names="true" label="Numerical column for x axis" />
27+
</when>
28+
<when value="no">
29+
<param name="numerical_column" type="data_column" data_ref="input" numerical="True" label="Numerical column for x axis" />
30+
</when>
31+
</conditional>
2132
<param name="breaks" type="integer" value="0" label="Number of breaks (bars)"/>
2233
<param name="title" type="text" value="Histogram" label="Plot title"/>
2334
<param name="xlab" type="text" value="V1" label="Label for x axis"/>
@@ -84,4 +95,7 @@ This tool computes a histogram of the numerical values in a column of a dataset.
8495
.. image:: histogram2.png
8596

8697
</help>
98+
<citations>
99+
<citation type="doi">10.1145/3386334</citation>
100+
</citations>
87101
</tool>

0 commit comments

Comments
 (0)