Mercurial > repos > iuc > ggplot2_point

changeset 12:156a2e14ce31 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/ggplot2 commit 843a94f53c808d098def353b0bc5f7f554d9e1af
author iuc
date Fri, 09 Dec 2022 22:39:49 +0000
parents ba8be8bcbf8f
children 3e33010715f8
files ggplot_point.xml macros.xml test-data/ggplot_line_result1.pdf
diffstat 3 files changed, 29 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/ggplot_point.xml	Thu Nov 24 20:21:02 2022 +0000
+++ b/ggplot_point.xml	Fri Dec 09 22:39:49 2022 +0000
@@ -2,9 +2,10 @@
     <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>
+        <requirement type="package" version="2.1.0">r-svglite</requirement>
     </expand>
     <command detect_errors="exit_code"><![CDATA[
 cat '$script' &&
@@ -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,12 +51,14 @@
     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)
+        gg_point = geom_point(size=$adv.type_conditional.points.size, alpha=$adv.type_conditional.points.alpha, gg_factor, shape=as.numeric('$adv.type_conditional.points.shape')
+        gg_line = geom_line(size=$adv.type_conditional.points.size, alpha=$adv.type_conditional.points.alpha, gg_factor, shape=as.numeric('$adv.type_conditional.points.shape')
     #end if
 
     #if $adv.factor.colororder == 1
@@ -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" />
--- a/macros.xml	Thu Nov 24 20:21:02 2022 +0000
+++ b/macros.xml	Fri Dec 09 22:39:49 2022 +0000
@@ -12,9 +12,8 @@
             <xref type="bio.tools">ggplot2</xref>
         </xrefs>
     </xml>
-    <token name="@TOOL_VERSION@">3.3.5</token>
-    <token name="@VERSION_SUFFIX@">1</token>
-
+    <token name="@TOOL_VERSION@">3.4.0</token>
+    <token name="@VERSION_SUFFIX@">0</token>
 
     <token name="@R_INIT@"><![CDATA[
         ## Setup R error handling to go to stderr
Binary file test-data/ggplot_line_result1.pdf has changed