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

add annotation option and a linear color map for heatmap viz. #3634

Merged
merged 3 commits into from
Oct 10, 2017
Merged

add annotation option and a linear color map for heatmap viz. #3634

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
219d147
add annotation option and a linear color map for heatmap viz.
xiaoyugit Oct 10, 2017
6308a6f
error fixes.
xiaoyugit Oct 10, 2017
d389884
fixes for requested changes
xiaoyugit Oct 10, 2017
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
9 changes: 9 additions & 0 deletions superset/assets/javascripts/explore/stores/controls.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ export const controls = {
['blue_white_yellow', 'blue/white/yellow'],
['white_black', 'white/black'],
['black_white', 'black/white'],
['dark_blue', 'light/dark blue'],
],
default: 'blue_white_yellow',
clearable: false,
Expand Down Expand Up @@ -1086,6 +1087,14 @@ export const controls = {
description: t('Whether to display the legend (toggles)'),
},

show_annotation: {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The term annotation is already used for other purposes, can we just call this show_values?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noted

type: 'CheckboxControl',
label: t('Annotation'),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Show Values

renderTrigger: true,
default: false,
description: t('Whether to display the annotation (toggles)'),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'Whether to display the numerical values within the cells'

},

x_axis_showminmax: {
type: 'CheckboxControl',
label: t('X bounds'),
Expand Down
1 change: 1 addition & 0 deletions superset/assets/javascripts/explore/stores/visTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,7 @@ export const visTypes = {
['left_margin', 'bottom_margin'],
['y_axis_bounds', 'y_axis_format'],
['show_legend', 'show_perc'],
['show_annotation'],
['sort_x_axis', 'sort_y_axis'],
],
},
Expand Down
7 changes: 7 additions & 0 deletions superset/assets/javascripts/modules/colors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@ export const spectrums = {
'black',
'white',
],
dark_blue: [
'#EBF5F8',
'#6BB1CC',
'#357E9B',
'#1B4150',
'#092935',
],
};

export const getColorFromScheme = (function () {
Expand Down
19 changes: 19 additions & 0 deletions superset/assets/visualizations/heatmap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,25 @@ function heatmapVis(slice, payload) {
.attr('height', height)
.style('position', 'relative');

if (fd.show_annotation) {
const cells = svg.selectAll('rect')
.data(data)
.enter()
.append('g')
.attr('transform', `translate(${margin.left}, ${margin.top})`);

cells.append('text')
.attr('transform',
function (d) { return 'translate(' + xRbScale(d.x) + ',' + yRbScale(d.y) + ')'; })
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

.attr('transform', d => `translate(${xRbScale(d.x}, ${yRbScale(d.y)})`

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thx! using => indeed makes it neater.

.attr('y', yRbScale.rangeBand() / 2)
.attr('x', xRbScale.rangeBand() / 2)
.attr('text-anchor', 'middle')
.attr('dy', '.35em')
.text(function (d) { return valueFormatter(d.v); })
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

.text(d => valueFormatter(d.v))

.attr('font-size', Math.min(yRbScale.rangeBand(), xRbScale.rangeBand()) / 3 + 'px')
.attr('fill', function (d) { return d.v >= payload.data.extents[1] / 2 ? 'white' : 'black'; });
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

arrow function here too

}

if (fd.show_legend) {
const legendScaler = colorScalerFactory(
fd.linear_color_scheme, null, null, payload.data.extents);
Expand Down