Merge pull request #126 from colin-combe/master

bug fix for colour schemes

Author: colin-combe

build/complexviewer.js

@@ -985,15 +985,15 @@ xiNET.Controller.prototype.setAnnotations = function(annotationChoice) {
         for (m = 0; m < molCount; m++) {
             var mol = mols[m];
             for (var a = 0; a < mol.annotations.length; a++){
-                categories.add(mol.annotations[a].name);
+                categories.add(mol.annotations[a].description);
             }
         }
         var catCount = categories.values().length;
 
         var colourScheme;// = null;
         if (catCount < 3){catCount = 3;}
         //~ if (catCount < 21) {
-            if (catCount < 6) {
+            if (catCount < 5) {
 				//~ var reversed = colorbrewer.Accent[catCount].slice().reverse();
                 //~ colourScheme = d3.scale.ordinal().range(reversed);
                 colourScheme = d3.scale.ordinal().range(colorbrewer.Set1[4]);