Skip to content

Commit

Permalink
fix: input xMax
Browse files Browse the repository at this point in the history
  • Loading branch information
cyk0315 committed Feb 8, 2024
1 parent 4d73983 commit cd5ece9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
14 changes: 7 additions & 7 deletions R/forestcox.R
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,11 @@ forestcoxServer<-function(id,data,data_label,data_varStruct=NULL,nfactor.limit=1
day <- input$day
sliderInput(session$ns('time'), 'Select time range', min = min(data()[[day]],na.rm=TRUE) , max = max(data()[[day]],na.rm=TRUE), value = c(min(data()[[day]],na.rm=TRUE), max(data()[[day]],na.rm=TRUE)))
})

output$xlim_forest<-renderUI({
req(tbsub)
data<-tbsub()
value =c(min(as.numeric(data$Lower),na.rm=TRUE), max(as.numeric(data$Upper),na.rm=TRUE))
sliderInput(session$ns('xlim'), 'Select xlim range', min = value[1] , max = value[2], value =value)
numericInput(session$ns('xMax'), 'max HR for forestplot', value= max(as.numeric(data$Upper),na.rm=TRUE))

})

Expand Down Expand Up @@ -261,7 +261,7 @@ forestcoxServer<-function(id,data,data_label,data_varStruct=NULL,nfactor.limit=1

tbsub <- TableSubgroupMultiCox(form, var_subgroups = vs,var_cov = setdiff(input$cov, vs), data=coxdata, time_eventrate = var.time[2] , line = F, decimal.hr = 3, decimal.percent = 1)
#data[[var.event]] <- ifelse(data[[var.day]] > 365 * 5 & data[[var.event]] == 1, 0, as.numeric(as.vector(data[[var.event]])))
#tbsub <- TableSubgroupMultiCox(form, var_subgroups = vs, data=data, time_eventrate = 365 , line = F, decimal.hr = 3, decimal.percent = 1)
#tbsub <- TableSubgroupMultiCox(form, var_subgroups = c('kk'), data=data, time_eventrate = 365 , line = F, decimal.hr = 3, decimal.percent = 1)
len<-nrow(label[variable==group.tbsub])
data<-data.table::setDT(data)
if(!isgroup){
Expand Down Expand Up @@ -315,15 +315,15 @@ forestcoxServer<-function(id,data,data_label,data_varStruct=NULL,nfactor.limit=1


names(cn)[-1] <- label[variable == group.tbsub, val_label]
tbsub <- cbind(Variable = paste0(tbsub[,1]," ",rownames(tbsub)), cn[, -1], tbsub[, c(label[variable == group.tbsub,level], names(tbsub)[4:6], 'P value','P for interaction')])
tbsub <- cbind(Variable = tbsub[,1], cn[, -1], tbsub[, c(label[variable == group.tbsub,level], names(tbsub)[4:6], 'P value','P for interaction')])

tbsub[-(len-1), 1] <- unlist(lapply(vs, function(x){c(label[variable == x, var_label][1], paste0(" ", label[variable == x, val_label]))}))
tbsub[-(len-1), 1] <- unlist(lapply(vs, function(x){c(label[variable == x, var_label][1], paste0(" ", label[variable == x, val_label]))}))
colnames(tbsub)[1:(2+2*len)] <- c("Subgroup", paste0("N(%): ", label[variable == group.tbsub, val_label]), paste0( var.time[2],"-",input$day," KM rate(%): ", label[variable == group.tbsub, val_label]), "HR")

}else{
cn<-ov
names(cn)[-1] <- label[variable == group.tbsub, val_label]
tbsub <- cbind(Variable = paste0(tbsub[,1]," ",rownames(tbsub)), cn[, -1], tbsub[, c(label[variable == group.tbsub,level], names(tbsub)[4:6], 'P value','P for interaction')])
tbsub <- cbind(Variable = tbsub[,1], cn[, -1], tbsub[, c(label[variable == group.tbsub,level], names(tbsub)[4:6], 'P value','P for interaction')])

colnames(tbsub)[1:(2+2*nrow(label[variable==group.tbsub]))] <- c("Subgroup", paste0("N(%): ", label[variable == group.tbsub, val_label]), paste0( var.time[2],"-",input$day," KM rate(%): ", label[variable == group.tbsub, val_label]), "HR")

Expand Down Expand Up @@ -378,7 +378,7 @@ forestcoxServer<-function(id,data,data_label,data_varStruct=NULL,nfactor.limit=1
ref_line = 1,
ticks_digits=1,
x_trans="log",
xlim=x_lim,
xlim=c(1/input$xMax,input$xMax),
theme=tm
)-> zz
my_vec_graph <- rvg::dml(code = print(zz))
Expand Down
10 changes: 5 additions & 5 deletions R/forestglm.R
Original file line number Diff line number Diff line change
Expand Up @@ -226,14 +226,14 @@ forestglmServer<-function(id,data,data_label,family,data_varStruct=NULL,nfactor.
output$xlim_forest<-renderUI({
req(tbsub)
data<-tbsub()
value =c(min(as.numeric(data$Lower),na.rm=TRUE), max(as.numeric(data$Upper),na.rm=TRUE))
sliderInput(session$ns('xlim'), 'Select xlim range', min = value[1] , max = value[2], value =value)
numericInput(session$ns('xMax'), 'max beta(OR) for forestplot', value= max(as.numeric(data$Upper),na.rm=TRUE))

})





tbsub<-reactive({
label <- data_label()

Expand Down Expand Up @@ -349,15 +349,15 @@ forestglmServer<-function(id,data,data_label,family,data_varStruct=NULL,nfactor.


names(cn)[-1] <- label[variable == group.tbsub, val_label]
tbsub <- cbind(Variable = paste0(tbsub[,1]," ",rownames(tbsub)), cn[, -1], tbsub[, c( names(tbsub)[4:6], 'P value','P for interaction')])
tbsub <- cbind(Variable = tbsub[,1], cn[, -1], tbsub[, c( names(tbsub)[4:6], 'P value','P for interaction')])

tbsub[-(len-1), 1] <- unlist(lapply(vs, function(x){c(label[variable == x, var_label][1], paste0(" ", label[variable == x, val_label]))}))
colnames(tbsub)[1:(1+len)] <- c("Subgroup", paste0("N(%): ", label[variable == group.tbsub, val_label]))

}else{
cn<-ov
names(cn)[-1] <- label[variable == group.tbsub, val_label]
tbsub <- cbind(Variable = paste0(tbsub[,1]," ",rownames(tbsub)), cn[, -1], tbsub[, c( names(tbsub)[4:6], 'P value','P for interaction')])
tbsub <- cbind(Variable = tbsub[,1], cn[, -1], tbsub[, c( names(tbsub)[4:6], 'P value','P for interaction')])

colnames(tbsub)[1:(1+nrow(label[variable==group.tbsub]))] <- c("Subgroup", paste0("N(%): ", label[variable == group.tbsub, val_label]))

Expand Down Expand Up @@ -416,7 +416,7 @@ forestglmServer<-function(id,data,data_label,family,data_varStruct=NULL,nfactor.
ref_line = ifelse(family=='gaussian',0,1),
x_trans=ifelse(family=='gaussian',"none","log"),
ticks_digits=1,
xlim=x_lim,
xlim=c(ifelse(family=='gaussian',-input$xMax,1/input$xMax),input$xMax),
theme=tm
)-> zz
my_vec_graph <- rvg::dml(code = print(zz))
Expand Down

0 comments on commit cd5ece9

Please sign in to comment.