using chroma to do color conversions

bhofmei · Mar 16, 2017 · 6791cc3 · 6791cc3
1 parent f3b253d
commit 6791cc3
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 7 deletions.
diff --git a/js/View/ColorHandler.js b/js/View/ColorHandler.js
@@ -2,13 +2,13 @@ define('NucleotideDensityPlugin/View/ColorHandler',[
  'dojo/_base/declare',
  'dojo/_base/array',
  'dojo/_base/lang',
- 'dojo/_base/Color',
+ './chroma'
 ],
 function(
  declare,
  array,
  lang,
- dojoColor
+  chroma
 
 ){
  /*
@@ -30,23 +30,26 @@ ColorHandler = {
  },
 
  generateNColors: function(n){
+ var thisB = this;
  var s=100, l=65, sep=360/n;
  var hs=[];
  var i;
  for(i=0; i < n; i++){
  hs.push(sep*i);
  }
  var out = array.map(hs, function(h){
- var t = dojoxColor.fromHsl(h, s, l);
- return t.toHex();
+ var t = chroma.hcl(h,s,l);
+ return t.hex();
  });
  return out;
  },
 
  getFontColor: function(color){
  // from http:https://stackoverflow.com/questions/1855884/determine-font-color-based-on-background-color
- var bg = new dojoColor(color);
- var rgb = bg.toRgb();
+ //var bg = new dojoColor(color);
+ var bg = chroma(color);
+ //var rgb = bg.toRgb();
+ var rgb = bg.rgb();
  var a = 1 - ( 0.299 * rgb[0] + 0.587 * rgb[1] + 0.114 * rgb[2])/255;
  if(a >= 0.5)
  return '#F0F0F0';
@@ -96,7 +99,6 @@ ColorHandler = {
  n %= colorList.length;
  return colorList[n];
  }
-
  }
 return ColorHandler;
 });