Modified way how labels are generated

R/hypoAfrica.R

@@ -163,7 +163,6 @@ get.ggplot<-function(df,dfRef,var,timeVar='visitid',doseVar='dose',nVar='total',
 #' @param timeVar variable measuring time
 #' @param doseVar variable for selecting datasets
 #' @param nVar variable where counts are stored
-#' @param labelVar variable to print (if default NULL, var is used directly)
 #' @param doseBreaks which doses are in df
 #' @param doseLabels how to label doses in legend
 #' @param timeBreaks where time points are assigned
@@ -173,7 +172,7 @@ get.ggplot<-function(df,dfRef,var,timeVar='visitid',doseVar='dose',nVar='total',
 #'
 #' @export
 
-get.ggtext<-function(df,dfRef,var,timeVar='visitid',doseVar='dose',nVar='total', labelVar=NULL,
+get.ggtext<-function(df,dfRef,var,timeVar='visitid',doseVar='dose',nVar='total', 
    doseBreaks=c(59.9,60,62,100),doseLabels=c('ref','60 Gy','62 Gy','all'),
    timeBreaks=c(0,1,3,4),dfAdd=NULL){
 
@@ -181,11 +180,6 @@ get.ggtext<-function(df,dfRef,var,timeVar='visitid',doseVar='dose',nVar='total',
    sf<-base::sprintf('%s_sF',var)
    dfRef[,sf]<-base::rep('',nrow(dfRef))
 
-   nd=0
-   if (base::is.null(labelVar)){
-      labelVar=var
-      nd=2
-   }
    colSel<-base::c(timeVar,labelVar,sf,doseVar)
    df1<-base::rbind(df[,colSel],dfRef[,colSel])
 
@@ -193,10 +187,14 @@ get.ggtext<-function(df,dfRef,var,timeVar='visitid',doseVar='dose',nVar='total',
       dfAdd[,sf]<-base::rep('',nrow(dfAdd))
       df1<-base::rbind(df1[,colSel],dfAdd[,colSel])
    }
-
+   #set labels
+   labelVar=sprintf('%sLabel',var)
+   if (! labelVar %in% colnames(df1)){
+      df1[,labelVar]=base::paste0(base::round(df1[, var], digits = 2))
+   }
 	ggplot2::ggplot()+
 	ggplot2::geom_text(ggplot2::aes(x=.data[[timeVar]],y=base::as.factor(.data[[doseVar]]),
-      label=base::paste0(base::round(.data[[labelVar]], digits = nd),.data[[sf]]),
+      label=base::paste0(.data[[labelVar]],.data[[sf]]),
       hjust=0.5, vjust=0.5),size=5,df1)+
 	ggplot2::scale_x_continuous(breaks=timeBreaks,limits=base::c(0,4))+
 	ggplot2::scale_y_discrete(breaks=doseBreaks,labels=doseLabels)+

man/get.ggtext.Rd

@@ -11,7 +11,6 @@ get.ggtext(
   timeVar = "visitid",
   doseVar = "dose",
   nVar = "total",
-  labelVar = NULL,
   doseBreaks = c(59.9, 60, 62, 100),
   doseLabels = c("ref", "60 Gy", "62 Gy", "all"),
   timeBreaks = c(0, 1, 3, 4),
@@ -31,8 +30,6 @@ get.ggtext(
 
 \item{nVar}{variable where counts are stored}
 
-\item{labelVar}{variable to print (if default NULL, var is used directly)}
-
 \item{doseBreaks}{which doses are in df}
 
 \item{doseLabels}{how to label doses in legend}