report: added shapes to cdhit scatter plot

workflow_report/scripts/utils.R

@@ -264,11 +264,10 @@ plot_cdhit_barplots <- function(df, mtype, ycol, ycol_text){
 
 plot_cdhit_scatterplot <- function(df, mtype){
     pp <-
-        ggplot(data=df[df$mtype == mtype,], aes(x=unique_pct, y=highcovunique_pct_unique, fill=tool2, colour=tool1)) +
-        geom_point(shape=21, colour="white", size=6) +
+        ggplot(data=df[df$mtype == mtype,], aes(x=unique_pct, y=highcovunique_pct_unique, fill=tool2, shape=tool2)) +
+        geom_point(colour="white", size=6) +
         scale_fill_manual(values=ASM_TOOL_COLORS) +
-        scale_colour_manual(values=ASM_TOOL_COLORS) +
-        # guides(fill=guide_legend(override.aes=list(size=10))) +
+        scale_shape_manual(values=ASM_TOOL_SHAPES) +
         labs(
             x="Unique proteins [%, total]",
             y=sprintf("Unique proteins w/ high mean cov. [%%, unique] (%s)", mtype)
@@ -471,6 +470,23 @@ ASM_TOOL_COLORS <- c(
 )
 ASM_TOOL_COLORS <- ASM_TOOL_COLORS[ASM_TOOL_NAMES]
 
+ASM_TOOL_SHAPES <- c(
+    "Flye"=22,
+    "wtdbg2"=22,
+    "Canu"=22,
+    "Flye + racon(SR)"=21,
+    "wtdbg2 + racon(SR)"=21,
+    "Canu + racon(SR)"=21,
+    "MEGAHIT"=21,
+    "metaSPAdes"=21,
+    "OPERA-MS"=22,
+    "metaSPAdes (H)"=22,
+    "OPERA-MS + racon(SR)"=21,
+    "metaSPAdes (H) + racon(SR)"=21,
+    "IMP3 (MG/MT)"=21
+)
+ASM_TOOL_SHAPES <- ASM_TOOL_SHAPES[ASM_TOOL_NAMES]
+
 ###############
 # CRISPR tools