Skip to content

Commit 032f9fa

Browse files
committed
added paper figure to vignette. changed figure widths in vignette. made everythgin compliant (file sizes, ASCII char, etc)
1 parent 63dde4d commit 032f9fa

27 files changed

+791
-78
lines changed

.Rbuildignore

+10
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,12 @@
11
^.*\.Rproj$
22
^\.Rproj\.user$
3+
.Rproj.user
4+
.Rhistory
5+
.RData
6+
.DS_Store
7+
inst/doc/Sushi-0*.pdf
8+
inst/doc/Sushi.log
9+
inst/doc/Sushi.synctex.gz
10+
inst/doc/Sushi-concordance.tex
11+
inst/doc/Sushi.tex
12+
inst/doc/Sushi.toc

PaperFigure.R

+2-4
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,8 @@ chromend2 = 73100000
362362
zoomregion = c(72998000,73020000)
363363
chrom2_biomart = 15
364364

365-
Sushi_transcripts.bed[,1] = paste("chr",Sushi_transcripts.bed[,1],sep="")
366-
367365
# plot transcripts
368-
pg = plotgenes(Sushi_transcripts.bed,chrom2,chromstart2,chromend2 ,types = Sushi_transcripts.bed$type,
366+
pg = plotGenes(Sushi_transcripts.bed,chrom2,chromstart2,chromend2 ,types = Sushi_transcripts.bed$type,
369367
colorby=log10(Sushi_transcripts.bed$score+0.001),colorbycol= SushiColors(5) ,labeltext=FALSE,
370368
maxrows=50,height=0.4,plotgenetype="box")
371369

@@ -492,7 +490,7 @@ chromstart = 72998000
492490
chromend = 73020000
493491

494492
# plot gene structures
495-
plotgenes(Sushi_genes.bed,chrom_biomart,chromstart,chromend ,types=Sushi_genes.bed$type,
493+
plotGenes(Sushi_genes.bed,chrom,chromstart,chromend ,
496494
maxrows=1,bheight=0.2,plotgenetype="arrow",bentline=FALSE,
497495
labeloffset=1,fontsize=1.2)
498496

R/datasetsinfo.R

+12-12
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#' @docType data
66
#' @usage Sushi_5C.bedpe
77
#' @format bedpe format
8-
#' @source Sanyal, A., Lajoie, B. R., Jain, G. & Dekker, J. The long-range interaction landscape of gene promoters. Nature 489, 109113 (2012).
8+
#' @source Sanyal, A., Lajoie, B. R., Jain, G. & Dekker, J. The long-range interaction landscape of gene promoters. Nature 489, 109-113 (2012).
99
NULL
1010

1111
#' @name Sushi_ChIAPET_pol2.bedpe
@@ -15,7 +15,7 @@ NULL
1515
#' @docType data
1616
#' @usage Sushi_ChIAPET_pol2.bedpe
1717
#' @format bedpe format
18-
#' @source Li, G. et al. Extensive Promoter-Centered Chromatin Interactions Provide a Topological Basis for Transcription Regulation. Cell 148, 8498 (2012).
18+
#' @source Li, G. et al. Extensive Promoter-Centered Chromatin Interactions Provide a Topological Basis for Transcription Regulation. Cell 148, 84-98 (2012).
1919
NULL
2020

2121
#' @name Sushi_ChIPSeq_CTCF.bedgraph
@@ -25,7 +25,7 @@ NULL
2525
#' @docType data
2626
#' @usage Sushi_ChIPSeq_CTCF.bedgraph
2727
#' @format bedgraph format
28-
#' @source Consortium, T. E. P. An integrated encyclopedia of DNA elements in the human genome. Nature 489, 5774 (2012).
28+
#' @source Consortium, T. E. P. An integrated encyclopedia of DNA elements in the human genome. Nature 489, 57-74 (2012).
2929
NULL
3030

3131
#' @name Sushi_ChIPExo_CTCF.bedgraph
@@ -45,7 +45,7 @@ NULL
4545
#' @docType data
4646
#' @usage Sushi_ChIPSeq_pol2.bedgraph
4747
#' @format bedgraph format
48-
#' @source Consortium, T. E. P. An integrated encyclopedia of DNA elements in the human genome. Nature 489, 5774 (2012).
48+
#' @source Consortium, T. E. P. An integrated encyclopedia of DNA elements in the human genome. Nature 489, 57-74 (2012).
4949
NULL
5050

5151
#' @name Sushi_DNaseI.bedgraph
@@ -55,7 +55,7 @@ NULL
5555
#' @docType data
5656
#' @usage Sushi_DNaseI.bedgraph
5757
#' @format bedgraph format
58-
#' @source Neph, S. et al. An expansive human regulatory lexicon encoded in transcription factor footprints. Nature 489, 8390 (2012).
58+
#' @source Neph, S. et al. An expansive human regulatory lexicon encoded in transcription factor footprints. Nature 489, 83-90 (2012).
5959
NULL
6060

6161
#' @name Sushi_ChIPSeq_pol2.bed
@@ -65,7 +65,7 @@ NULL
6565
#' @docType data
6666
#' @usage Sushi_ChIPSeq_pol2.bed
6767
#' @format bed format
68-
#' @source Consortium, T. E. P. An integrated encyclopedia of DNA elements in the human genome. Nature 489, 5774 (2012).
68+
#' @source Consortium, T. E. P. An integrated encyclopedia of DNA elements in the human genome. Nature 489, 57-74 (2012).
6969
NULL
7070

7171

@@ -76,7 +76,7 @@ NULL
7676
#' @docType data
7777
#' @usage Sushi_ChIPSeq_severalfactors.bed
7878
#' @format bed format
79-
#' @source Consortium, T. E. P. An integrated encyclopedia of DNA elements in the human genome. Nature 489, 5774 (2012).
79+
#' @source Consortium, T. E. P. An integrated encyclopedia of DNA elements in the human genome. Nature 489, 57-74 (2012).
8080
NULL
8181

8282
#' @name Sushi_RNASeq_K562.bedgraph
@@ -86,7 +86,7 @@ NULL
8686
#' @docType data
8787
#' @usage Sushi_RNASeq_K562.bedgraph
8888
#' @format bedgraph format
89-
#' @source Consortium, T. E. P. An integrated encyclopedia of DNA elements in the human genome. Nature 489, 5774 (2012).
89+
#' @source Consortium, T. E. P. An integrated encyclopedia of DNA elements in the human genome. Nature 489, 57-74 (2012).
9090
NULL
9191

9292

@@ -97,7 +97,7 @@ NULL
9797
#' @docType data
9898
#' @usage Sushi_RNASeq_K562.bedgraph
9999
#' @format bedgraph format
100-
#' @source Consortium, T. E. P. An integrated encyclopedia of DNA elements in the human genome. Nature 489, 5774 (2012).
100+
#' @source Consortium, T. E. P. An integrated encyclopedia of DNA elements in the human genome. Nature 489, 57-74 (2012).
101101
NULL
102102

103103
#' @name Sushi_GWAS.bed
@@ -107,7 +107,7 @@ NULL
107107
#' @docType data
108108
#' @usage Sushi_GWAS.bed
109109
#' @format bed format
110-
#' @source Ehret, G. B. et al. Genetic variants in novel pathways influence blood pressure and cardiovascular disease risk. Nature 478, 103109 (2011).
110+
#' @source Ehret, G. B. et al. Genetic variants in novel pathways influence blood pressure and cardiovascular disease risk. Nature 478, 103-109 (2011).
111111
NULL
112112

113113
#' @name Sushi_HiC.matrix
@@ -137,7 +137,7 @@ NULL
137137
#' @docType data
138138
#' @usage Sushi_transcripts.bed
139139
#' @format bed format
140-
#' @source http://www.biomart.org/ and Consortium, T. E. P. An integrated encyclopedia of DNA elements in the human genome. Nature 489, 5774 (2012).
140+
#' @source http://www.biomart.org/ and Consortium, T. E. P. An integrated encyclopedia of DNA elements in the human genome. Nature 489, 57-74 (2012).
141141
NULL
142142

143143
#' @name Sushi_hg18_genome
@@ -146,7 +146,7 @@ NULL
146146
#' @docType data
147147
#' @usage Sushi_hg18_genome
148148
#' @format two columns (column 1 = chromosome name, column 2 = length of chromosome)
149-
#' @source http://www.biomart.org/ and Consortium, T. E. P. An integrated encyclopedia of DNA elements in the human genome. Nature 489, 5774 (2012).
149+
#' @source http://www.biomart.org/ and Consortium, T. E. P. An integrated encyclopedia of DNA elements in the human genome. Nature 489, 57-74 (2012).
150150
NULL
151151

152152

R/labelplot.R

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#' @param titlecex cex of title See \code{\link{par}}
1313
#' @param letterline line of letter. See \code{\link{par}}
1414
#' @param titleline line of title See \code{\link{par}}
15+
#' @param lettercol color of letter. See \code{\link{par}}
16+
#' @param titlecol color of title See \code{\link{par}}
1517
#' @export
1618
#' @examples
1719
#'

R/opaque.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ opaque <- function(color=SushiColors(7)(7),transparency=0.5)
1212
if (length(color) == 1)
1313
{
1414
colrgb = col2rgb(color)
15-
newcol = rgb(colrgb[1],colrgb[2],colrgb[3],alpha=transparency * 255,max = 255)
15+
newcol = rgb(colrgb[1],colrgb[2],colrgb[3],alpha=transparency * 255,maxColorValue = 255)
1616
return(newcol)
1717
}
1818
else
@@ -21,7 +21,7 @@ opaque <- function(color=SushiColors(7)(7),transparency=0.5)
2121
for (col in color)
2222
{
2323
colrgb = col2rgb(col)
24-
newcols = c(newcols,rgb(colrgb[1],colrgb[2],colrgb[3],alpha=transparency * 255,max = 255))
24+
newcols = c(newcols,rgb(colrgb[1],colrgb[2],colrgb[3],alpha=transparency * 255,maxColorValue = 255))
2525
}
2626
return (newcols)
2727
}

R/plotgenes.R

+7-2
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
#' chromend = 73020000
3535
#' chrom_biomart = 15
3636
#'
37-
#' plotgenes(Sushi_genes.bed,chrom_biomart,chromstart,chromend ,types=Sushi_genes.bed$type,
37+
#' plotGenes(Sushi_genes.bed,chrom_biomart,chromstart,chromend ,types=Sushi_genes.bed$type,
3838
#' maxrows=1,height=0.5,plotgenetype="arrow",bentline=FALSE,col="blue",
3939
#' labeloffset=1,fontsize=1.2)
4040
#'
4141
#' labelgenome( chrom, chromstart,chromend,side=1,scipen=20,n=3,scale="Mb",line=.18,chromline=.5,scaleline=0.5)
4242
#'
43-
plotgenes <-
43+
plotGenes <-
4444
function(transcripts, chrom=NULL, chromstart=NULL,chromend=NULL,
4545
col=SushiColors(2)(2)[1],bheight=0.3,lheight=0.3,bentline=TRUE,
4646
packrow=TRUE,maxrows=10000,
@@ -370,6 +370,11 @@ function(transcripts, chrom=NULL, chromstart=NULL,chromend=NULL,
370370

371371
# filter out rows above max row
372372
transcriptinfo = transcriptinfo[which(is.na(transcriptinfo$plotrow)==FALSE),]
373+
374+
# filter out transcrits that don't overlap region
375+
transcriptinfo = transcriptinfo[which((transcriptinfo[,2] > chromstart & transcriptinfo[,2] < chromend)
376+
| (transcriptinfo[,3] > chromstart & transcriptinfo[,3] < chromend)),]
377+
373378

374379
plot(c(1,1),xlim=c(chromstart,chromend),ylim=c(0.5,( max(transcriptinfo$plotrow) + offsettop)),type ='n',bty='n',xaxt='n',yaxt='n',ylab="",xlab="",xaxs="i")
375380

Sushi.Rproj

+1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ LaTeX: pdfLaTeX
1414

1515
BuildType: Package
1616
PackageInstallArgs: --no-multiarch --with-keep.source
17+
PackageBuildArgs: --resave-data
1718
PackageRoxygenize: rd

Sushi.bib

+92
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
@article{encode_integrated_2012,
2+
title = {An integrated encyclopedia of {DNA} elements in the human genome},
3+
author = {{The ENCODE Project Consortium}},
4+
journal = {Nature},
5+
year = {2012},
6+
volume = {489},
7+
issn = {1476-4687},
8+
url = {http://www.ncbi.nlm.nih.gov/pubmed/22955616},
9+
doi = {10.1038/nature11247},
10+
number = {7414},
11+
month = sep,
12+
note = {{PMID:} 22955616},
13+
pages = {57--74},
14+
}
15+
@article{fiveC,
16+
title = {The long-range interaction landscape of gene promoters},
17+
volume = {489},
18+
doi = {10.1038/nature11279},
19+
number = {7414},
20+
journal = {Nature},
21+
author = {A Sanyal and BR Lajoie and G Jain and J Dekker},
22+
month = sep,
23+
year = {2012},
24+
note = {{PMID:} 22955621},
25+
pages = {109--113},
26+
}
27+
@article{chiapet,
28+
title = {Extensive promoter-centered chromatin interactions provide a
29+
topological basis for transcription regulation},
30+
volume = {148},
31+
doi = {10.1016/j.cell.2011.12.014},
32+
journal = {Cell},
33+
author = {G Li and X Ruan and RK Auerbach and KS Sandhu and M Zheng and P Wang and HM Poh and Y Goh and J Lim and J Zhang and HS Sim and SQ Peh and FH Mulawadi and CT Ong and YL Orlov and S Hong and Z Zhang and S Landt and D Raha and G Euskirchen and CL Wei and W Ge and H Wang and C Davis and KI Fisher-Aylor and A Mortazavi and M Gerstein and T Gingeras and B Wold and Y Sun and MJ Fullwood and E Cheung and E Liu and WK Sung and M Snyder and Y Ruan},
34+
month = jan,
35+
year = {2012},
36+
note = {{PMID:} 22265404},
37+
pages = {84--98},
38+
}
39+
@article{chipexo,
40+
title = {Comprehensive genome-wide protein-DNA interactions detected
41+
at single-nucleotide resolution},
42+
volume = {147},
43+
doi = {10.1016/j.cell.2011.11.013},
44+
journal = {Cell},
45+
author = {HS Rhee and BF Pugh},
46+
month = dec,
47+
year = {2011},
48+
note = {{PMID:} 22153082},
49+
}
50+
51+
@article{dnaseI,
52+
title = {An expansive human regulatory lexicon encoded in transcription factor footprints},
53+
volume = {489},
54+
doi = {10.1038/nature11212},
55+
journal = {Nature},
56+
author = {S Neph S and J Vierstra and AB Stergachis and AP Reynolds and E Haugen and B Vernot and RE Thurman
57+
and S John and R Sandstrom and AK Johnson and MT Maurano and R Humbert and E Rynes and H Wang and S Vong
58+
and K Lee and D Bates and M Diegel and V Roach and D Dunn and J Neri and A Schafer and RS Hansen and T
59+
Kutyavin and E Giste and M Weaver and T Canfield and P Sabo and M Zhang and G Balasundaram and R Byron
60+
and MJ MacCoss and JM Akey and MA Bender and M Groudine and R Kaul and JA Stamatoyannopoulos},
61+
month = sep,
62+
year = {2012},
63+
pages = {83-90},
64+
note = {{PMID:} 22955618},
65+
}
66+
67+
@article{GWAS,
68+
title = {Genetic variants in novel pathways influence blood pressure and cardiovascular disease risk},
69+
volume = {478},
70+
doi = {10.1038/nature10405},
71+
journal = {Nature},
72+
author = {{International Consortium for Blood Pressure Genome-Wide Association Studies}},
73+
month = sep,
74+
year = {2011},
75+
note = {{PMID:} 21909115},
76+
}
77+
78+
@article{HiC,
79+
title = {Topological domains in mammalian genomes identified by analysis of chromatin
80+
interactions},
81+
volume = {485},
82+
doi = {10.1038/nature11082},
83+
journal = {Nature},
84+
author = {JR Dixon and S Selvaraj and F Yue and A Kim and Y Li and Y Shen and M Hu and JS Liu and B Ren},
85+
month = sep,
86+
year = {2012},
87+
note = {{PMID:} 22495300},
88+
}
89+
@online{biomart,
90+
title = {Biomart},
91+
url = {http://www.biomart.org/}
92+
}

data/Sushi_5C.bedpe.rda

235 KB
Binary file not shown.

data/Sushi_genes.bed.rda

-44 Bytes
Binary file not shown.

data/Sushi_transcripts.bed.rda

18 Bytes
Binary file not shown.

inst/doc/Rplots.pdf

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)