Commit 59e85ba4 authored by houyun's avatar houyun
Browse files

Merge branch 'master' of github.com:Hy4m/linkET 

# Conflicts:
#	R/qcorrplot.R
#	man/qcorrplot.Rd
parents 32a37926 42c9525c

R/experimental-fun.R

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ qpairs <- function(data, 
  ## init and add panel grid

  p <- hyplot(df) +

    geom_panel_grid(colour = grid_col, size = grid_size) +

    ggplot2::coord_fixed(expand = FALSE) +

    theme(panel.background = element_blank(),

    theme(aspect.ratio = 1,

          panel.background = element_blank(),

          axis.text = element_text(size = 10.5, colour = "black"),

          axis.title = element_blank(),

          axis.ticks = element_blank(),

R/qcorrplot.R

+4 −0
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ 
#' @param drop logical.

#' @param grid_col colour of panel grid.

#' @param grid_size size of panel grid.

<<<<<<< HEAD

#' @param fixed if TRUE (default), will add \code{coord_fixed()} to plot.

=======

#' @param fixed if TRUE (default), will set plot aspect to 1.

>>>>>>> 42c9525c24b3f4a0c42422a1d4bd1ddec606e041

#' @param use_md logical. if TRUE, will use \code{ggtext::element_markdown()} to

#' draw the axis labels.

#' @param facets NULL or a parameters list of \code{facet_wrap}.

CRA Git | Maintained and supported by SUSTech CRA and CCSE