... | ... |
@@ -162,16 +162,19 @@ qcServer <- function(input, output, session,parent_session, loadpage_input,get_d |
162 | 162 |
# } |
163 | 163 |
|
164 | 164 |
if(loadpage_input()$DDA_DIA == "TMT"){ |
165 |
- |
|
166 |
- dataProcessPlotsTMT(preprocess_data(), |
|
165 |
+ print("in tmt") |
|
166 |
+ print(input$type1) |
|
167 |
+ plot <- dataProcessPlotsTMT(preprocess_data(), |
|
167 | 168 |
type=input$type1, |
168 | 169 |
ylimUp = FALSE, |
169 | 170 |
ylimDown = FALSE, |
170 | 171 |
which.Protein = protein, |
171 | 172 |
originalPlot = TRUE, |
172 | 173 |
summaryPlot = input$summ, |
173 |
- address = file |
|
174 |
- ) |
|
174 |
+ address = file, |
|
175 |
+ isPlotly = TRUE |
|
176 |
+ )[[1]] |
|
177 |
+ return(plot) |
|
175 | 178 |
|
176 | 179 |
|
177 | 180 |
} else if (loadpage_input()$BIO == "PTM"){ |
... | ... |
@@ -371,7 +374,7 @@ qcServer <- function(input, output, session,parent_session, loadpage_input,get_d |
371 | 374 |
ns<- session$ns |
372 | 375 |
|
373 | 376 |
# TMT and PTM plotly plots are still under development |
374 |
- if ((loadpage_input()$DDA_DIA == "TMT") || (loadpage_input()$BIO == "PTM")) { |
|
377 |
+ if ((loadpage_input()$DDA_DIA == "TMT--") || (loadpage_input()$BIO == "PTM")) { |
|
375 | 378 |
output$theplot = renderPlot(theplot()) |
376 | 379 |
op <- plotOutput(ns("theplot")) |
377 | 380 |
} else { |