concise conditionals

src/components/graph/drawGraph.js

@@ -95,7 +95,9 @@ export const drawGraph = (
   }
 
   /* shuffle the data to overcome render order hiding cells, & filter first */
-  // data = d3.shuffle(data);
+  // data = d3.shuffle(data); /* make me a control */
+
+  const _metadata = _.keyBy(metadata, "CellName"); /* move me to the reducer */
 
   data.forEach((p, i) => {
     context.beginPath();
@@ -129,25 +131,15 @@ export const drawGraph = (
       // }
     }
 
-    if (pointIsInsideBrushBounds) {
+    context.globalAlpha = !graphBrushSelection || pointIsInsideBrushBounds ? 1 : .2;
-      console.log('inside', x(p[1]), y(p[2]), graphBrushSelection)
+
-      context.fillStyle = "rgb(255,0,0)";
+    if (color) {
-    } else {
+      context.fillStyle = d3.interpolateViridis(colorScale(
-      context.fillStyle = "rgb(0,0,0)"
+        _metadata[p[0]][color]
+        // _.find(metadata, {CellName: p[0]})[color] /* this.state.cells.metadata["23452345325"]["ERCC_reads"] = 20000 would be much faster as key value lookup */
+      ));
     }
 
-    // if (color) {
-    //   if (i === 10) {
-    //     console.log(p[0], x(p[1]), y(p[2]), _.find(metadata, {CellName: p[0]}))
-    //   }
-    //   context.fillStyle = d3.interpolateViridis(colorScale(
-    //     _.find(metadata, {CellName: p[0]})[color] /* this.state.cells.metadata["23452345325"]["ERCC_reads"] = 20000 would be much faster as key value lookup */
-    //   ));
-    //   context.strokeStyle = "red";
-    // }
-
-    context.fill();
-
     // if (i < 20) {
       // console.log(
       //   '0 to 1 scale', expressionToColorScale(expressionsCountsMap[p[0]]),
@@ -161,6 +153,8 @@ export const drawGraph = (
     //   expressionsCountsMap[p[0]]
     // ));
 
+    context.fill();
+
   });
 }