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

 Type: Package

 Title: Make Complex Heatmaps

 Version: 1.99.8

-Date: 2019-04-25

+Date: 2019-04-28

 Author: Zuguang Gu

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

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

@@ -3,6 +3,9 @@ CHANGES in VERSION 1.99.8

 * add `title_gap` in `Legend()

 * fixed a bug of wrong row title spaces when multiple heatmaps are vertically

   concatenated.

+* fixed a bug of *_sub_title_side when the heatmap annotation is the first/last

+  element in the heatmap list.

+* zero-column/row heatmap is supported.

 ========================

@@ -358,14 +358,15 @@ Heatmap = function(matrix, col, name,

     #     show_heatmap_legend = FALSE

     #     .Object@heatmap_param$show_heatmap_legend = FALSE

     # }

-    if(ncol(matrix) == 0 && (!is.null(left_annotation) || !is.null(right_annotation))) {

-        message_wrap("If you have row annotations for a zeor-column matrix, please directly use in form of `rowAnnotation(...) + NULL`")

-        return(invisible(NULL))

-    }

-    if(nrow(matrix) == 0 && (!is.null(top_annotation) || !is.null(bottom_annotation))) {

-        message_wrap("If you have column annotations for a zero-row matrix, please directly use in form of `HeatmapAnnotation(...) %v% NULL`")

-        return(invisible(NULL))

-    }

+    

+    # if(ncol(matrix) == 0 && (!is.null(left_annotation) || !is.null(right_annotation))) {

+    #     message_wrap("If you have row annotations for a zeor-column matrix, please directly use in form of `rowAnnotation(...) + NULL`")

+    #     return(invisible(NULL))

+    # }

+    # if(nrow(matrix) == 0 && (!is.null(top_annotation) || !is.null(bottom_annotation))) {

+    #     message_wrap("If you have column annotations for a zero-row matrix, please directly use in form of `HeatmapAnnotation(...) %v% NULL`")

+    #     return(invisible(NULL))

+    # }

     ### normalize km/split and row_km/row_split

     if(missing(row_km)) row_km = km

@@ -803,7 +804,7 @@ Heatmap = function(matrix, col, name,

             row_anno_right_width = unit(0, "mm")

         ),

-        layout_index = NULL,

+        layout_index = matrix(nrow = 0, ncol = 2),

         graphic_fun_list = list(),

         initialized = FALSE

     )

@@ -1488,7 +1489,8 @@ setMethod(f = "draw",

         upViewport()

     } else {

         if(internal) {  # a heatmap without legend

-            if(ncol(object@matrix) == 0 || nrow(object@matrix) == 0) return(invisible(NULL))

+            # if(ncol(object@matrix) == 0 || nrow(object@matrix) == 0) return(invisible(NULL))

+            if(nrow(object@layout$layout_index) == 0) return(invisible(NULL))

             layout = grid.layout(nrow = length(HEATMAP_LAYOUT_COLUMN_COMPONENT), 

                 ncol = length(HEATMAP_LAYOUT_ROW_COMPONENT), widths = component_width(object), 

                 heights = component_height(object))

@@ -1507,9 +1509,9 @@ setMethod(f = "draw",

             }

             upViewport()

         } else {

-            if(ncol(object@matrix) == 0) {

-                stop_wrap("Single heatmap should contains a matrix with at least one column. Zero-column matrix can only be appended to the heatmap list.")

-            }

+            # if(ncol(object@matrix) == 0) {

+            #     stop_wrap("Single heatmap should contains a matrix with at least one column. Zero-column matrix can only be appended to the heatmap list.")

+            # }

             ht_list = new("HeatmapList")

             ht_list = add_heatmap(ht_list, object)

             draw(ht_list, ...)

@@ -524,9 +524,9 @@ setMethod(f = "make_layout",

                 object@ht_list = c(list(Heatmap(matrix(nrow = nr, ncol = 0))), object@ht_list)

                 ht_gap = unit.c(unit(0, "mm"), ht_gap)

                 i_main = i_main + 1

+                n_ht = n_ht + 1

                 if(verbose) qqcat("add a zero-column heatmap for row dend/title on the very left\n")

-            }

-                

+            }     

         }

         if(row_dend_side == "right" || row_sub_title_side == "right") {

@@ -534,6 +534,7 @@ setMethod(f = "make_layout",

             if(inherits(object@ht_list[[ length(object@ht_list) ]], "HeatmapAnnotation")) {

                 object@ht_list = c(object@ht_list, list(Heatmap(matrix(nrow = nr, ncol = 0))))

                 ht_gap = unit.c(ht_gap, unit(0, "mm"))

+                n_ht = n_ht + 1

                 if(verbose) qqcat("add a zero-column heatmap for row dend/title on the very right\n")

             }

         }

@@ -546,6 +547,7 @@ setMethod(f = "make_layout",

                 object@ht_list = c(list(Heatmap(matrix(nrow = 0, ncol = nc))), object@ht_list)

                 ht_gap = unit.c(unit(0, "mm"), ht_gap)

                 i_main = i_main + 1

+                n_ht = n_ht + 1

                 if(verbose) qqcat("add a zero-row heatmap for column dend/title on the very top\n")

             }   

         }

@@ -554,6 +556,7 @@ setMethod(f = "make_layout",

             if(inherits(object@ht_list[[ length(object@ht_list) ]], "HeatmapAnnotation")) {

                 object@ht_list = c(object@ht_list, list(Heatmap(matrix(nrow = 0, ncol = nc))))

                 ht_gap = unit.c(ht_gap, unit(0, "mm"))

+                n_ht = n_ht + 1

                 if(verbose) qqcat("add a zero-column heatmap for row dend/title on the very bottom\n")

             }

         }

@@ -167,6 +167,20 @@ different results for different runs. To solve this problem, you do either way a

    final consensus k-means clustering. Note you might still get different

    results, but the chance is much smaller than just running k-means once.

+### I only want to draw dendrograms plus a list of annotations.

+

+You need to assign the dendrograms to a zero-row/column matrix:

+

+```{r}

+hc = hclust(dist(matrix(rnorm(100), 10)))

+Heatmap(matrix(nc = 0, nr = 10), cluster_rows = hc, 

+	right_annotation = rowAnnotation(

+		foo = anno_points(1:10),

+		sth = 1:10,

+		bar = anno_barplot(1:10)),

+	row_split = 2)

+```

+

 ### I still have a problem with the package and I am lost in the ocean of the huge vignette.

 The vignette (https://jokergoo.github.io/ComplexHeatmap-reference/book/)