From f0e008eb6643ce6596b8ef772f67a273ef35ba24 Mon Sep 17 00:00:00 2001 From: Colin Megill Date: Wed, 13 Jun 2018 12:09:53 -0700 Subject: [PATCH] reinstitute color by continuous --- src/components/continuous/histogramBrush.js | 39 ++++++++++++++++++--- src/globals.js | 4 +-- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/src/components/continuous/histogramBrush.js b/src/components/continuous/histogramBrush.js index 1b67e687..17ab9cec 100644 --- a/src/components/continuous/histogramBrush.js +++ b/src/components/continuous/histogramBrush.js @@ -7,8 +7,11 @@ https://bl.ocks.org/SpaceActuary/2f004899ea1b2bd78d6f1dbb2febf771 import React from "react"; import _ from "lodash"; import { connect } from "react-redux"; +import FaPaintBrush from "react-icons/lib/fa/paint-brush"; +import * as globals from "../../globals"; @connect(state => { + console.log("state in histo brush", state) const ranges = state.cells.cells && state.cells.cells.data.ranges ? state.cells.cells.data.ranges @@ -26,7 +29,8 @@ import { connect } from "react-redux"; return { colorAccessor: state.controls.colorAccessor, colorScale: state.controls.colorScale, - cellsMetadata: state.controls.cellsMetadata + cellsMetadata: state.controls.cellsMetadata, + initializeRanges }; }) class HistogramBrush extends React.Component { @@ -154,7 +158,7 @@ class HistogramBrush extends React.Component { ) .call(d3.axisBottom(x).ticks(5)) .append("text") - .attr("x", 300) + .attr("x", this.width - 2) .attr("y", -6) .attr("fill", "#000") .attr("text-anchor", "end") @@ -164,13 +168,40 @@ class HistogramBrush extends React.Component { this.setState({ brush, xAxis }); } } - + handleColorAction() { + this.props.dispatch({ + type: "color by continuous metadata", + colorAccessor: this.props.metadataField, + rangeMaxForColorAccessor: this.props.initializeRanges[this.props.metadataField].range.max + }); + } render() { return (
+ + +