mirror of
https://github.com/chanzuckerberg/cellxgene.git
synced 2026-09-24 19:38:12 +08:00
remove dead code and lint (#310)
remove dead code from client/src/frameworks delint various files
This commit is contained in:
@@ -6,34 +6,33 @@ import { interpolateViridis } from "d3-scale-chromatic";
|
||||
|
||||
// create continuous color legend
|
||||
// http://bl.ocks.org/syntagmatic/e8ccca52559796be775553b467593a9f
|
||||
const continuous = (selector_id, colorscale) => {
|
||||
const continuous = (selectorId, colorscale) => {
|
||||
const legendheight = 200;
|
||||
const legendwidth = 80;
|
||||
const margin = { top: 10, right: 60, bottom: 10, left: 2 };
|
||||
|
||||
const canvas = d3
|
||||
.select(selector_id)
|
||||
.style("height", legendheight + "px")
|
||||
.style("width", legendwidth + "px")
|
||||
// .style("position", "relative")
|
||||
.select(selectorId)
|
||||
.style("height", `${legendheight}px`)
|
||||
.style("width", `${legendwidth}px`)
|
||||
.append("canvas")
|
||||
.attr("height", legendheight - margin.top - margin.bottom)
|
||||
.attr("width", 1)
|
||||
.style("height", legendheight - margin.top - margin.bottom + "px")
|
||||
.style("width", legendwidth - margin.left - margin.right + "px")
|
||||
// .style("border", "1px solid #000")
|
||||
.style("height", `${legendheight - margin.top - margin.bottom}px`)
|
||||
.style("width", `${legendwidth - margin.left - margin.right}px`)
|
||||
.style("position", "absolute")
|
||||
.style("top", margin.top + 1 + "px")
|
||||
.style("left", margin.left + 1 + "px")
|
||||
.style("top", `${margin.top + 1}px`)
|
||||
.style("left", `${margin.left + 1}px`)
|
||||
.style(
|
||||
"transform",
|
||||
"scale(1,-1)"
|
||||
) /* flip it! dark is high value light is low. we flip the color scale as well [1, 0] instead of [0, 1] */
|
||||
) /* flip it! dark is high value light is low.
|
||||
we flip the color scale as well [1, 0] instead of [0, 1] */
|
||||
.node();
|
||||
|
||||
var ctx = canvas.getContext("2d");
|
||||
const ctx = canvas.getContext("2d");
|
||||
|
||||
var legendscale = d3
|
||||
const legendscale = d3
|
||||
.scaleLinear()
|
||||
.range([1, legendheight - margin.top - margin.bottom])
|
||||
.domain([
|
||||
@@ -42,9 +41,9 @@ const continuous = (selector_id, colorscale) => {
|
||||
]); /* we flip this to make viridis colors dark if high in the color scale */
|
||||
|
||||
// image data hackery based on http://bl.ocks.org/mbostock/048d21cf747371b11884f75ad896e5a5
|
||||
var image = ctx.createImageData(1, legendheight);
|
||||
d3.range(legendheight).forEach(function(i) {
|
||||
var c = d3.rgb(colorscale(legendscale.invert(i)));
|
||||
const image = ctx.createImageData(1, legendheight);
|
||||
d3.range(legendheight).forEach(i => {
|
||||
const c = d3.rgb(colorscale(legendscale.invert(i)));
|
||||
image.data[4 * i] = c.r;
|
||||
image.data[4 * i + 1] = c.g;
|
||||
image.data[4 * i + 2] = c.b;
|
||||
@@ -52,7 +51,8 @@ const continuous = (selector_id, colorscale) => {
|
||||
});
|
||||
ctx.putImageData(image, 0, 0);
|
||||
|
||||
// A simpler way to do the above, but possibly slower. keep in mind the legend width is stretched because the width attr of the canvas is 1
|
||||
// A simpler way to do the above, but possibly slower. keep in mind the legend
|
||||
// width is stretched because the width attr of the canvas is 1
|
||||
// See http://stackoverflow.com/questions/4899799/whats-the-best-way-to-set-a-single-pixel-in-an-html5-canvas
|
||||
/*
|
||||
d3.range(legendheight).forEach(function(i) {
|
||||
@@ -61,17 +61,17 @@ const continuous = (selector_id, colorscale) => {
|
||||
});
|
||||
*/
|
||||
|
||||
var legendaxis = d3
|
||||
const legendaxis = d3
|
||||
.axisRight()
|
||||
.scale(legendscale)
|
||||
.tickSize(6)
|
||||
.ticks(8);
|
||||
|
||||
var svg = d3
|
||||
.select(selector_id)
|
||||
const svg = d3
|
||||
.select(selectorId)
|
||||
.append("svg")
|
||||
.attr("height", legendheight + "px")
|
||||
.attr("width", legendwidth + "px")
|
||||
.attr("height", `${legendheight}px`)
|
||||
.attr("width", `${legendwidth}px`)
|
||||
.style("position", "absolute")
|
||||
.style("left", "0px")
|
||||
.style("top", "0px");
|
||||
@@ -81,22 +81,16 @@ const continuous = (selector_id, colorscale) => {
|
||||
.attr("class", "axis")
|
||||
.attr(
|
||||
"transform",
|
||||
"translate(" +
|
||||
(legendwidth - margin.left - margin.right + 3) +
|
||||
"," +
|
||||
margin.top +
|
||||
")"
|
||||
`translate(${legendwidth - margin.left - margin.right + 3},${margin.top})`
|
||||
)
|
||||
.call(legendaxis);
|
||||
};
|
||||
|
||||
@connect(state => {
|
||||
return {
|
||||
colorAccessor: state.controls.colorAccessor,
|
||||
colorScale: state.controls.colorScale,
|
||||
responsive: state.responsive
|
||||
};
|
||||
})
|
||||
@connect(state => ({
|
||||
colorAccessor: state.controls.colorAccessor,
|
||||
colorScale: state.controls.colorScale,
|
||||
responsive: state.responsive
|
||||
}))
|
||||
class ContinuousLegend extends React.Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
@@ -104,10 +98,11 @@ class ContinuousLegend extends React.Component {
|
||||
}
|
||||
|
||||
componentDidUpdate(prevProps) {
|
||||
const { colorAccessor, responsive, colorScale } = this.props;
|
||||
if (
|
||||
prevProps.colorAccessor !== this.props.colorAccessor ||
|
||||
prevProps.responsive.height !== this.props.responsive.height ||
|
||||
prevProps.responsive.width !== this.props.responsive.width
|
||||
prevProps.colorAccessor !== colorAccessor ||
|
||||
prevProps.responsive.height !== responsive.height ||
|
||||
prevProps.responsive.width !== responsive.width
|
||||
) {
|
||||
/* always remove it, if it's not continuous we don't put it back. */
|
||||
d3.select("#continuous_legend")
|
||||
@@ -115,30 +110,27 @@ class ContinuousLegend extends React.Component {
|
||||
.remove();
|
||||
}
|
||||
|
||||
if (this.props.colorAccessor && this.props.colorScale) {
|
||||
if (colorAccessor && colorScale) {
|
||||
/* fragile! continuous range is 0 to 1, not [#fa4b2c, ...], make this a flag? */
|
||||
if (this.props.colorScale.range()[0][0] !== "#") {
|
||||
if (colorScale.range()[0][0] !== "#") {
|
||||
continuous(
|
||||
"#continuous_legend",
|
||||
d3
|
||||
.scaleSequential(interpolateViridis)
|
||||
.domain(this.props.colorScale.domain())
|
||||
d3.scaleSequential(interpolateViridis).domain(colorScale.domain())
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
drawScale() {}
|
||||
|
||||
render() {
|
||||
const { colorAccessor, responsive } = this.props;
|
||||
return (
|
||||
<div
|
||||
id="continuous_legend"
|
||||
style={{
|
||||
position: "fixed",
|
||||
display: this.props.colorAccessor ? "inherit" : "none",
|
||||
display: colorAccessor ? "inherit" : "none",
|
||||
right: 0,
|
||||
top: this.props.responsive.height / 2
|
||||
top: responsive.height / 2
|
||||
}}
|
||||
/>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user