stack #2 save

DessimozLab · May 12, 2021 · e04ee62 · e04ee62
1 parent a6e9345
commit e04ee62
Show file tree

Hide file tree

Showing 4 changed files with 391 additions and 84 deletions.
diff --git a/phyloio/dist/index.html b/phyloio/dist/index.html
@@ -34,9 +34,9 @@
     c1.add_tree(t3)
     //c1.add_tree(t2)
 
-    c2.add_tree(t_stack,{'data_type': 'json', 'use_branch_lenght': false})
+    c2.add_tree(t_stack,{'data_type': 'json', 'use_branch_lenght': false, 'show_histogram':true})
     c2.add_tree(t1)
-    c2.add_tree(t3)
+    //c2.add_tree(t3)
 
     phylo.start()
 

diff --git a/phyloio/src/model.js b/phyloio/src/model.js
@@ -8,9 +8,20 @@ export default class Model {
 
         this.settings = {
             'data_type' : 'newick',
-            'stack': false,
             'use_branch_lenght' : true,
-            'style': {
+            'show_histogram' : false,
+            'has_histogram_data' : false,
+            'style': {},
+            'stack' : {
+                'type': 'genes',
+                'showHistogramValues' : true,
+                'showHistogramSummaryValue' : true,
+                'legendTxtSize' : 12,
+                'margin' : 8,
+                'xInitialRightMargin' : 35,
+                'stackHeight' : 100,
+                'stackWidth' : 20,
+
             },
         }
 
@@ -28,9 +39,10 @@ export default class Model {
         this.data = this.factory(this.parse());
         this.data.root = true;
 
-
-
-
+        // check that histogram data is present
+        if(this.settings.show_histogram && this.data.evolutionaryEvents) {
+            this.settings.has_histogram_data  = true;
+        }
 
 
     }

diff --git a/phyloio/src/style.css b/phyloio/src/style.css
@@ -1,15 +1,15 @@
 
 body{
-    background-color: #ccc
+    background-color: #fff
 }
 
 #container1{
     display: inline-block;
     width: 40%;
     height: 600px;
     margin: 32px;
-    border: #0f0f0f 4px solid;
-    background-color: #ddd;
+    border: #0f0f0f 2px solid;
+    background-color: #fff;
     padding: 8px;
 }
 
@@ -18,8 +18,8 @@ body{
     width: 40%;
     height: 600px;
     margin: 32px;
-    border: #0f0f0f 4px solid;
-    background-color: #ddd;
+    border: #0f0f0f 2px solid;
+    background-color: #fff;
     padding: 8px;
 }