mirror of
https://github.com/chanzuckerberg/cellxgene.git
synced 2026-09-24 21:38:13 +08:00
Prettier
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
// jshint esversion: 6
|
||||
import styles from "./graph.css";
|
||||
import renderQueue from "../../util/renderQueue";
|
||||
import _ from "lodash";
|
||||
@@ -13,7 +14,6 @@ export const setupGraphElements = (
|
||||
handleBrushSelectAction,
|
||||
handleBrushDeselectAction
|
||||
) => {
|
||||
|
||||
// var canvas = d3.select("#graphAttachPoint")
|
||||
// .append("canvas")
|
||||
// .attr("width", globals.graphWidth)
|
||||
@@ -22,25 +22,22 @@ export const setupGraphElements = (
|
||||
|
||||
// var ctx = canvas.node().getContext("2d");
|
||||
|
||||
var svg = d3.select("#graphAttachPoint").append("svg")
|
||||
var svg = d3
|
||||
.select("#graphAttachPoint")
|
||||
.append("svg")
|
||||
.attr("width", globals.graphWidth)
|
||||
.attr("height", globals.graphHeight)
|
||||
.attr("class", `${styles.graphSVG}`)
|
||||
// .append("g")
|
||||
// .attr("transform", "translate(" + margin.left + " " + margin.top + ")");
|
||||
.attr("class", `${styles.graphSVG}`);
|
||||
// .append("g")
|
||||
// .attr("transform", "translate(" + margin.left + " " + margin.top + ")");
|
||||
|
||||
setupGraphBrush(
|
||||
svg,
|
||||
handleBrushSelectAction,
|
||||
handleBrushDeselectAction
|
||||
);
|
||||
setupGraphBrush(svg, handleBrushSelectAction, handleBrushDeselectAction);
|
||||
|
||||
return {
|
||||
svg,
|
||||
svg
|
||||
// ctx
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
/******************************************
|
||||
*******************************************
|
||||
@@ -57,36 +54,34 @@ const drawGraph = (
|
||||
currentCellSelection,
|
||||
graphBrushSelection,
|
||||
colorScale,
|
||||
graphMap, /* tmp remove when structure exists on server */
|
||||
graphMap /* tmp remove when structure exists on server */,
|
||||
opacityForDeselectedCells,
|
||||
_currentCellSelectionMap,
|
||||
_currentCellSelectionMap
|
||||
) => {
|
||||
return (p) => {
|
||||
|
||||
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.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__"]
|
||||
context.fillStyle = _currentCellSelectionMap[p[0]]["__color__"];
|
||||
|
||||
if (_currentCellSelectionMap[p[0]]["__selected__"]) {
|
||||
context.globalAlpha = 1;
|
||||
} else {
|
||||
context.globalAlpha = opacityForDeselectedCells;
|
||||
}
|
||||
if (_currentCellSelectionMap[p[0]]["__selected__"]) {
|
||||
context.globalAlpha = 1;
|
||||
} else {
|
||||
context.globalAlpha = opacityForDeselectedCells;
|
||||
}
|
||||
|
||||
context.fill();
|
||||
|
||||
}
|
||||
}
|
||||
context.fill();
|
||||
};
|
||||
};
|
||||
|
||||
const _drawGraphUsingRenderQueue = (
|
||||
context,
|
||||
@@ -97,22 +92,26 @@ const _drawGraphUsingRenderQueue = (
|
||||
currentCellSelection,
|
||||
graphBrushSelection,
|
||||
colorScale,
|
||||
graphMap, /* tmp remove when structure exists on server */
|
||||
opacityForDeselectedCells,
|
||||
graphMap /* tmp remove when structure exists on server */,
|
||||
opacityForDeselectedCells
|
||||
) => {
|
||||
const _currentCellSelectionMap = _.keyBy(currentCellSelection, "CellName"); /* move me to the reducer */
|
||||
const _currentCellSelectionMap = _.keyBy(
|
||||
currentCellSelection,
|
||||
"CellName"
|
||||
); /* move me to the reducer */
|
||||
|
||||
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 */
|
||||
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 */
|
||||
dataForGraph.push([
|
||||
cell["CellName"],
|
||||
graphMap[cell["CellName"]][0],
|
||||
graphMap[cell["CellName"]][1]
|
||||
])
|
||||
]);
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
/* clear canvas */
|
||||
context.clearRect(0, 0, globals.graphWidth, globals.graphHeight);
|
||||
@@ -127,30 +126,30 @@ const _drawGraphUsingRenderQueue = (
|
||||
currentCellSelection,
|
||||
graphBrushSelection,
|
||||
colorScale,
|
||||
graphMap, /* tmp remove when structure exists on server */
|
||||
graphMap /* tmp remove when structure exists on server */,
|
||||
opacityForDeselectedCells,
|
||||
_currentCellSelectionMap,
|
||||
_currentCellSelectionMap
|
||||
)
|
||||
)
|
||||
);
|
||||
_renderGraphWithFunctionReturnedByQueue(dataForGraph);
|
||||
return _renderGraphWithFunctionReturnedByQueue;
|
||||
}
|
||||
};
|
||||
|
||||
export const drawGraphUsingRenderQueue = _.debounce(_drawGraphUsingRenderQueue, 100);
|
||||
export const drawGraphUsingRenderQueue = _.debounce(
|
||||
_drawGraphUsingRenderQueue,
|
||||
100
|
||||
);
|
||||
|
||||
const setupGraphBrush = (
|
||||
svg,
|
||||
handleBrushSelectAction,
|
||||
handleBrushDeselectAction
|
||||
) => {
|
||||
svg.append("g")
|
||||
.call(
|
||||
d3.brush()
|
||||
.extent([
|
||||
[0, 0],
|
||||
[globals.graphWidth, globals.graphHeight]
|
||||
])
|
||||
.on("brush", handleBrushSelectAction)
|
||||
.on("end", handleBrushDeselectAction)
|
||||
);
|
||||
}
|
||||
svg.append("g").call(
|
||||
d3
|
||||
.brush()
|
||||
.extent([[0, 0], [globals.graphWidth, globals.graphHeight]])
|
||||
.on("brush", handleBrushSelectAction)
|
||||
.on("end", handleBrushDeselectAction)
|
||||
);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user