support function callbacks for all Wiggle/XYPlot color conf settings,…

… references #133
GMOD · Feb 21, 2013 · 189e224 · 189e224
1 parent cc5bbca
commit 189e224
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/docs/tutorial/data_files/volvox_microarray.bw.conf b/docs/tutorial/data_files/volvox_microarray.bw.conf
@@ -14,6 +14,9 @@
          "type" : "JBrowse/View/Track/Wiggle/XYPlot",
          "label" : "volvox_microarray.bw_xyplot",
          "key" : "BigWig XY - volvox_microarray",
+         "style": {
+           "pos_color": "function(feature) { return feature.get('score') > 300 ? 'red' : 'blue'; }"
+         },
          "variance_band": "true"
       }
 ]
diff --git a/src/JBrowse/View/Track/Wiggle/XYPlot.js b/src/JBrowse/View/Track/Wiggle/XYPlot.js
@@ -82,10 +82,6 @@ var XYPlot = declare( [WiggleBase, YScaleMixin],
         });
         var originY = toY( dataScale.origin );
 
-        var posColor  = this.config.style.pos_color;
-        var negColor  = this.config.style.neg_color;
-        var clipColor = this.config.style.clip_marker_color;
-        var bgColor   = this.config.style.bg_color;
         var disableClipMarkers = this.config.disable_clip_markers;
 
         dojo.forEach( features, function(f,i) {
@@ -98,28 +94,31 @@ var XYPlot = declare( [WiggleBase, YScaleMixin],
             //console.log( score, fRect.t );
 
             // draw the background color if we are configured to do so
-            if( bgColor && fRect.t >= 0 ) {
-                context.fillStyle = bgColor;
-                context.fillRect( fRect.l, 0, fRect.w, canvasHeight );
+            if( fRect.t >= 0 ) {
+                var bgColor = this.getConf('style.bg_color',[f]);
+                if( bgColor ) {
+                    context.fillStyle = bgColor;
+                    context.fillRect( fRect.l, 0, fRect.w, canvasHeight );
+                }
             }
 
             if( fRect.t <= canvasHeight ) { // if the rectangle is visible at all
 
                 if( fRect.t <= originY ) {
                     // bar goes upward
-                    context.fillStyle = posColor;
+                    context.fillStyle = this.getConf('style.pos_color',[f]);
                     context.fillRect( fRect.l, fRect.t, fRect.w, originY-fRect.t+1);
                     if( !disableClipMarkers && fRect.t < 0 ) { // draw clip marker if necessary
-                        context.fillStyle = clipColor || negColor;
+                        context.fillStyle = this.getConf('style.clip_marker_color',[f]) || this.getConf('style.neg_color',[f]);
                         context.fillRect( fRect.l, 0, fRect.w, 2 );
                     }
                 }
                 else {
                     // bar goes downward
-                    context.fillStyle = negColor;
+                    context.fillStyle = this.getConf('style.neg_color',[f]);
                     context.fillRect( fRect.l, originY, fRect.w, fRect.t-originY+1 );
                     if( !disableClipMarkers && fRect.t >= canvasHeight ) { // draw clip marker if necessary
-                        context.fillStyle = clipColor || posColor;
+                        context.fillStyle = this.getConf('style.clip_marker_color',[f]) || this.getConf('style.pos_color',[f]);
                         context.fillRect( fRect.l, canvasHeight-3, fRect.w, 2 );
                     }
                 }