updates

Genomon-Project · Feb 6, 2017 · e9e8c8b · e9e8c8b
1 parent 068d5a0
commit e9e8c8b
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 12 deletions.
diff --git a/example/default.js b/example/default.js
@@ -9,21 +9,32 @@ style_qc = {
     brush_border_y_opacity: 0.5,
     plot_border_y_color: "#DDDDCC",
     plot_border_y_opacity: 0.2,
+    title_y_font_size: "12px",
+    legend_title_font_size: "16px",
+    legend_text_font_size: "12px",
 };
 
 // style of genome-wide bar plot
 style_sv_bar = {
     // title's text options
-    title_top: "Genome-wide CAs identify",
     title_y: "samples with CA breakp.",
+    title_y_font_size: "12px",
+
     title_x: "Chromosome",
+    title_x_font_size: "14px",
+
+    legend_title: "Genome-wide CAs identify",
+    legend_title_font_size: "16px",
+    legend_text_font_size: "12px",
 
     border_x_main_color: "#E0E0E0",
     border_x_main_width: "1px",
     border_x_sub_color: "#A6A6A6",
     border_x_sub_width: "1px",
     border_y_color: "#DDDDCC",
     border_y_opacity: 0.5,
+
+    axis_x_font_size: "9px",
 };
 
 // style of thumbnails
@@ -68,43 +79,96 @@ style_sv_detail = {
 style_mut = {
     // title's text options
     title_sample: "Sample",
+    title_sample_font_size: "14px",
     title_sample_y: "Number of mutation",
+    title_sample_y_font_size: "12px",
     virtical_border_x_color: "#CCCCEE",
     virtical_border_x_width: "1px",
     virtical_border_y_color: "#DDDDCC",
     virtical_border_y_opacity: 0.5,
 
     title_gene: "Genes",
-    title_gene_y1: "% Samples",
-    title_gene_y2: "with mutation",
+    title_gene_font_size: "14px",
+    title_gene_y1: "% Samplesg",
+    title_gene_y2: "with mutationg",
+    title_gene_y1_font_size: "12px",
+    title_gene_y2_font_size: "12px",
     horizon_border_x_color: "#CCCCEE",
     horizon_border_x_width: "1px",
     horizon_border_y_color: "#DDDDCC",
     horizon_border_y_opacity: 0.5,
 
-    func_title: "functions",
+    // legend
+    legend_title: "functions",
+    legend_title_font_size: "16px",
+    legend_text_font_size: "12px",
+
+    // gene
+    gene_text_font_size: "9px",
 
+    // subplot
     sub_border_color: "#FFFFFF",
     sub_border_width: "1px",
 
 };
 
 // style of signature
 style_signature = {
+    // stack-integral
     title_integral: "Signature integral",
+    title_integral_font_size: "16px",
     title_integral_y: "membership",
-    title_signature_y: "probaility",
-    border_y_color: "#DDDDCC",
-    border_y_opacity: 0.5,
+    title_integral_y_font_size: "12px",
+    legend_integral_title_font_size: "16px",
+    legend_integral_text_font_size: "12px",
+
+    // stack-rate
+    title_rate: "Signature rate",
+    title_rate_font_size: "16px",
+    title_rate_y: "membership",
+    title_rate_y_font_size: "12px",
+    legend_rate_title_font_size: "16px",
+    legend_rate_text_font_size: "12px",
+
+    //stack-common
     plot_border_y_color: "#DDDDCC",
     plot_border_y_opacity: 0.5,
+
+    // signature
+    signature_title_font_size: "12px",
+    signature_title_y: "probaility",
+    signature_title_y_font_size: "12px",
+    signature_title_x_font_size: "12px",
+    border_y_color: "#DDDDCC",
+    border_y_opacity: 0.5,
 };
 
 // style of pmsignature
 style_pmsignature = {
+    // stack-integral
     title_integral: "Signature integral",
+    title_integral_font_size: "16px",
     title_integral_y: "membership",
+    title_integral_y_font_size: "12px",
+    legend_integral_title_font_size: "16px",
+    legend_integral_text_font_size: "12px",
+
+    // stack-rate
+    title_rate: "Signature rate",
+    title_rate_font_size: "16px",
+    title_rate_y: "membership",
+    title_rate_y_font_size: "12px",
+    legend_rate_title_font_size: "16px",
+    legend_rate_text_font_size: "12px",
+
+    //stack-common
     plot_border_y_color: "#DDDDCC",
     plot_border_y_opacity: 0.5,
+
+    // signature
+    signature_alt_font_size: "10px",
+    signature_ref_font_size: "10px",
+    signature_strand_font_size: "10px",
+    signature_title_font_size: "12px",
 };
 })();
diff --git a/scripts/paplot/__init__.py b/scripts/paplot/__init__.py
@@ -1 +1 @@
-__version__ = '0.5.2'
+__version__ = '0.5.3'
diff --git a/scripts/paplot/js/graph_ca.js b/scripts/paplot/js/graph_ca.js
@@ -207,7 +207,7 @@ function draw_select()
     div_select_bar.options.grid_xs[1].keys = bar_dataset.all_key;
     div_select_bar.options.grid_xs[1].labels = chromos;
     div_select_bar.options.grid_xs[1].wide = 40;
-    div_select_bar.options.grid_xs[1].font_size = "9px";
+    div_select_bar.options.grid_xs[1].font_size = style_sv_bar.axis_x_font_size;
     div_select_bar.options.grid_xs[1].sift_y = 10;
     div_select_bar.options.grid_xs[1].border_color = style_sv_bar.border_x_sub_color;
     div_select_bar.options.grid_xs[1].border_width = style_sv_bar.border_x_sub_width;

diff --git a/scripts/paplot/style/default.js b/scripts/paplot/style/default.js
@@ -33,6 +33,8 @@ style_sv_bar = {
     border_x_sub_width: "1px",
     border_y_color: "#DDDDCC",
     border_y_opacity: 0.5,
+
+    axis_x_font_size: "9px",
 };
 
 // style of thumbnails

diff --git a/scripts/paplot/style/large_font.js b/scripts/paplot/style/large_font.js
@@ -17,7 +17,7 @@ style_qc = {
 // style of genome-wide bar plot
 style_sv_bar = {
     // title's text options
-    title_y: "samples with CA breakp.",
+    title_y: "number",
     title_y_font_size: "18px", //"12px",
 
     title_x: "Chromosome",
@@ -33,6 +33,8 @@ style_sv_bar = {
     border_x_sub_width: "1px",
     border_y_color: "#DDDDCC",
     border_y_opacity: 0.5,
+
+    axis_x_font_size: "12px", //"9px",
 };
 
 // style of thumbnails

diff --git a/scripts/paplot/templates/graph_pmsignature.html b/scripts/paplot/templates/graph_pmsignature.html
@@ -44,7 +44,7 @@ <h2>{title} - {project}</h2>
 
 <script type="text/javascript" src="../lib/d3_v3.5.13/d3.min.js"></script>
 <script type="text/javascript" src="../lib/d3-legend_v1.10.0/d3-legend.min.js"></script>
-<script type="text/javascript" src="../style/default.js"></script>
+<script type="text/javascript" src="{style}"></script>
 <script type="text/javascript" src="../js/utils.js"></script>
 <script type="text/javascript" src="../js/bar.js"></script>
 <script type="text/javascript" src="../js/pmsignature.js"></script>

diff --git a/scripts/paplot/templates/graph_signature.html b/scripts/paplot/templates/graph_signature.html
@@ -44,7 +44,7 @@ <h2>{title} - {project}</h2>
 
 <script type="text/javascript" src="../lib/d3_v3.5.13/d3.min.js"></script>
 <script type="text/javascript" src="../lib/d3-legend_v1.10.0/d3-legend.min.js"></script>
-<script type="text/javascript" src="../style/default.js"></script>
+<script type="text/javascript" src="{style}"></script>
 <script type="text/javascript" src="../js/utils.js"></script>
 <script type="text/javascript" src="../js/bar.js"></script>
 <script type="text/javascript" src="./{data_js}"></script>