Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changing colormap range #1696

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

changing colormap range #1696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a91d96e
changing colormap range
moontrip Mar 21, 2023
07b8266
Merge branch 'main' into continuous-overlay-range
moontrip Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/lib/core/api/DataClient/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ export const ScatterplotResponseData = array(
// changed to string array
seriesX: array(string),
seriesY: array(string),
seriesGradientColorscale: array(string),
smoothedMeanX: array(string),
smoothedMeanY: array(number),
smoothedMeanSE: array(number),
Expand Down
79 changes: 49 additions & 30 deletions src/lib/core/components/visualizations/implementations/ScatterplotVisualization.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,39 +625,60 @@ function ScatterplotViz(props: VisualizationProps<Options>) {
(overlayVariable?.type === 'integer' ||
overlayVariable?.type === 'number')
) {
const defaultOverlayMin: number =
overlayVariable.distributionDefaults.displayRangeMin ||
overlayVariable.distributionDefaults.displayRangeMin === 0
? overlayVariable.distributionDefaults.displayRangeMin
// find data-based Min/Max for seriesGradientColorscale
const zMin = min(
response.scatterplot.data.map((series) =>
min(series.seriesGradientColorscale?.map(Number))
)
);
const zMax = max(
response.scatterplot.data.map((series) =>
max(series.seriesGradientColorscale?.map(Number))
)
);

// considering filters
overlayMin =
filters != null && filters.length > 0
? overlayVariable.distributionDefaults.displayRangeMin != null &&
zMin != null
? Math.min(
overlayVariable.distributionDefaults.displayRangeMin,
zMin
)
: zMin
: overlayVariable.distributionDefaults.displayRangeMin != null
? Math.min(
overlayVariable.distributionDefaults.displayRangeMin,
overlayVariable.distributionDefaults.rangeMin
)
: overlayVariable.distributionDefaults.rangeMin;

const defaultOverlayMax: number = overlayVariable.distributionDefaults
.displayRangeMax
? overlayVariable.distributionDefaults.displayRangeMax
: overlayVariable.distributionDefaults.rangeMax;
overlayMax =
filters != null && filters.length > 0
? overlayVariable.distributionDefaults.displayRangeMax != null &&
zMax != null
? Math.max(
overlayVariable.distributionDefaults.displayRangeMax,
zMax
)
: zMax
: overlayVariable.distributionDefaults.displayRangeMax != null
? Math.max(
overlayVariable.distributionDefaults.displayRangeMax,
overlayVariable.distributionDefaults.rangeMax
)
: overlayVariable.distributionDefaults.rangeMax;

// Note overlayMin and/or overlayMax could be intentionally 0.
gradientColorscaleType =
defaultOverlayMin >= 0 && defaultOverlayMax >= 0
? 'sequential'
: defaultOverlayMin <= 0 && defaultOverlayMax <= 0
? 'sequential reversed'
: 'divergent';

// Update overlay min and max
if (gradientColorscaleType === 'divergent') {
overlayMin = -Math.max(
Math.abs(defaultOverlayMin),
Math.abs(defaultOverlayMax)
);
overlayMax = Math.max(
Math.abs(defaultOverlayMin),
Math.abs(defaultOverlayMax)
);
} else {
overlayMin = defaultOverlayMin;
overlayMax = defaultOverlayMax;
}
overlayMin != null && overlayMax != null
? overlayMin >= 0 && overlayMax >= 0
? 'sequential'
: overlayMin <= 0 && overlayMax <= 0
? 'sequential reversed'
: 'divergent'
: undefined;
}

const overlayVocabulary = computedOverlayVariableDescriptor
Expand Down Expand Up @@ -2643,8 +2664,6 @@ function processInputData<T extends number | string>(

return {
dataSetProcess: { series: dataSetProcess },
overlayMin,
overlayMax,
gradientColorscaleType,
xMin,
xMinPos,
Expand Down