From 6b9d9ea6efdb8647e016e8fcf9b98eb8c6c153d4 Mon Sep 17 00:00:00 2001
From: Colin Megill <colinmegill@gmail.com>
Date: Thu, 1 Mar 2018 11:45:58 -0800
Subject: [PATCH] render queue on scatter

---
 src/components/graph/drawGraph.js | 95 ++++++++++++++++++++-----------
 src/components/graph/graph.js     |  8 ++-
 2 files changed, 69 insertions(+), 34 deletions(-)

diff --git a/src/components/graph/drawGraph.js b/src/components/graph/drawGraph.js
index 46c5fc0a..f0f8dfd0 100644
--- a/src/components/graph/drawGraph.js
+++ b/src/components/graph/drawGraph.js
@@ -48,7 +48,47 @@ export const setupGraphElements = (
 *******************************************
 ******************************************/
 
-export const drawGraph = (
+const drawGraph = (
+  context,
+  expressionsCountsMap,
+  colorAccessor,
+  ranges,
+  metadata,
+  currentCellSelection,
+  graphBrushSelection,
+  colorScale,
+  graphMap, /* tmp remove when structure exists on server */
+  opacityForDeselectedCells,
+  _currentCellSelectionMap,
+) => {
+  return (p) => {
+
+    /* shuffle the data to overcome render order hiding cells, & filter first */
+    // data = d3.shuffle(data); /* make me a control */
+      context.beginPath();
+      /* context.arc(x,y,r,sAngle,eAngle,counterclockwise); */
+      context.arc(
+        globals.graphXScale(p[1]),            /* x */
+        globals.graphYScale(p[2]),            /* y */
+        _currentCellSelectionMap[p[0]]["__selected__"] ? 3 : 1.5,                  /* r */
+        0,                  /* sAngle */
+        2 * Math.PI         /* eAngle */
+      );
+
+      context.fillStyle = _currentCellSelectionMap[p[0]]["__color__"]
+
+      if (_currentCellSelectionMap[p[0]]["__selected__"]) {
+        context.globalAlpha = 1;
+      } else {
+        context.globalAlpha = opacityForDeselectedCells;
+      }
+
+      context.fill();
+
+  }
+}
+
+const _drawGraphUsingRenderQueue = (
   context,
   expressionsCountsMap,
   colorAccessor,
@@ -60,15 +100,13 @@ export const drawGraph = (
   graphMap, /* tmp remove when structure exists on server */
   opacityForDeselectedCells,
 ) => {
+  const _currentCellSelectionMap = _.keyBy(currentCellSelection, "CellName"); /* move me to the reducer */
 
-  /* clear canvas */
-  context.clearRect(0, 0, globals.graphWidth, globals.graphHeight);
-
-  const data = [];
+  const dataForGraph = [];
 
   _.each(currentCellSelection, (cell, i) => {
     if (graphMap[cell["CellName"]]) { /* fails silently, sometimes this is undefined, in which case the graph array should be shorter than the cell array, check in reducer */
-      data.push([
+      dataForGraph.push([
         cell["CellName"],
         graphMap[cell["CellName"]][0],
         graphMap[cell["CellName"]][1]
@@ -76,34 +114,27 @@ export const drawGraph = (
     }
   })
 
-  /* shuffle the data to overcome render order hiding cells, & filter first */
-  // data = d3.shuffle(data); /* make me a control */
-
-  const _currentCellSelectionMap = _.keyBy(currentCellSelection, "CellName"); /* move me to the reducer */
-
-  data.forEach((p, i) => {
-    context.beginPath();
-    /* context.arc(x,y,r,sAngle,eAngle,counterclockwise); */
-    context.arc(
-      globals.graphXScale(p[1]),            /* x */
-      globals.graphYScale(p[2]),            /* y */
-      _currentCellSelectionMap[p[0]]["__selected__"] ? 3 : 1.5,                  /* r */
-      0,                  /* sAngle */
-      2 * Math.PI         /* eAngle */
-    );
-
-    context.fillStyle = _currentCellSelectionMap[p[0]]["__color__"]
-
-    if (_currentCellSelectionMap[p[0]]["__selected__"]) {
-      context.globalAlpha = 1;
-    } else {
-      context.globalAlpha = opacityForDeselectedCells;
-    }
-
-    context.fill();
-  });
+  const _renderGraphWithFunctionReturnedByQueue = renderQueue(
+    drawGraph(
+      context,
+      expressionsCountsMap,
+      colorAccessor,
+      ranges,
+      metadata,
+      currentCellSelection,
+      graphBrushSelection,
+      colorScale,
+      graphMap, /* tmp remove when structure exists on server */
+      opacityForDeselectedCells,
+      _currentCellSelectionMap,
+    )
+  )
+  _renderGraphWithFunctionReturnedByQueue(dataForGraph);
+  return _renderGraphWithFunctionReturnedByQueue;
 }
 
+export const drawGraphUsingRenderQueue = _.debounce(_drawGraphUsingRenderQueue, 50);
+
 const setupGraphBrush = (
   svg,
   handleBrushSelectAction,
diff --git a/src/components/graph/graph.js b/src/components/graph/graph.js
index f672a6f5..7239d598 100644
--- a/src/components/graph/graph.js
+++ b/src/components/graph/graph.js
@@ -1,7 +1,8 @@
 import React from 'react';
 import _ from "lodash";
+import * as globals from "../../globals";
 import styles from "./graph.css";
-import {setupGraphElements, drawGraph} from "./drawGraph";
+import {setupGraphElements, drawGraphUsingRenderQueue} from "./drawGraph";
 import SectionHeader from "../framework/sectionHeader";
 import { connect } from "react-redux";
 import actions from "../../actions";
@@ -81,7 +82,10 @@ class Graph extends React.Component {
       // nextProps.expressions &&
       // nextProps.expressionsCountsMap &&
     ) {
-      drawGraph(
+      /* clear canvas */
+      this.state.ctx.clearRect(0, 0, globals.graphWidth, globals.graphHeight);
+
+      drawGraphUsingRenderQueue(
         this.state.ctx,
         nextProps.expressionsCountsMap,
         nextProps.colorAccessor,