Skip to content

Commit

Permalink
Merge pull request #206 from broadinstitute/integration
Browse files Browse the repository at this point in the history
Integration
  • Loading branch information
dnguyen1193 authored Dec 12, 2018
2 parents 5fad5a3 + ee01816 commit bd85b81
Show file tree
Hide file tree
Showing 44 changed files with 1,937 additions and 21,251 deletions.
267 changes: 173 additions & 94 deletions build/js/eqtl-dashboard.bundle.dev.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/js/eqtl-dashboard.bundle.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions build/js/eqtl-violin.bundle.min.js

Large diffs are not rendered by default.

470 changes: 313 additions & 157 deletions build/js/expression-map.bundle.dev.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions build/js/expression-map.bundle.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions build/js/gene-expression-violin-plot.bundle.min.js

Large diffs are not rendered by default.

10,212 changes: 0 additions & 10,212 deletions build/js/gev.bundle.dev.js

This file was deleted.

4 changes: 2 additions & 2 deletions build/js/gev.bundle.min.js

Large diffs are not rendered by default.

10,434 changes: 0 additions & 10,434 deletions build/js/gtex-viz.bundle.dev.js

This file was deleted.

4 changes: 2 additions & 2 deletions build/js/gtex-viz.bundle.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/bubbleMap.css
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ rect.track.highlighted {
}

.bbMap-dialog .title {
text-anchor: middle;
text-align: center;
font-size: 12px;

}
Expand Down
55 changes: 55 additions & 0 deletions css/geneExpViolin.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
#gene-expr-vplot-toolbar-plot-options {
display: inline-flex;
}

#gene-expr-vplot-toolbar-plot-options label {
margin-bottom: 0;
}

#gene-expr-vplot-toolbar {
border-bottom: 1px solid #e2e2e2;
border-top: 1px solid #e2e2e2;
padding: 5px 0px 5px 0px;
}

.gene-expr-vplot-option-label {
padding-right: 5px;
font-size: 15px;
font-variant: all-small-caps;
font-weight: 500;
}

#gene-expr-vplot-svg .violin-x-axis line, #gene-expr-vplot-svg .violin-y-axis line, #gene-expr-vplot-svg .violin-x-axis path, #gene-expr-vplot-svg .violin-y-axis path{
stroke: Black;
}

#gene-expr-vplot-svg .violin-x-axis text, #gene-expr-vplot-svg .violin-y-axis text, #gene-expr-vplot-svg .violin-axis-label {
fill: Black;
font-size: 11.5px;
font-weight: 500;
}

#gene-expr-vplot-svg text.violin-axis-label {
font-size: 12px;
}

#gene-expr-vplot-svg text.violin-legend-text {
font-size: 11.5px;
fill: Black;
font-weight: 500;
}

#gene-expr-vplot-svg path.violin.outlined {
stroke-width: 1.2px;
stroke: rgba(170, 170, 170, 0.9);
}

#gene-expr-vplot-svg path.violin.highlighted {
stroke-width: 2px;
stroke: rgba(85, 95, 102, 1);
}

#gene-expr-vplot-svg path.violin.highlighted.outlined {
stroke-width: 2px;
stroke: rgba(85, 95, 102, 1);
}
26 changes: 21 additions & 5 deletions css/violin.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
.violin-size-axis-hide text {
font-family: "Open Sans", "Helvetica", "Arial", sans-serif;
fill: #239db8;
font-size: 8px;
font-size: 11px;
}

.violin-x-axis-hide line, .violin-x-axis-hide path{
Expand Down Expand Up @@ -55,22 +55,23 @@

.violin-sub-axis text, .violin-sub-axis-hide text {
fill: SlateGray;
font-size: 9px;
font-size: 12px;
font-family: "Open Sans", "Helvetica", "Arial", sans-serif;

}

.violin-axis-label {
fill: SlateGray;
font-size: 9px;
font-size: 12px;
font-family: "Open Sans", "Helvetica", "Arial", sans-serif;
}
.violin-group-label {
font-size: 9px;
font-size: 12px;
text-anchor: middle;
}

div.violin-tooltip {
min-width: 100px;
min-width: 50px;
display: none;
background-color : rgba(32, 53, 73, 0.95);
padding: 10px;
Expand Down Expand Up @@ -104,6 +105,21 @@ text.violin-legend-text {

}

.violin-outliers circle {
stroke: #aaaaaa;
fill: none;
}

.violin-points circle {
stroke: #aaaaaa;
fill: #aaaaaa;
}

.violin-title {
font-size: 16px;
font-family: "Open Sans", "Helvetica", "Arial", sans-serif;
}




6 changes: 3 additions & 3 deletions demo/GTExViz.bubbleMap.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ <h5>GTEx Bubblemap</h5>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>

<script src="/build/js/gtex-viz.bundle.dev.js"></script>
<script src="/build/js/gtex-viz.bundle.min.js"></script>
<script>

let demoData = generateRandomData({x:50, y:10, vScaleFactor: 1, rScaleFactor: 50});
GTExViz.bubblemap({
id: 'demoBubblemap',
data: demoData,
width: 1200, //window.innerWidth*0.9,
height: 400, // TODO: use a dynamic width based on the matrix size
height: 500, // TODO: use a dynamic width based on the matrix size
marginTop: 100,
marginRight: 100,
marginBottom: 30,
Expand Down Expand Up @@ -93,4 +93,4 @@ <h5>GTEx Bubblemap</h5>
return data;
}
</script>
</html>
</html>
9 changes: 5 additions & 4 deletions demo/GTExViz.groupedViolinPlot.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h5>GTEx Grouped Violin Plot</h5>
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
<script src="/build/js/gtex-viz.bundle.dev.js"></script>
<script src="/build/js/gtex-viz.bundle.min.js"></script>
<script>
let data = GTExViz.demoData.groupedViolinPlot;
let violinDemoConfig = {
Expand All @@ -37,10 +37,11 @@ <h5>GTEx Grouped Violin Plot</h5>
marginBottom: 100,
showDivider: true,
xPadding: 0.3,
yLabel: "Random Value",
showGroupX: true,
yLabel: "Random Values",
showSubX: true,
showX: true,
xAngle: 0,
xAngle: 30,
subXAngle: 0,
showWhisker: false,
showLegend: false,
showSampleSize: true
Expand Down
4 changes: 2 additions & 2 deletions demo/GTExViz.ldPlot.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h5>GTEx Half Map</h5>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>

<script src="/build/js/gtex-viz.bundle.dev.js"></script>
<script src="/build/js/gtex-viz.bundle.min.js"></script>
<script>
let data = generateRandomMatrix({x:50, y:50, scaleFactor:1});
const ldPlotDemoConfig = {
Expand Down Expand Up @@ -69,4 +69,4 @@ <h5>GTEx Half Map</h5>
return data;
}
</script>
</html>
</html>
4 changes: 2 additions & 2 deletions demo/GTExViz.transcriptTracks.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h5>Transcript Viewer</h5>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>

<script src="/build/js/gtex-viz.bundle.dev.js"></script>
<script src="/build/js/gtex-viz.bundle.min.js"></script>
<script>
let config = {
id: 'gtexTranscriptTracks',
Expand Down Expand Up @@ -114,4 +114,4 @@ <h5>Transcript Viewer</h5>
};
}
</script>
</html>
</html>
148 changes: 148 additions & 0 deletions demo/eqtlViolin.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css"
integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU"
crossorigin="anonymous">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Libre+Franklin:300,400" >
<link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css">
<link rel="stylesheet" type="text/css" href="/css/violin.css">
</head>
<body class="container-fluid" style="margin-top:20px; margin-left: 20px;">
<h3>GTEx EQTL Violin Plot</h3>
<hr>
<div id="violin-1-root"></div>
<div id="violin-2-root"></div>
<div id="violin-3-root"></div>
<div id="violin-4-root"></div>

</body>
<script
src="https://code.jquery.com/jquery-3.2.1.min.js"
integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
crossorigin="anonymous">
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.4/js/select2.full.min.js"></script>
<script
src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"
integrity="sha256-VazP97ZCwtekAsvgPBSUwPFKdrwD3unUfSGVYrahUqU="
crossorigin="anonymous">
</script>
<script src="https://fastcdn.org/FileSaver.js/1.1.20151003/FileSaver.min.js"></script>
<script src="/build/js/eqtl-violin.bundle.min.js"></script>
<script>
$(document).ready(function(){
let gencodeId1 = 'ENSG00000248746.1'; // ACTN3
let tissueId1 = 'Muscle_Skeletal';
let group1 = 'Muscle - Skeletal';
let variantId1 = '11_66329732_A_G_b37';
let config1 = {
id: 'violin-1-root',
data: undefined, // web service call would assign the plot's data
width: 250,
height: 200,
marginLeft: 50,
marginRight: 20,
marginTop: 20,
marginBottom: 50,
showDivider: false,
xPadding: 0.3,
yLabel: 'Norm. Expression',
showSubX: true,
showX: false,
xAngle: 0,
subXAngle: 0,
showWhisker: false,
showLegend: false,
showSampleSize: true
};
EqtlViolinPlot.render(config1, gencodeId1, variantId1, tissueId1, group1);

let gencodeId2 = 'ENSG00000100030.10'; // MAPK1
let tissueId2 = 'Brain_Hypothalamus';
let group2 = 'Brain - Hypothalamus';
let variantId2 = '22_23174771_A_G_b37';
let config2 = {
id: 'violin-2-root',
data: undefined, // web service call would assign the plot's data
width: 250,
height: 200,
marginLeft: 50,
marginRight: 20,
marginTop: 20,
marginBottom: 50,
showDivider: false,
xPadding: 0.3,
yLabel: 'Norm. Expression',
showSubX: true,
showX: false,
xAngle: 0,
subXAngle: 0,
showWhisker: false,
showLegend: false,
showSampleSize: true
};
EqtlViolinPlot.render(config2, gencodeId2, variantId2, tissueId2, group2);

let gencodeId3 = 'ENSG00000100030.10'; // MAPK1
let tissueId3 = 'Brain_Anterior_cingulate_cortex_BA24';
let group3 = 'Brain - Anterior cingulate cortex (BA24)';
let variantId3 = '22_22504321_T_C_b37';
let config3 = {
id: 'violin-3-root',
data: undefined, // web service call would assign the plot's data
width: 250,
height: 200,
marginLeft: 50,
marginRight: 20,
marginTop: 20,
marginBottom: 50,
showDivider: false,
xPadding: 0.3,
yLabel: 'Norm. Expression',
showSubX: true,
showX: false,
xAngle: 0,
subXAngle: 0,
showWhisker: false,
showLegend: false,
showSampleSize: true
};
EqtlViolinPlot.render(config3, gencodeId3, variantId3, tissueId3, group3);

let gencodeId4 = 'ENSG00000100030.10'; // ACTN3
let tissueId4 = 'Brain_Hippocampus';
let group4 = 'Brain - Hippocampus';
let variantId4 = '22_23193959_T_G_b37';
let config4 = {
id: 'violin-4-root',
data: undefined, // web service call would assign the plot's data
width: 250,
height: 200,
marginLeft: 50,
marginRight: 20,
marginTop: 20,
marginBottom: 50,
showDivider: false,
xPadding: 0.3,
yLabel: 'Norm. Expression',
showSubX: true,
showX: false,
xAngle: 0,
subXAngle: 0,
showWhisker: false,
showLegend: false,
showSampleSize: true
};
EqtlViolinPlot.render(config4, gencodeId4, variantId4, tissueId4, group4);


});

</script>

</html>
Loading

0 comments on commit bd85b81

Please sign in to comment.