enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-12-19 00:51:34 +03:00
Code Issues Projects Releases Wiki Activity

Fix scatterplot and histogram fill colors. (https://github.com/enso-org/ide/pull/1437)

Browse Source 
Original commit: 2b609852d5
This commit is contained in:
Maciej Mikołajek 2021-04-04 13:00:36 +02:00 committed by GitHub
parent d7650b8fc0
commit 57e0539c99
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gui/src/rust/ide/view/graph-editor/src/builtin/visualization/java_script/histogram.js
View File

@ -15,8 +15,6 @@ const X_AXIS_LABEL_WIDTH = 10
const Y_AXIS_LABEL_WIDTH = 10
const ANIMATION_DURATION = 1000
const LINEAR_SCALE = 'linear'
const LIGHT_PLOT_COLOR = '#00E890'
const DARK_PLOT_COLOR = '#E0A63B'
const DEFAULT_NUMBER_OF_BINS = 50
const BUTTON_HEIGHT = 25
@ -516,11 +514,10 @@ class Histogram extends Visualization {
this.yAxis.call(yAxis)
let accentColor = LIGHT_PLOT_COLOR
if (document.getElementById('root').classList.contains('dark')) {
accentColor = DARK_PLOT_COLOR
}
const fill = d3
.scaleSequential()
.interpolator(d3.interpolateViridis)
.domain([0, d3.max(bins, d => d.x0)])
const items = this.plot.selectAll('rect').data(bins)
@ -531,7 +528,7 @@ class Histogram extends Visualization {
.attr('transform', d => 'translate(' + x(d.x0) + ',' + y(d.length) + ')')
.attr('width', d => x(d.x1) - x(d.x0))
.attr('height', d => this.canvas.inner.height - y(d.length))
.style('fill', accentColor)
.style('fill', d => fill(d.x0))
items.exit().remove()

5
gui/src/rust/ide/view/graph-editor/src/builtin/visualization/java_script/scatterPlot.js
View File

@ -455,6 +455,9 @@ class ScatterPlot extends Visualization {
let sizeScaleMultiplier = 100
let color = this.theme.get('accent')
let fillColor = `rgba(${color.red * 255},${color.green * 255},${color.blue * 255},0.8)`
scatter
.selectAll('dataPoint')
.data(dataPoints)
@ -468,7 +471,7 @@ class ScatterPlot extends Visualization {
'transform',
d => 'translate(' + scaleAndAxis.xScale(d.x) + ',' + scaleAndAxis.yScale(d.y) + ')'
)
.style('fill', d => d.color ?? '#00000080')
.style('fill', d => d.color ?? fillColor)
if (points.labels === VISIBLE_POINTS) {
scatter