Merge pull request #10 from m-jahn/dev

feat: error margins can now be plotted for numeric x vars, not only factors
m-jahn · Nov 26, 2023 · 3b9aa04 · 3b9aa04
2 parents db6446f + a5326b4
commit 3b9aa04
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/R/panel_barplot.R b/R/panel_barplot.R
@@ -181,8 +181,13 @@ panel.barplot <- function (x, y,
     }
 
     x_s <- unique(x_sub)
-    if (is.factor(x_s)) x_s <- sort(as.numeric(x_s))
-    if (beside) x_pos <- x_s + nudge[val] else x_pos <- x_s
+    if (is.factor(x_s)) {
+      x_s <- sort(as.numeric(x_s))
+      if (beside) x_pos <- x_s + nudge[val] else x_pos <- x_s
+    } else {
+      if (beside) x_pos <- x_s + nudge[val] else x_pos <- x_s
+      x_s <- order(x_s)
+    }
     if (is.null(origin)) ybottom <- current.panel.limits()$ylim[1]
     else ybottom <- origin
 

diff --git a/R/panel_errbars.R b/R/panel_errbars.R
@@ -146,8 +146,14 @@ panel.errbars <- function (x, y,
     }
 
     x_s <- unique(x_sub)
-    if (is.factor(x_s)) x_s <- sort(as.numeric(x_s))
-    if (beside) x_pos <- x_s + nudge[val] else x_pos <- x_s
+    if (is.factor(x_s)) {
+      x_s <- sort(as.numeric(x_s))
+      if (beside) x_pos <- x_s + nudge[val] else x_pos <- x_s
+    } else {
+      if (beside) x_pos <- x_s + nudge[val] else x_pos <- x_s
+      x_s <- order(x_s)
+    }
+
 
     Y <- as.matrix(cbind(means, means-lower, means+upper))
     y_s <- Y[x_s, 1]