@@ -1338,11 +1338,12 @@ runRdTest<-function(bed)
13381338 # #Plot JPG##
13391339 if (opt $ plot == TRUE ) {
13401340 if (opt $ padding > 0 ) {
1341- event_coords_for_padding_orig_start <- start
1342- event_coords_for_padding_orig_end <- end
1343- event_length <- as.numeric(event_coords_for_padding_orig_end ) - as.numeric(event_coords_for_padding_orig_start )
1344- padded_region_start <- floor(as.numeric(event_coords_for_padding_orig_start ) - opt $ padding * event_length )
1345- padded_region_end <- ceiling(as.numeric(event_coords_for_padding_orig_end ) + opt $ padding * event_length )
1341+ # Define variables to govern padding
1342+ padded_orig_start <- start
1343+ padded_orig_end <- end
1344+ event_length <- as.numeric(padded_orig_end ) - as.numeric(padded_orig_start )
1345+ padded_region_start <- floor(as.numeric(padded_orig_start ) - opt $ padding * event_length )
1346+ padded_region_end <- ceiling(as.numeric(padded_orig_end ) + opt $ padding * event_length )
13461347
13471348 # Track whether padding was successful
13481349 plot_padded_successfully <- FALSE
@@ -1352,19 +1353,19 @@ runRdTest<-function(bed)
13521353 if (is.matrix(padded_cnv_matrix_candidate ) && ncol(padded_cnv_matrix_candidate ) > 0 ) {
13531354 plotJPG(genotype_matrix , padded_cnv_matrix_candidate , chr , padded_region_start , padded_region_end , cnvID , sampleIDs , outputname , cnvtype ,
13541355 plotK = FALSE , plotfamily = FALSE , famfile , outFolder ,
1355- pad = opt $ padding , orig_start = event_coords_for_padding_orig_start , orig_end = event_coords_for_padding_orig_end )
1356+ pad = opt $ padding , orig_start = padded_orig_start , orig_end = padded_orig_end )
13561357 plot_padded_successfully <- TRUE
13571358 }
13581359 } else {
13591360 warning(paste(" Failed to load data for padded region for CNV ID:" , cnvID , " at" , chr , " :" , padded_region_start , " -" , padded_region_end , " . Plotting without padding." ))
13601361 }
13611362 } else {
1362- warning(paste(" Invalid padded interval for CNV ID:" , cnvID , " at" , chr , " :" , event_coords_for_padding_orig_start , " -" , event_coords_for_padding_orig_end , " is invalid (" , padded_region_start , " -" , padded_region_end , " ). Plotting without padding." ))
1363+ warning(paste(" Invalid padded interval for CNV ID:" , cnvID , " at" , chr , " :" , padded_orig_start , " -" , padded_orig_end , " is invalid (" , padded_region_start , " -" , padded_region_end , " ). Plotting without padding." ))
13631364 }
13641365
13651366 # If plotting with padding was not successful, fall back to original plot
13661367 if (! plot_padded_successfully ) {
1367- plotJPG(genotype_matrix , cnv_matrix , chr , event_coords_for_padding_orig_start , event_coords_for_padding_orig_end , cnvID , sampleIDs , outputname , cnvtype ,
1368+ plotJPG(genotype_matrix , cnv_matrix , chr , padded_orig_start , padded_orig_end , cnvID , sampleIDs , outputname , cnvtype ,
13681369 plotK = FALSE , plotfamily = FALSE , famfile , outFolder )
13691370 }
13701371 } else {
0 commit comments