Making sure set varLabel is perserved

R/hypoAfrica.R

@@ -155,6 +155,14 @@ get.ggplot<-function(df,dfRef,var,timeVar='visitid',doseVar='dose',nVar='total',
    
 }
 
+add.label<-function(df,var,labelVar){
+   if (labelVar %in% colnames(df)){
+      return (df);
+   }
+   df[,labelVar]=base::paste0(base::round(df[, var], digits = 2))
+   df
+}
+
 #' Get table of values (as ggplot graphic object)
 #'
 #' @param df data frame with reference data
@@ -180,18 +188,18 @@ get.ggtext<-function(df,dfRef,var,timeVar='visitid',doseVar='dose',nVar='total',
    sf<-base::sprintf('%s_sF',var)
    dfRef[,sf]<-base::rep('',nrow(dfRef))
 
-   colSel<-base::c(timeVar,var,sf,doseVar)
+   labelVar=base::sprintf('%sLabel',var)
+   df1<-add.label(df1,var,labelVar)
+   dfRef<-add.label(dfRef,var,labelVar)
+
+   colSel<-base::c(timeVar,labelVar,sf,doseVar)
    df1<-base::rbind(df[,colSel],dfRef[,colSel])
 
    if (!is.null(dfAdd)){
       dfAdd[,sf]<-base::rep('',nrow(dfAdd))
+      dfAdd<-add.label(dfAdd,var,labelVar)
       df1<-base::rbind(df1[,colSel],dfAdd[,colSel])
    }
-   #set labels
-   labelVar=base::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(.data[[labelVar]],.data[[sf]]),