...
|
...
|
@@ -660,16 +660,14 @@ setMethod("initialize", "AnnotationTrack", function(.Object, ...) {
|
660
|
660
|
if (is.null(list(...)$range) && is.null(list(...)$genome) && is.null(list(...)$chromosome)) {
|
661
|
661
|
return(.Object)
|
662
|
662
|
}
|
663
|
|
- ## the diplay parameter defaults
|
|
663
|
+ ## the display parameter defaults
|
664
|
664
|
.makeParMapping()
|
665
|
665
|
.Object <- .updatePars(.Object, "AnnotationTrack")
|
666
|
666
|
range <- list(...)$range
|
667
|
667
|
if (!is.null(range) && length(.Object)) {
|
668
|
668
|
if (!all(.Object@columns %in% colnames(values(range)))) {
|
669
|
|
- stop(paste(
|
670
|
|
- "Problem initializing AnnotationTrack need the following columns:",
|
671
|
|
- paste(.Object@columns, collpase = ", ")
|
672
|
|
- ), "\n")
|
|
669
|
+ stop("Problem initializing AnnotationTrack, need the following columns:",
|
|
670
|
+ toString(.Object@columns, collapse = ", "))
|
673
|
671
|
}
|
674
|
672
|
grp <- if (is(.Object, "GeneRegionTrack")) values(range)$transcript else values(range)$group
|
675
|
673
|
if (any(vapply(split(as.character(strand(range)), grp), function(x) length(unique(x)), numeric(1)) != 1)) {
|
...
|
...
|
@@ -1877,7 +1875,7 @@ IdeogramTrack <- function(chromosome = NULL, genome, name = NULL, bands = NULL,
|
1877
|
1875
|
})
|
1878
|
1876
|
out <- getTable(query)
|
1879
|
1877
|
if (all(c("chrom", "size") %in% colnames(out))) {
|
1880
|
|
- out <- data.frame(chrom = out$chrom, chromStart = 0, chromEnd = out$size, name = "", gieStain = "gneg", stringsAsFactors = F)
|
|
1878
|
+ out <- data.frame(chrom = out$chrom, chromStart = 0, chromEnd = out$size, name = "", gieStain = "gneg", stringsAsFactors = FALSE)
|
1881
|
1879
|
}
|
1882
|
1880
|
out
|
1883
|
1881
|
}), env, cenv)
|