color scales in graph

This commit is contained in:
Colin Megill
2017-11-06 00:11:50 -08:00
parent 735e81f90b
commit 93ba5ef2aa
2 changed files with 59 additions and 18 deletions
+32 -7
View File
@@ -4,13 +4,19 @@ import styles from "./graph.css";
import {setupGraphElements, drawGraph} from "./drawGraph";
import SectionHeader from "../framework/sectionHeader";
import { connect } from "react-redux";
import ColorControl from "../controls/color";
@connect((state) => {
const vertices = state.cells.cells && state.cells.cells.data.graph ? state.cells.cells.data.graph : null;
const ranges = state.cells.cells && state.cells.cells.data.ranges ? state.cells.cells.data.ranges : null;
const metadata = state.cells.cells && state.cells.cells.data.metadata ? state.cells.cells.data.metadata : null;
return {
vertices
ranges,
vertices,
metadata,
color: state.controls.color,
}
})
class Graph extends React.Component {
@@ -21,11 +27,11 @@ class Graph extends React.Component {
drawn: false,
svg: null,
context: null,
shimmer: false,
};
}
componentWillReceiveProps(nextProps) {
console.log('le grpah', nextProps)
/* maybe should do a check here to confirm ref exists and pass it? */
if (
this.state.context &&
@@ -33,11 +39,29 @@ class Graph extends React.Component {
// nextProps.expressions &&
// nextProps.expressionsCountsMap &&
) {
drawGraph(
nextProps.vertices,
this.state.context,
nextProps.expressionsCountsMap
);
if (this.state.shimmer) {
if (this.state.interval) { window.clearInterval(this.state.interval) }
const interval = window.setInterval(() => {
drawGraph(
nextProps.vertices,
this.state.context,
nextProps.expressionsCountsMap,
nextProps.color,
nextProps.ranges, /* assumption that this exists if vertices does both are on cells */
nextProps.metadata,
)
}, 100)
this.setState({interval})
} else {
drawGraph(
nextProps.vertices,
this.state.context,
nextProps.expressionsCountsMap,
nextProps.color,
nextProps.ranges, /* assumption that this exists if vertices does both are on cells */
nextProps.metadata,
)
}
}
}
@@ -50,6 +74,7 @@ class Graph extends React.Component {
return (
<div id="graphWrapper">
<SectionHeader text="Graph"/>
<ColorControl/>
<div id="graphAttachPoint"> </div>
</div>
)