@@ -1,3 +1,9 @@

+CHANGES in VERSION 2.13.1

+

+* `column_title_rot` can be set with any degree value.

+

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

+

 CHANGES in VERSION 2.11.2

 * discrete color mapping: when heatmap_param_list$at is set, it is reduced accordingly 

@@ -1,32 +1,32 @@

+setGeneric('column_order', function(object, ...) standardGeneric('column_order'))

+setGeneric('draw', function(object, ...) standardGeneric('draw'))

+setGeneric('prepare', function(object, ...) standardGeneric('prepare'))

 setGeneric('row_dend', function(object, ...) standardGeneric('row_dend'))

+setGeneric('copy_all', function(object, ...) standardGeneric('copy_all'))

+setGeneric('heatmap_legend_size', function(object, ...) standardGeneric('heatmap_legend_size'))

 setGeneric('make_column_cluster', function(object, ...) standardGeneric('make_column_cluster'))

-setGeneric('map_to_colors', function(object, ...) standardGeneric('map_to_colors'))

-setGeneric('component_width', function(object, ...) standardGeneric('component_width'))

+setGeneric('column_dend', function(object, ...) standardGeneric('column_dend'))

+setGeneric('re_size', function(object, ...) standardGeneric('re_size'))

 setGeneric('annotation_legend_size', function(object, ...) standardGeneric('annotation_legend_size'))

-setGeneric('draw_heatmap_body', function(object, ...) standardGeneric('draw_heatmap_body'))

+setGeneric('draw_dend', function(object, ...) standardGeneric('draw_dend'))

 setGeneric('draw_annotation_legend', function(object, ...) standardGeneric('draw_annotation_legend'))

-setGeneric('heatmap_legend_size', function(object, ...) standardGeneric('heatmap_legend_size'))

-setGeneric('get_color_mapping_list', function(object, ...) standardGeneric('get_color_mapping_list'))

-setGeneric('re_size', function(object, ...) standardGeneric('re_size'))

-setGeneric('color_mapping_legend', function(object, ...) standardGeneric('color_mapping_legend'))

-setGeneric('column_order', function(object, ...) standardGeneric('column_order'))

-setGeneric('make_layout', function(object, ...) standardGeneric('make_layout'))

-setGeneric('attach_annotation', function(object, ...) standardGeneric('attach_annotation'))

+setGeneric('get_legend_param_list', function(object, ...) standardGeneric('get_legend_param_list'))

+setGeneric('draw_title', function(object, ...) standardGeneric('draw_title'))

+setGeneric('draw_heatmap_list', function(object, ...) standardGeneric('draw_heatmap_list'))

+setGeneric('adjust_heatmap_list', function(object, ...) standardGeneric('adjust_heatmap_list'))

 setGeneric('draw_heatmap_legend', function(object, ...) standardGeneric('draw_heatmap_legend'))

-setGeneric('add_heatmap', function(object, ...) standardGeneric('add_heatmap'))

-setGeneric('prepare', function(object, ...) standardGeneric('prepare'))

+setGeneric('draw_heatmap_body', function(object, ...) standardGeneric('draw_heatmap_body'))

+setGeneric('attach_annotation', function(object, ...) standardGeneric('attach_annotation'))

+setGeneric('component_width', function(object, ...) standardGeneric('component_width'))

+setGeneric('make_layout', function(object, ...) standardGeneric('make_layout'))

+setGeneric('make_row_cluster', function(object, ...) standardGeneric('make_row_cluster'))

 setGeneric('set_component_height', function(object, ...) standardGeneric('set_component_height'))

+setGeneric('add_heatmap', function(object, ...) standardGeneric('add_heatmap'))

+setGeneric('get_color_mapping_list', function(object, ...) standardGeneric('get_color_mapping_list'))

 setGeneric('row_order', function(object, ...) standardGeneric('row_order'))

-setGeneric('draw_dend', function(object, ...) standardGeneric('draw_dend'))

-setGeneric('adjust_heatmap_list', function(object, ...) standardGeneric('adjust_heatmap_list'))

-setGeneric('draw_title', function(object, ...) standardGeneric('draw_title'))

-setGeneric('make_row_cluster', function(object, ...) standardGeneric('make_row_cluster'))

-setGeneric('draw_annotation', function(object, ...) standardGeneric('draw_annotation'))

-setGeneric('draw_heatmap_list', function(object, ...) standardGeneric('draw_heatmap_list'))

-setGeneric('draw_dimnames', function(object, ...) standardGeneric('draw_dimnames'))

-setGeneric('copy_all', function(object, ...) standardGeneric('copy_all'))

-setGeneric('get_legend_param_list', function(object, ...) standardGeneric('get_legend_param_list'))

-setGeneric('column_dend', function(object, ...) standardGeneric('column_dend'))

 setGeneric('component_height', function(object, ...) standardGeneric('component_height'))

+setGeneric('map_to_colors', function(object, ...) standardGeneric('map_to_colors'))

 setGeneric('set_component_width', function(object, ...) standardGeneric('set_component_width'))

-setGeneric('draw', function(object, ...) standardGeneric('draw'))

+setGeneric('color_mapping_legend', function(object, ...) standardGeneric('color_mapping_legend'))

+setGeneric('draw_annotation', function(object, ...) standardGeneric('draw_annotation'))

+setGeneric('draw_dimnames', function(object, ...) standardGeneric('draw_dimnames'))

@@ -102,11 +102,11 @@ Heatmap = setClass("Heatmap",

 # -row_title Title on the row.

 # -row_title_side Will the title be put on the left or right of the heatmap?

 # -row_title_gp Graphic parameters for row title.

-# -row_title_rot Rotation of row title. Only 0, 90, 270 are allowed to set.

+# -row_title_rot Rotation of row title.

 # -column_title Title on the column.

 # -column_title_side Will the title be put on the top or bottom of the heatmap?

 # -column_title_gp Graphic parameters for column title.

-# -column_title_rot Rotation of column titles. Only 0, 90, 270 are allowed to set.

+# -column_title_rot Rotation of column titles.

 # -cluster_rows If the value is a logical, it controls whether to make cluster on rows. The value can also

 #               be a `stats::hclust` or a `stats::dendrogram` which already contains clustering.

 #               Check https://jokergoo.github.io/ComplexHeatmap-reference/book/a-single-heatmap.html#clustering .

@@ -99,18 +99,10 @@ setMethod(f = "make_layout",

     }

     if(length(column_title) > 0) {

         if(column_title_side == "top") {

-            if(column_title_rot %in% c(0, 180)) {

-                object@layout$layout_size$column_title_top_height = grobHeight(textGrob(column_title, gp = column_title_gp)) + sum(title_padding)

-            } else {

-                object@layout$layout_size$column_title_top_height = grobWidth(textGrob(column_title, gp = column_title_gp)) + sum(title_padding)

-            }

+            object@layout$layout_size$column_title_top_height = grobHeight(textGrob(column_title, gp = column_title_gp, rot = column_title_rot)) + sum(title_padding)

             object@layout$layout_index = rbind(object@layout$layout_index, column_title_top = heatmap_layout_index("column_title_top"))

         } else {

-            if(column_title_rot %in% c(0, 180)) {

-                object@layout$layout_size$column_title_bottom_height = grobHeight(textGrob(column_title, gp = column_title_gp)) + sum(title_padding)

-            } else {

-                object@layout$layout_size$column_title_bottom_height = grobWidth(textGrob(column_title, gp = column_title_gp)) + sum(title_padding)

-            }

+            object@layout$layout_size$column_title_bottom_height = grobHeight(textGrob(column_title, gp = column_title_gp, rot = column_title_rot)) + sum(title_padding)

             object@layout$layout_index = rbind(object@layout$layout_index, column_title_bottom = heatmap_layout_index("column_title_bottom"))

         }

         object@layout$graphic_fun_list = c(object@layout$graphic_fun_list, function(object) {

@@ -139,18 +131,10 @@ setMethod(f = "make_layout",

     }

     if(length(row_title) > 0) {

         if(row_title_side == "left") {

-            if(row_title_rot %in% c(0, 180)) {

-                object@layout$layout_size$row_title_left_width = max_text_width(row_title, gp = row_title_gp) + sum(title_padding)

-            } else {

-                object@layout$layout_size$row_title_left_width = max_text_height(row_title, gp = row_title_gp) + sum(title_padding)

-            }

+            object@layout$layout_size$row_title_left_width = max_text_width(row_title, gp = row_title_gp, rot = row_title_rot) + sum(title_padding)

             object@layout$layout_index = rbind(object@layout$layout_index, row_title_left = heatmap_layout_index("row_title_left"))

         } else {

-            if(row_title_rot %in% c(0, 180)) {

-                object@layout$layout_size$row_title_right_width = max_text_width(row_title, gp = row_title_gp) + sum(title_padding)

-            } else {

-                object@layout$layout_size$row_title_right_width = max_text_height(row_title, gp = row_title_gp) + sum(title_padding)

-            }

+            object@layout$layout_size$row_title_right_width = max_text_width(row_title, gp = row_title_gp, rot = row_title_rot) + sum(title_padding)

             object@layout$layout_index = rbind(object@layout$layout_index, row_title_right = heatmap_layout_index("row_title_right"))

         }

         object@layout$graphic_fun_list = c(object@layout$graphic_fun_list, function(object) {

@@ -286,10 +286,10 @@ subset_gp = function(gp, i) {

 get_text_just = function(rot, side) {

-    rot = rot %% 360

-    if(! rot %in% c(0, 90, 270)) {

-        stop_wrap("Only support horizontal or vertical rotations for text.\n")

-    }

+    rot = rot %% 180

+    # if(! rot %in% c(0, 90, 270)) {

+    #     stop_wrap("Only support horizontal or vertical rotations for text.\n")

+    # }

     if(side == "left") {

         if(rot == 0) {

             return(c(1, 0.5))

@@ -299,27 +299,27 @@ get_text_just = function(rot, side) {

             return(c(0.5, 1))

         }

     } else if(side == "right") {

-        if(rot == 0) {

+        if(rot >= 0 && rot < 90) {

             return(c(0, 0.5))

         } else if(rot == 90) {

             return(c(0.5, 1))

-        } else if(rot == 270) {

-            return(c(0.5, 0))

+        } else if(rot > 90 && rot < 180) {

+            return(c(0, 0.5))

         }

     } else if(side == "top") {

         if(rot == 0) {

             return(c(0.5, 0))

-        } else if(rot == 90) {

+        } else if(rot > 0 && rot <= 90) {

             return(c(0, 0.5))

-        } else if(rot == 270) {

+        } else if(rot > 90 && rot <= 180) {

             return(c(1, 0.5))

         }

     } else if(side == "bottom") {

         if(rot == 0) {

             return(c(0.5, 1))

-        } else if(rot == 90) {

+        } else if(rot > 0 && rot <= 90) {

             return(c(1, 0.5))

-        } else if(rot == 270) {

+        } else if(rot > 90 && rot <= 180) {

             return(c(0, 0.5))

         }

     }

@@ -115,11 +115,11 @@ Heatmap(matrix, col, name,

   \item{row_title}{Title on the row.}

   \item{row_title_side}{Will the title be put on the left or right of the heatmap?}

   \item{row_title_gp}{Graphic parameters for row title.}

-  \item{row_title_rot}{Rotation of row title. Only 0, 90, 270 are allowed to set.}

+  \item{row_title_rot}{Rotation of row title.}

   \item{column_title}{Title on the column.}

   \item{column_title_side}{Will the title be put on the top or bottom of the heatmap?}

   \item{column_title_gp}{Graphic parameters for column title.}

-  \item{column_title_rot}{Rotation of column titles. Only 0, 90, 270 are allowed to set.}

+  \item{column_title_rot}{Rotation of column titles.}

   \item{cluster_rows}{If the value is a logical, it controls whether to make cluster on rows. The value can also be a \code{\link[stats]{hclust}} or a \code{\link[stats]{dendrogram}} which already contains clustering. Check \url{https://jokergoo.github.io/ComplexHeatmap-reference/book/a-single-heatmap.html#clustering} .}

   \item{cluster_row_slices}{If rows are split into slices, whether perform clustering on the slice means?}

   \item{clustering_distance_rows}{It can be a pre-defined character which is in  ("euclidean", "maximum", "manhattan", "canberra", "binary",  "minkowski", "pearson", "spearman", "kendall"). It can also be a function. If the function has one argument, the input argument should be a matrix and  the returned value should be a \code{\link[stats]{dist}} object. If the function has two arguments, the input arguments are two vectors and the function calculates distance between these two vectors.}

@@ -10,9 +10,9 @@ Method dispatch page for \code{add_heatmap}.

 \code{add_heatmap} can be dispatched on following classes:

 \itemize{

-\item \code{\link{add_heatmap,HeatmapList-method}}, \code{\link{HeatmapList-class}} class method

 \item \code{\link{add_heatmap,HeatmapAnnotation-method}}, \code{\link{HeatmapAnnotation-class}} class method

 \item \code{\link{add_heatmap,Heatmap-method}}, \code{\link{Heatmap-class}} class method

+\item \code{\link{add_heatmap,HeatmapList-method}}, \code{\link{HeatmapList-class}} class method

 }

 }

 \examples{

@@ -10,8 +10,8 @@ Method dispatch page for \code{column_order}.

 \code{column_order} can be dispatched on following classes:

 \itemize{

-\item \code{\link{column_order,HeatmapList-method}}, \code{\link{HeatmapList-class}} class method

 \item \code{\link{column_order,Heatmap-method}}, \code{\link{Heatmap-class}} class method

+\item \code{\link{column_order,HeatmapList-method}}, \code{\link{HeatmapList-class}} class method

 }

 }

 \examples{

@@ -10,8 +10,8 @@ Method dispatch page for \code{component_width}.

 \code{component_width} can be dispatched on following classes:

 \itemize{

-\item \code{\link{component_width,Heatmap-method}}, \code{\link{Heatmap-class}} class method

 \item \code{\link{component_width,HeatmapList-method}}, \code{\link{HeatmapList-class}} class method

+\item \code{\link{component_width,Heatmap-method}}, \code{\link{Heatmap-class}} class method

 }

 }

 \examples{

@@ -10,12 +10,12 @@ Method dispatch page for \code{draw}.

 \code{draw} can be dispatched on following classes:

 \itemize{

-\item \code{\link{draw,HeatmapAnnotation-method}}, \code{\link{HeatmapAnnotation-class}} class method

-\item \code{\link{draw,SingleAnnotation-method}}, \code{\link{SingleAnnotation-class}} class method

 \item \code{\link{draw,AnnotationFunction-method}}, \code{\link{AnnotationFunction-class}} class method

 \item \code{\link{draw,HeatmapList-method}}, \code{\link{HeatmapList-class}} class method

 \item \code{\link{draw,Legends-method}}, \code{\link{Legends-class}} class method

 \item \code{\link{draw,Heatmap-method}}, \code{\link{Heatmap-class}} class method

+\item \code{\link{draw,HeatmapAnnotation-method}}, \code{\link{HeatmapAnnotation-class}} class method

+\item \code{\link{draw,SingleAnnotation-method}}, \code{\link{SingleAnnotation-class}} class method

 }

 }

 \examples{

@@ -10,8 +10,8 @@ Method dispatch page for \code{draw_title}.

 \code{draw_title} can be dispatched on following classes:

 \itemize{

-\item \code{\link{draw_title,HeatmapList-method}}, \code{\link{HeatmapList-class}} class method

 \item \code{\link{draw_title,Heatmap-method}}, \code{\link{Heatmap-class}} class method

+\item \code{\link{draw_title,HeatmapList-method}}, \code{\link{HeatmapList-class}} class method

 }

 }

 \examples{

@@ -10,8 +10,8 @@ Method dispatch page for \code{row_dend}.

 \code{row_dend} can be dispatched on following classes:

 \itemize{

-\item \code{\link{row_dend,HeatmapList-method}}, \code{\link{HeatmapList-class}} class method

 \item \code{\link{row_dend,Heatmap-method}}, \code{\link{Heatmap-class}} class method

+\item \code{\link{row_dend,HeatmapList-method}}, \code{\link{HeatmapList-class}} class method

 }

 }

 \examples{

@@ -10,11 +10,11 @@ Method dispatch page for \code{show}.

 \code{show} can be dispatched on following classes:

 \itemize{

-\item \code{\link{show,Heatmap-method}}, \code{\link{Heatmap-class}} class method

-\item \code{\link{show,AnnotationFunction-method}}, \code{\link{AnnotationFunction-class}} class method

 \item \code{\link{show,SingleAnnotation-method}}, \code{\link{SingleAnnotation-class}} class method

 \item \code{\link{show,ColorMapping-method}}, \code{\link{ColorMapping-class}} class method

 \item \code{\link{show,HeatmapAnnotation-method}}, \code{\link{HeatmapAnnotation-class}} class method

+\item \code{\link{show,Heatmap-method}}, \code{\link{Heatmap-class}} class method

+\item \code{\link{show,AnnotationFunction-method}}, \code{\link{AnnotationFunction-class}} class method

 \item \code{\link{show,HeatmapList-method}}, \code{\link{HeatmapList-class}} class method

 }

 }