added check whether cairo capabilities exist

R/associationsDiamondPlot.R

@@ -105,9 +105,7 @@ associationsDiamondPlot <- function(dat, covariates, criteria,
                                     outputFile = NULL,
                                     outputWidth = 10,
                                     outputHeight = 10,
-                                    ggsaveParams = list(units='cm',
-                                                        dpi=300,
-                                                        type="cairo"),
+                                    ggsaveParams = ufs::opts$get("ggsaveParams"),
                                     ...) {
 
   res <- list(input = as.list(environment()),

R/biAxisDiamondPlot.R

@@ -100,9 +100,7 @@ biAxisDiamondPlot <- function(dat, items = NULL,
                               outputFile = NULL,
                               outputWidth = 10,
                               outputHeight = 10,
-                              ggsaveParams = list(units='cm',
-                                                  dpi=300,
-                                                  type="cairo"),
+                              ggsaveParams = ufs::opts$get("ggsaveParams"),
                               ...) {
 
   if (length(leftAnchors) != length(rightAnchors)) {

R/diamondPlot.R

@@ -82,9 +82,7 @@ diamondPlot <- function(data,
                         outputFile = NULL,
                         outputWidth = 10,
                         outputHeight = 10,
-                        ggsaveParams = list(units='cm',
-                                            dpi=300,
-                                            type="cairo"),
+                        ggsaveParams = ufs::opts$get("ggsaveParams"),
                         ...) {
 
   ### In case we want to check for a complete dataframe

R/duoComparisonDiamondPlot.R

@@ -25,9 +25,7 @@ duoComparisonDiamondPlot <- function(dat, items = NULL,
                                      outputFile = NULL,
                                      outputWidth = 10,
                                      outputHeight = 10,
-                                     ggsaveParams = list(units='cm',
-                                                         dpi=300,
-                                                         type="cairo"),
+                                     ggsaveParams = ufs::opts$get("ggsaveParams"),
                                      ...) {
 
   if (length(unique(stats::na.omit(dat[, compareBy]))) != 2) {

R/ggSave.R

@@ -81,12 +81,12 @@ ggSave <- function(file=NULL, plot = ggplot2::last_plot(),
 
     if (device[i] == 'jpg') {
       device[i] <- 'jpeg';
-      if (is.null(type[i])) {
+      if (is.null(type[i]) && length(capabilities("cairo") > 0) && capabilities("cairo")) {
         type[i] <- "cairo";
       }
     }
 
-    if ((is.null(type[i])) && (device[i]=="png")) {
+    if ((is.null(type[i])) && (device[i]=="png") && length(capabilities("cairo") > 0) && capabilities("cairo")) {
       type[i] <- "cairo-png";
     }
 

R/meanSDtoDiamondPlot.R

@@ -86,9 +86,7 @@ meanSDtoDiamondPlot <- function(dat = NULL,
                                 outputFile = NULL,
                                 outputWidth = 10,
                                 outputHeight = 10,
-                                ggsaveParams = list(units='cm',
-                                                    dpi=300,
-                                                    type="cairo"),
+                                ggsaveParams = ufs::opts$get("ggsaveParams"),
                                 ...) {
 
   varNamesToUse <- c(means, sds, ns);

R/meansComparisonDiamondPlot.R

@@ -129,9 +129,7 @@ meansComparisonDiamondPlot <- function(dat, items = NULL,
                                        outputFile = NULL,
                                        outputWidth = 10,
                                        outputHeight = 10,
-                                       ggsaveParams = list(units='cm',
-                                                           dpi=300,
-                                                           type="cairo"),
+                                       ggsaveParams = ufs::opts$get("ggsaveParams"),
                                        ...) {
 
   res <- list();

R/meansDiamondPlot.R

@@ -95,9 +95,7 @@ meansDiamondPlot <- function(data, items = NULL, labels = NULL,
                              outputFile = NULL,
                              outputWidth = 10,
                              outputHeight = 10,
-                             ggsaveParams = list(units='cm',
-                                                 dpi=300,
-                                                 type="cairo"),
+                             ggsaveParams = ufs::opts$get("ggsaveParams"),
                              dat=NULL,
                              ...) {
 

R/opts.R

@@ -206,6 +206,13 @@ opts$defaults <-
 
     ggBaseSize = 11,
 
+    ggsaveParams = list(units='cm',
+                        dpi=300,
+                        type=ifelse(
+                          length(capabilities("cairo") > 0) && capabilities("cairo"),
+                          "cairo",
+                          NULL)),
+
     ### Default heading level, for convenience
     defaultHeadingLevel = 3,