Browse code

Fixed issue with ylims. Closing #46. Bumped version.

Robert Ivánek authored on 07/04/2022 09:04:42
Showing 2 changed files

... ...
@@ -1,6 +1,6 @@
1 1
 Package: Gviz
2 2
 Title: Plotting data and annotation information along genomic coordinates
3
-Version: 1.38.3
3
+Version: 1.38.4
4 4
 Authors@R: c(person("Florian", "Hahne", role="aut"),
5 5
 	 person("Steffen", "Durinck", role="aut"),
6 6
 	 person("Robert", "Ivanek", role=c("aut", "cre"), email="robert.ivanek@unibas.ch", comment=c(ORCID="0000-0002-8403-056X")),
... ...
@@ -3171,12 +3171,11 @@ setMethod("drawGD", signature("DataTrack"), function(GdObject, minBase, maxBase,
3171 3171
             vals <- values(GdObject)
3172 3172
             groups <- rep(groups, ncol(vals))
3173 3173
             ylim <- .dpOrDefault(GdObject, "ylim")
3174
-            agFun <- .aggregator(GdObject)
3175 3174
             if (!is.null(groups) && nlevels(groups) > 1) {
3176 3175
                 valsS <- if (ncol(vals)) {
3177 3176
                     do.call(cbind, lapply(
3178 3177
                         split(vals, groups),
3179
-                        function(x) agFun(t(matrix(x, ncol = ncol(vals))))
3178
+                        function(x) t(matrix(x, ncol = ncol(vals)))
3180 3179
                     ))
3181 3180
                 } else {
3182 3181
                     matrix(nrow = nlevels(groups), ncol = 0, dimnames = list(levels(groups)))
... ...
@@ -3204,7 +3203,7 @@ setMethod("drawGD", signature("DataTrack"), function(GdObject, minBase, maxBase,
3204 3203
                 }
3205 3204
             } else {
3206 3205
                 if (is.null(ylim)) {
3207
-                    valsA <- agFun(t(vals))
3206
+                    valsA <- t(vals)
3208 3207
                     ylim <- if (!length(valsA)) c(-1, 1) else c(min(c(0, valsA), na.rm = TRUE), max(valsA, na.rm = TRUE))
3209 3208
                     if (length(type) > 1) {
3210 3209
                         ylim <- range(c(ylim, vals), na.rm = TRUE)
... ...
@@ -3505,8 +3504,7 @@ setMethod("drawGD", signature("DataTrack"), function(GdObject, minBase, maxBase,
3505 3504
                 }
3506 3505
             }
3507 3506
         } else {
3508
-            agFun <- .aggregator(GdObject)
3509
-            valsS <- agFun(t(vals))
3507
+            valsS <- t(vals)
3510 3508
             grid.rect(start(GdObject), yy,
3511 3509
                 width = width(GdObject), height = valsS - yy,
3512 3510
                 gp = gpar(col = pcols$col.histogram, fill = pcols$fill.histogram, lwd = pcols$lwd[1], lty = pcols$lty[1], alpha = alpha), default.units = "native",