reinstitute color by continuous

This commit is contained in:
Colin Megill
2018-06-13 12:09:53 -07:00
parent 2fb086b5ad
commit f0e008eb66
2 changed files with 37 additions and 6 deletions
+35 -4
View File
@@ -7,8 +7,11 @@ https://bl.ocks.org/SpaceActuary/2f004899ea1b2bd78d6f1dbb2febf771
import React from "react"; import React from "react";
import _ from "lodash"; import _ from "lodash";
import { connect } from "react-redux"; import { connect } from "react-redux";
import FaPaintBrush from "react-icons/lib/fa/paint-brush";
import * as globals from "../../globals";
@connect(state => { @connect(state => {
console.log("state in histo brush", state)
const ranges = const ranges =
state.cells.cells && state.cells.cells.data.ranges state.cells.cells && state.cells.cells.data.ranges
? state.cells.cells.data.ranges ? state.cells.cells.data.ranges
@@ -26,7 +29,8 @@ import { connect } from "react-redux";
return { return {
colorAccessor: state.controls.colorAccessor, colorAccessor: state.controls.colorAccessor,
colorScale: state.controls.colorScale, colorScale: state.controls.colorScale,
cellsMetadata: state.controls.cellsMetadata cellsMetadata: state.controls.cellsMetadata,
initializeRanges
}; };
}) })
class HistogramBrush extends React.Component { class HistogramBrush extends React.Component {
@@ -154,7 +158,7 @@ class HistogramBrush extends React.Component {
) )
.call(d3.axisBottom(x).ticks(5)) .call(d3.axisBottom(x).ticks(5))
.append("text") .append("text")
.attr("x", 300) .attr("x", this.width - 2)
.attr("y", -6) .attr("y", -6)
.attr("fill", "#000") .attr("fill", "#000")
.attr("text-anchor", "end") .attr("text-anchor", "end")
@@ -164,13 +168,40 @@ class HistogramBrush extends React.Component {
this.setState({ brush, xAxis }); 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() { render() {
return ( return (
<div <div
style={{ marginTop: 10 }} style={{ marginTop: 10, position: "relative" }}
id={"histogram_" + this.props.metadataField} id={"histogram_" + this.props.metadataField}
> >
<span
onClick={this.handleColorAction.bind(this)}
style={{
fontSize: 16,
marginLeft: 4,
// padding: this.props.colorAccessor === this.props.metadataField ? 3 : "auto",
borderRadius: 3,
color:
this.props.colorAccessor === this.props.metadataField
? globals.brightBlue
: "black",
// backgroundColor: this.props.colorAccessor === this.props.metadataField ? globals.brightBlue : "inherit",
display: "inline-block",
position: "relative",
left: this.width,
top: this.height - 22,
cursor: "pointer"
}}
>
<FaPaintBrush />
</span>
<svg <svg
width={this.width} width={this.width}
height={this.height} height={this.height}
+2 -2
View File
@@ -48,10 +48,10 @@ export const bolder = 700;
export let API = { export let API = {
// prefix: "http://api.clustering.czi.technology/api/", // prefix: "http://api.clustering.czi.technology/api/",
//prefix: "http://tabulamuris.cxg.czi.technology/api/", //prefix: "http://tabulamuris.cxg.czi.technology/api/",
prefix: "http://pbmc3k.cxg.czi.technology/api/", // prefix: "http://pbmc3k.cxg.czi.technology/api/",
// prefix: "http://pbmc33k.cxg.czi.technology/api/", // prefix: "http://pbmc33k.cxg.czi.technology/api/",
// prefix: "http://api-staging.clustering.czi.technology/api/", prefix: "http://api-staging.clustering.czi.technology/api/",
version: "v0.1/" version: "v0.1/"
}; };