fork/cellxgene
1
0
Fork 0
mirror of https://github.com/chanzuckerberg/cellxgene.git synced 2026-10-06 16:58:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

clamp brush selection range to data range (#1423)

Browse Source
This commit is contained in:
Bruce Martin
2020-04-24 09:24:01 -07:00
committed by GitHub
parent 735eb11eb7
commit d31b7dc797
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/brushableHistogram/index.js
+22 -17
View File
@@ -16,6 +16,10 @@ import actions from "../../actions";
import { histogramContinuous } from "../../util/dataframe/histogram"; import { histogramContinuous } from "../../util/dataframe/histogram";
import { makeContinuousDimensionName } from "../../util/nameCreators"; import { makeContinuousDimensionName } from "../../util/nameCreators";
function clamp(val, rng) {
return Math.max(Math.min(val, rng[1]), rng[0]);
}
@connect((state, ownProps) => { @connect((state, ownProps) => {
const { isObs, isUserDefined, isDiffExp, field } = ownProps; const { isObs, isUserDefined, isDiffExp, field } = ownProps;
const myName = makeContinuousDimensionName( const myName = makeContinuousDimensionName(
@@ -139,24 +143,25 @@ class HistogramBrush extends React.PureComponent {
if (!range && selection) { if (!range && selection) {
/* no active selection - clear brush */ /* no active selection - clear brush */
brushXselection.call(brushX.move, null); brushXselection.call(brushX.move, null);
} else if (range && !selection) { } else if (range) {
/* there is an active selection, but no brush - set the brush */ const { min, max } = dfColumn.summarize();
const x0 = x(range[0]); const x0 = x(clamp(range[0], [min, max]));
const x1 = x(range[1]); const x1 = x(clamp(range[1], [min, max]));
brushXselection.call(brushX.move, [x0, x1]); if (!selection) {
} else if (range && selection) { /* there is an active selection, but no brush - set the brush */
/* there is an active selection and a brush - make sure they match */
const moveDeltaThreshold = 1;
const x0 = x(range[0]);
const x1 = x(range[1]);
const dX0 = Math.abs(x0 - selection[0]);
const dX1 = Math.abs(x1 - selection[1]);
/*
only update the brush if it is grossly incorrect,
as defined by the moveDeltaThreshold
*/
if (dX0 > moveDeltaThreshold || dX1 > moveDeltaThreshold) {
brushXselection.call(brushX.move, [x0, x1]); brushXselection.call(brushX.move, [x0, x1]);
} else {
/* there is an active selection and a brush - make sure they match */
const moveDeltaThreshold = 1;
const dX0 = Math.abs(x0 - selection[0]);
const dX1 = Math.abs(x1 - selection[1]);
/*
only update the brush if it is grossly incorrect,
as defined by the moveDeltaThreshold
*/
if (dX0 > moveDeltaThreshold || dX1 > moveDeltaThreshold) {
brushXselection.call(brushX.move, [x0, x1]);
}
} }
} }
} }