v1.18.1 fixed colorbar bug and improved size

MaayanLab · Jun 8, 2017 · 8e3cada · 8e3cada
1 parent 466bec0
commit 8e3cada
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 18 deletions.
diff --git a/clustergrammer.js b/clustergrammer.js
diff --git a/clustergrammer.min.js b/clustergrammer.min.js
diff --git a/clustergrammer.node.js b/clustergrammer.node.js
diff --git a/clustergrammer.node.min.js b/clustergrammer.node.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "clustergrammer",
-  "version": "v1.18.0",
+  "version": "v1.18.1",
   "description": "This is a clustergram implemented in D3.js. I started from the example http://bost.ocks.org/mike/miserables/ and added the following features",
   "main": "clustergrammer.node.js",
   "scripts": {

diff --git a/src/main.js b/src/main.js
@@ -27,7 +27,7 @@ var awesomplete = require('awesomplete');
 require('!style!css!./d3.slider/d3.slider.css');
 require('!style!css!awesomplete/awesomplete.css');
 
-/* clustergrammer v1.18.0
+/* clustergrammer v1.18.1
  * Nicolas Fernandez, Ma'ayan Lab, Icahn School of Medicine at Mount Sinai
  * (c) 2017
  */

diff --git a/src/sidebar/make_colorbar.js b/src/sidebar/make_colorbar.js
@@ -11,7 +11,7 @@ module.exports = function make_colorbar(cgm){
 
 
   var colorbar_width = params.sidebar.width - 20;
-  var colorbar_height = 15;
+  var colorbar_height = 13;
   var svg_height = 3*colorbar_height;
   var svg_width =  1.2*colorbar_width;
   var low_left_margin = 10  ;
@@ -111,6 +111,7 @@ module.exports = function make_colorbar(cgm){
   ///////////////
 
   var max_abs_val = Math.abs(  Math.round(params.matrix.max_link * 10) /10);
+  var font_size = 13;
 
   main_svg
     .append('text')
@@ -125,7 +126,7 @@ module.exports = function make_colorbar(cgm){
     })
     .style('font-family', '"Helvetica Neue", Helvetica, Arial, sans-serif')
     .style('font-weight',  300)
-    .style('font-size', 15)
+    .style('font-size', font_size)
     .attr('transform', 'translate('+low_left_margin+','+top_margin+')')
     .attr('text-anchor', 'start');
 
@@ -137,13 +138,13 @@ module.exports = function make_colorbar(cgm){
       if (special_case === 'all_negative'){
         inst_string = 0;
       } else {
-        inst_string= '-' + max_abs_val.toLocaleString();
+        inst_string=  max_abs_val.toLocaleString();
       }
       return inst_string;
     })
     .style('font-family', '"Helvetica Neue", Helvetica, Arial, sans-serif')
     .style('font-weight',  300)
-    .style('font-size', 15)
+    .style('font-size', font_size)
     .attr('transform', 'translate('+high_left_margin+','+top_margin+')')
     .attr('text-anchor', 'end');
 };