@@ -2,12 +2,12 @@ Package: ComplexHeatmap

 Type: Package

 Title: Making Complex Heatmaps

 Version: 1.19.0

-Date: 2017-10-25

+Date: 2018-6-9

 Author: Zuguang Gu

 Maintainer: Zuguang Gu <z.gu@dkfz.de>

 Depends: R (>= 3.1.2), methods, grid, graphics, stats, grDevices

 Imports: circlize (>= 0.4.1), GetoptLong, colorspace,

-    RColorBrewer, GlobalOptions (>= 0.0.10)

+    RColorBrewer, GlobalOptions (>= 0.1.0)

 Suggests: testthat (>= 0.3), knitr, markdown, cluster, MASS, pvclust, 

     dendsort, HilbertCurve, Cairo, png, jpeg, tiff, fastcluster,

     dendextend (>= 1.0.1)

@@ -19,6 +19,6 @@ Description: Complex heatmaps are efficient to visualize associations

 biocViews: Software, Visualization, Sequencing

 URL: https://github.com/jokergoo/ComplexHeatmap

 License: MIT + file LICENSE

-Packaged: 2017-10-25 00:00:00 UTC; Administrator

+Packaged: 2018-6-9 00:00:00 UTC; Administrator

 Repository: Bioconductor

-Date/Publication: 2017-10-25 00:00:00

+Date/Publication: 2018-6-9 00:00:00

@@ -1,4 +1,10 @@

-CHANGES in VERSIONS 1.17.1

+CHANGES in VERSION 1.19.1

+

+* `Heatmap()`: no column name added if the input matrix is a one-column matrix.

+

+=======================

+

+CHANGES in VERSION 1.17.1

 * `Legend()`: add `by_row` argument to control the arrangement of legends

   if they are put in more than one columns

@@ -432,10 +432,10 @@ Heatmap = function(matrix, col, name,

     }

     .Object@name = name

-    if(ncol(matrix) == 1 && is.null(colnames(matrix))) {

-        colnames(matrix) = name

-        .Object@matrix = matrix

-    }

+    # if(ncol(matrix) == 1 && is.null(colnames(matrix))) {

+    #     colnames(matrix) = name

+    #     .Object@matrix = matrix

+    # }

     # color for main matrix

     if(ncol(matrix) > 0 && nrow(matrix) > 0) {

@@ -9,6 +9,7 @@

 # -READ.ONLY ``TRUE`` means only to return read-only values, ``FALSE`` means only to return non-read-only

 #          values, ``NULL`` means to return both.

 # -LOCAL switch local mode

+# -ADD add new options

 #

 # == details

 # You can set some parameters for all heatmaps/annotations simultaneously by this global function.

@@ -56,7 +57,7 @@

 # # no example for this function

 # NULL

 #

-ht_global_opt = function(..., RESET = FALSE, READ.ONLY = NULL, LOCAL = FALSE) {}

+ht_global_opt = function(..., RESET = FALSE, READ.ONLY = NULL, LOCAL = FALSE, ADD = FALSE) {}

 ht_global_opt = setGlobalOptions(

 	heatmap_row_names_gp = list(

 		.value = NULL,

@@ -7,7 +7,7 @@ Global graphic options for heatmaps

 Global graphic options for heatmaps

 }

 \usage{

-ht_global_opt(..., RESET = FALSE, READ.ONLY = NULL, LOCAL = FALSE)

+ht_global_opt(..., RESET = FALSE, READ.ONLY = NULL, LOCAL = FALSE, ADD = FALSE)

 }

 \arguments{

@@ -15,7 +15,7 @@ ht_global_opt(..., RESET = FALSE, READ.ONLY = NULL, LOCAL = FALSE)

   \item{RESET}{reset all the option values}

   \item{READ.ONLY}{\code{TRUE} means only to return read-only values, \code{FALSE} means only to return non-read-only values, \code{NULL} means to return both.}

   \item{LOCAL}{switch local mode}

-

+  \item{ADD}{add new options}

 }

 \details{

 You can set some parameters for all heatmaps/annotations simultaneously by this global function.