# HG changeset patch
# User iuc
# Date 1669321437 0
# Node ID 299307abd804eeb4a142298a8ed6f05957af9750
# Parent  1acf889211763fc7015f206818c29ddbda5eae62
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/ggplot2 commit 847c77a54204433d210cd8a1234474d014628424

diff -r 1acf88921176 -r 299307abd804 ggplot_point.xml
--- a/ggplot_point.xml	Tue Nov 23 07:58:14 2021 +0000
+++ b/ggplot_point.xml	Thu Nov 24 20:23:57 2022 +0000
@@ -38,8 +38,8 @@
         gg_point = geom_point(size=1, alpha=1, gg_factor)
         gg_line = geom_line(size=1, alpha=1, gg_factor)
      #else
-        gg_point = geom_point(size=$adv.type_conditional.points.size, alpha=$adv.type_conditional.points.alpha, colour='$adv.type_conditional.points.pointcolor')
-        gg_line = geom_line(size=$adv.type_conditional.points.size, alpha=$adv.type_conditional.points.alpha, colour='$adv.type_conditional.points.pointcolor')
+        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'))
      #end if
 
     names(input)[$adv.factor.factorcol] <- "factor"
@@ -72,8 +72,8 @@
         gg_point = geom_point(size=1, alpha=1, gg_factor)
         gg_line = geom_line(size=1, alpha=1, gg_factor)
     #else
-        gg_point = geom_point(size=$adv.type_conditional.points.size, alpha=$adv.type_conditional.points.alpha, colour='$adv.type_conditional.points.pointcolor')
-        gg_line = geom_line(size=$adv.type_conditional.points.size, alpha=$adv.type_conditional.points.alpha, colour='$adv.type_conditional.points.pointcolor')
+        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'))
     #end if
 #end if
 
@@ -220,6 +220,28 @@
             <param name="additional_output_format" value="pdf" />
             <output name="output2" file="ggplot_point_result2.pdf" compare="sim_size" />
         </test>
+         <!-- Test defined point options options-->
+        <test>
+            <param name="input1" value="mtcars.txt" ftype="tabular" />
+            <section name="adv">
+                <conditional name="type_conditional">
+                    <param name="type_options" value="points"/>
+                    <conditional name="points">
+                        <param name="pointoptions" value="defined"/>
+                        <param name="size" value="2"/>
+                        <param name="alpha" value="0.5"/>
+                        <param name="pointcolor" value="gold"/>
+                        <param name="shape" value="6"/>
+                    </conditional>
+                </conditional>
+                <conditional name="axis_text_customization">
+                    <param name="axis_customization" value="defined"/>
+                    <param name="color" value="red"/>
+                </conditional>
+            </section>
+            <param name="additional_output_format" value="pdf" />
+            <output name="output2" file="ggplot_point_result3.pdf" compare="sim_size" />
+        </test>
     </tests>
     <help><![CDATA[
 This tool will generate a scatterplot representing data from two groups/conditions.
diff -r 1acf88921176 -r 299307abd804 macros.xml
--- a/macros.xml	Tue Nov 23 07:58:14 2021 +0000
+++ b/macros.xml	Thu Nov 24 20:23:57 2022 +0000
@@ -13,7 +13,7 @@
         </xrefs>
     </xml>
     <token name="@TOOL_VERSION@">3.3.5</token>
-    <token name="@VERSION_SUFFIX@">0</token>
+    <token name="@VERSION_SUFFIX@">1</token>
 
 
     <token name="@R_INIT@"><![CDATA[
@@ -318,6 +318,29 @@
                     <option value="grey">Grey</option>
                     <option value="gold">Gold</option>
                 </param>
+                <param name="shape" type="select" label="Shape of data points" >
+                    <option value="0">square</option>
+                    <option value="1">circle</option>
+                    <option value="2">triangle point up</option>
+                    <option value="3">plus</option>
+                    <option value="4">cross</option>
+                    <option value="5">diamond</option>
+                    <option value="6">triangle point down</option>
+                    <option value="7">square cross</option>
+                    <option value="8">star</option>
+                    <option value="9">diamond plus</option>
+                    <option value="10">circle plus</option>
+                    <option value="11">triangles up and down</option>
+                    <option value="12">square plus</option>
+                    <option value="13">circle cross</option>
+                    <option value="14">square and triangle down</option>
+                    <option value="15">filled square</option>
+                    <option value="16">filled circle</option>
+                    <option value="17">filled triangle point-up</option>
+                    <option value="18">filled diamond</option>
+                    <option value="19">solid circle</option>
+                    <option value="20">bullet (smaller circle)</option>
+                </param>
             </when>
         </conditional>
     </xml>
diff -r 1acf88921176 -r 299307abd804 test-data/ggplot_histogram_result1.pdf
Binary file test-data/ggplot_histogram_result1.pdf has changed
diff -r 1acf88921176 -r 299307abd804 test-data/ggplot_pca_result1.pdf
Binary file test-data/ggplot_pca_result1.pdf has changed
diff -r 1acf88921176 -r 299307abd804 test-data/ggplot_point_result1.pdf
Binary file test-data/ggplot_point_result1.pdf has changed
diff -r 1acf88921176 -r 299307abd804 test-data/ggplot_point_result2.pdf
Binary file test-data/ggplot_point_result2.pdf has changed
diff -r 1acf88921176 -r 299307abd804 test-data/ggplot_point_result3.pdf
Binary file test-data/ggplot_point_result3.pdf has changed
diff -r 1acf88921176 -r 299307abd804 test-data/ggplot_violin_result1.pdf
Binary file test-data/ggplot_violin_result1.pdf has changed