Merge branch 'develop' into release/3.1.4

zgyaru · Feb 20, 2020 · 611cbbe · 611cbbe
2 parents a71bc51 + 31378a5
commit 611cbbe
Showing 1 changed file with 37 additions and 10 deletions.
diff --git a/R/visualization.R b/R/visualization.R
@@ -1164,7 +1164,10 @@ FeaturePlot <- function(
         if (j == length(x = features) && !blend) {
           suppressMessages(
             expr = plot <- plot +
-              scale_y_continuous(sec.axis = dup_axis(name = ident)) +
+              scale_y_continuous(
+                sec.axis = dup_axis(name = ident),
+                limits = ylims
+              ) +
               no.right
           )
         }
@@ -1238,6 +1241,7 @@ FeaturePlot <- function(
                 yes = levels(x = data$split)[ii],
                 no = ''
               )),
+              limits = ylims,
               expand = c(0, 0)
             ) +
             labs(
@@ -1290,34 +1294,57 @@ FeaturePlot <- function(
             expr = x +
               theme_cowplot() +
               ggtitle("") +
-              scale_y_continuous(sec.axis = dup_axis(name = "")) +
+              scale_y_continuous(sec.axis = dup_axis(name = ""), limits = ylims) +
               no.right
           ))
         }
       )
       nsplits <- length(x = levels(x = data$split))
       idx <- 1
       for (i in (length(x = features) * (nsplits - 1) + 1):(length(x = features) * nsplits)) {
-        plots[[i]] <- suppressMessages(plots[[i]] + scale_y_continuous(sec.axis = dup_axis(name = features[[idx]])) + no.right)
+        plots[[i]] <- suppressMessages(
+          expr = plots[[i]] +
+            scale_y_continuous(
+              sec.axis = dup_axis(name = features[[idx]]),
+              limits = ylims
+            ) +
+            no.right
+        )
         idx <- idx + 1
       }
       idx <- 1
       for (i in which(x = 1:length(x = plots) %% length(x = features) == 1)) {
-        plots[[i]] <- plots[[i]] + ggtitle(levels(x = data$split)[[idx]]) + theme(plot.title = element_text(hjust = 0.5))
+        plots[[i]] <- plots[[i]] +
+          ggtitle(levels(x = data$split)[[idx]]) +
+          theme(plot.title = element_text(hjust = 0.5))
         idx <- idx + 1
       }
       idx <- 1
       if (length(x = features) == 1) {
         for (i in 1:length(x = plots)) {
-          plots[[i]] <- plots[[i]] + ggtitle(levels(x = data$split)[[idx]]) + theme(plot.title = element_text(hjust = 0.5))
+          plots[[i]] <- plots[[i]] +
+            ggtitle(levels(x = data$split)[[idx]]) +
+            theme(plot.title = element_text(hjust = 0.5))
           idx <- idx + 1
         }
+        idx <- 1
+        if (length(x = features) == 1) {
+          for (i in 1:length(x = plots)) {
+            plots[[i]] <- plots[[i]] + ggtitle(levels(x = data$split)[[idx]]) + theme(plot.title = element_text(hjust = 0.5))
+            idx <- idx + 1
+          }
+        }
+        plots <- plots[c(do.call(
+          what = rbind,
+          args = split(x = 1:length(x = plots), f = ceiling(x = seq_along(along.with = 1:length(x = plots))/length(x = features)))
+        ))]
+        plots <- wrap_plots(plots, ncol = nsplits)
+      } else {
+        plots <- wrap_plots(plots, ncol = ncol, nrow = split.by %iff% length(x = levels(x = data$split)))
+      }
+      if (!is.null(x = legend) && legend == 'none') {
+        plots <- plots & NoLegend()
       }
-      plots <- plots[c(do.call(
-        what = rbind,
-        args = split(x = 1:length(x = plots), f = ceiling(x = seq_along(along.with = 1:length(x = plots))/length(x = features)))
-      ))]
-      plots <- wrap_plots(plots, ncol = nsplits)
     } else {
       plots <- wrap_plots(plots, ncol = ncol, nrow = split.by %iff% length(x = levels(x = data$split)))
     }