| Previous changeset 10:299307abd804 (2022-11-24) Next changeset 12:5fe1dc76176e (2022-12-09) |
|
Commit message:
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/ggplot2 commit 075aa3ab0ebc5eef83aac753a2cac7dffe2c6b0c |
|
modified:
ggplot_point.xml macros.xml |
|
added:
test-data/ggplot_line_result1.pdf |
| b |
| diff -r 299307abd804 -r d0fc8b746d57 ggplot_point.xml --- a/ggplot_point.xml Thu Nov 24 20:23:57 2022 +0000 +++ b/ggplot_point.xml Fri Dec 02 09:35:49 2022 +0000 |
| b |
| @@ -2,6 +2,7 @@ <expand macro="bio_tools"/> <macros> <import>macros.xml</import> + <token name="@SIMPLE_GGLINE@">gg_line = geom_line(size=1, alpha=1, gg_factor)</token> </macros> <expand macro="requirements"> <requirement type="package" version="2.0.0">r-svglite</requirement> @@ -34,9 +35,11 @@ gg_facet = facet_wrap( ~ factor) gg_factor = NULL color_scale = NULL - #if $adv.type_conditional.points.pointoptions == "default" + #if $adv.type_conditional.type_options == "lines": + @SIMPLE_GGLINE@ + #elif $adv.type_conditional.points.pointoptions == "default" gg_point = geom_point(size=1, alpha=1, gg_factor) - gg_line = geom_line(size=1, alpha=1, gg_factor) + @SIMPLE_GGLINE@ #else gg_point = geom_point(size=$adv.type_conditional.points.size, alpha=$adv.type_conditional.points.alpha, colour='$adv.type_conditional.points.pointcolor', shape=as.numeric('$adv.type_conditional.points.shape')) gg_line = geom_line(size=$adv.type_conditional.points.size, alpha=$adv.type_conditional.points.alpha, colour='$adv.type_conditional.points.pointcolor', shape=as.numeric('$adv.type_conditional.points.shape')) @@ -48,9 +51,11 @@ gg_facet = NULL gg_factor = aes(colour=factor(factor)) - #if $adv.type_conditional.points.pointoptions == "default" + #if $adv.type_conditional.type_options == "lines": + @SIMPLE_GGLINE@ + #elif $adv.type_conditional.points.pointoptions == "default" gg_point = geom_point(size=1, alpha=1, gg_factor) - gg_line = geom_line(size=1, alpha=1, gg_factor) + @SIMPLE_GGLINE@ #else gg_point = geom_point(size=$adv.type_conditional.points.size, alpha=$adv.type_conditional.points.alpha, gg_factor) gg_line = geom_line(size=$adv.type_conditional.points.size, alpha=$adv.type_conditional.points.alpha, gg_factor) @@ -68,9 +73,11 @@ gg_factor = NULL color_scale = NULL - #if $adv.type_conditional.points.pointoptions == "default" + #if $adv.type_conditional.type_options == "lines": + @SIMPLE_GGLINE@ + #elif $adv.type_conditional.points.pointoptions == "default" gg_point = geom_point(size=1, alpha=1, gg_factor) - gg_line = geom_line(size=1, alpha=1, gg_factor) + @SIMPLE_GGLINE@ #else gg_point = geom_point(size=$adv.type_conditional.points.size, alpha=$adv.type_conditional.points.alpha, colour='$adv.type_conditional.points.pointcolor', shape=as.numeric('$adv.type_conditional.points.shape')) gg_line = geom_line(size=$adv.type_conditional.points.size, alpha=$adv.type_conditional.points.alpha, colour='$adv.type_conditional.points.pointcolor', shape=as.numeric('$adv.type_conditional.points.shape')) @@ -220,6 +227,17 @@ <param name="additional_output_format" value="pdf" /> <output name="output2" file="ggplot_point_result2.pdf" compare="sim_size" /> </test> + <!-- Test lines option --> + <test> + <param name="input1" value="mtcars.txt" ftype="tabular" /> + <section name="adv"> + <conditional name="type_conditional"> + <param name="type_options" value="lines"/> + </conditional> + </section> + <param name="additional_output_format" value="pdf" /> + <output name="output2" file="ggplot_line_result1.pdf" compare="sim_size" /> + </test> <!-- Test defined point options options--> <test> <param name="input1" value="mtcars.txt" ftype="tabular" /> |
| b |
| diff -r 299307abd804 -r d0fc8b746d57 macros.xml --- a/macros.xml Thu Nov 24 20:23:57 2022 +0000 +++ b/macros.xml Fri Dec 02 09:35:49 2022 +0000 |
| [ |
| @@ -13,7 +13,7 @@ </xrefs> </xml> <token name="@TOOL_VERSION@">3.3.5</token> - <token name="@VERSION_SUFFIX@">1</token> + <token name="@VERSION_SUFFIX@">2</token> <token name="@R_INIT@"><![CDATA[ |
| b |
| diff -r 299307abd804 -r d0fc8b746d57 test-data/ggplot_line_result1.pdf |
| b |
| Binary file test-data/ggplot_line_result1.pdf has changed |