Merge branch 'develop' into 'master'

Develop

See merge request !21

CHANGELOG.md

-# v1.0.2
+# v1.0.3
 **User Facing**
-* Remove unnecessary legend on boxplot pdf output
+* Remove unnecessary legend on boxplot
+
+**Background**
+
+*Known Bugs*
+
+# v1.0.2 (**MASKED**)
+**User Facing**
+* Attempt to remove unnecessary legend on boxplot
 
 **Background**
 
@@ -9,7 +17,7 @@
 # v1.0.1 (**MASKED**)
 **User Facing**
 * Remove blank page in output to pdf
-* Remove unnecessary legend on boxplot
+* Attempt to remove unnecessary legend on boxplot
 
 **Background**
 

scripts/server.R

@@ -330,9 +330,9 @@ shinyServer(
             p <- ggplot(data = data, aes(x=type, y=value)) + geom_boxplot(aes(fill=type),outlier.size = 0.2,outlier.alpha=0.8) + scale_y_continuous(limits = c(0, 2000)) + 
               geom_text(data=data.frame(x=1.5,y=1800,labels=pval,cancer=unique(data$cancer)),aes(x,y,label=labels),size=3 , inherit.aes=FALSE) +
               theme(panel.grid.major = element_blank(), panel.grid.minor = element_blank(),
-                    panel.background = element_blank(), axis.line = element_line(colour = "black"))
+                    panel.background = element_blank(), axis.line = element_line(colour = "black"), legend.position = "none")
             #cat("printing",gene,"\n")
-            print(p + facet_wrap( ~ cancer, scales="free") + ggtitle(gene) + theme(plot.title = element_text(hjust = 0.5)))
+            print(p + facet_wrap( ~ cancer, scales="free") + ggtitle(gene) + theme(plot.title = element_text(hjust = 0.5), legend.position = "none"))
             #incProgress(1/n, detail = paste0("printing plot!"))
           }
         }

vizapp/server.R

@@ -330,9 +330,10 @@ shinyServer(
             p <- ggplot(data = data, aes(x=type, y=value)) + geom_boxplot(aes(fill=type),outlier.size = 0.2,outlier.alpha=0.8) + scale_y_continuous(limits = c(0, 2000)) + 
               geom_text(data=data.frame(x=1.5,y=1800,labels=pval,cancer=unique(data$cancer)),aes(x,y,label=labels),size=3 , inherit.aes=FALSE) +
               theme(panel.grid.major = element_blank(), panel.grid.minor = element_blank(),
-                    panel.background = element_blank(), axis.line = element_line(colour = "black"))
+                    panel.background = element_blank(), axis.line = element_line(colour = "black"), legend.position = "none")
             #cat("printing",gene,"\n")
-            print(p + facet_wrap( ~ cancer, scales="free") + ggtitle(gene) + theme(plot.title = element_text(hjust = 0.5)))
+            p <- p + facet_wrap( ~ cancer, scales="free") + ggtitle(gene) + theme(plot.title = element_text(hjust = 0.5))
+            print(p)
             #incProgress(1/n, detail = paste0("printing plot!"))
           }
         }
@@ -507,11 +508,10 @@ shinyServer(
       content = function(file) {
         #ggsave(file = file, plot = plotInput(), device = "pdf")
         pdf(file, onefile=FALSE)
-        plotInput()
+        print(plotInput() + theme(legend.position = "none"))
         dev.off()
       }
     )
     
-    
   }
 )