Skip to content

Fix heatmap gaps and ticket alignment #4838

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

Merged
merged 4 commits into from
Nov 29, 2024
Merged

Fix heatmap gaps and ticket alignment #4838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
136e1c6
fix apexcharts#4809 heatmap: align different ticks and gaps in timese…
dschweinbenz Nov 28, 2024
39bf7d7
fix apexcharts#4809 added comments
dschweinbenz Nov 28, 2024
6dcaadb
fix apexcharts#4809 reverted empty line
dschweinbenz Nov 28, 2024
ae9b24c
fix apexcharts#4809 heatmap: added example
dschweinbenz Nov 29, 2024
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
115 changes: 115 additions & 0 deletions samples/vanilla-js/heatmap/inconsistent-timeseries.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>HeatMap with inconsistent timeseries</title>

<link href="../../assets/styles.css" rel="stylesheet" />

<style>
#chart {
max-width: 650px;
margin: 35px auto;
}
</style>

<script>
window.Promise ||
document.write(
'<script src="https://cdn.jsdelivr.net/npm/promise-polyfill@8/dist/polyfill.min.js"><\/script>'
)
window.Promise ||
document.write(
'<script src="https://cdn.jsdelivr.net/npm/eligrey-classlist-js-polyfill@1.2.20171210/classList.min.js"><\/script>'
)
window.Promise ||
document.write(
'<script src="https://cdn.jsdelivr.net/npm/findindex_polyfill_mdn"><\/script>'
)
</script>

<script src="../../../dist/apexcharts.js"></script>
</head>

<body>
<div id="chart"></div>

<script>
const end = new Date("2024-11-29T10:00:00.000Z").getTime();
const start = end - 12 * 60 * 60 * 1000;

const timeSeries = () => {
let series = [];
for (let i = start; i < end; i += 30 * 60 * 1000) {
series.push({
x: (new Date(i).getTime()),
y: Math.floor(Math.random() * 100).toFixed(0),
});
}
return series;
};
let data1 = timeSeries()
data1.splice(0,10)
data1.splice(3,2)
const data2 = timeSeries()
data2.splice(data2.length - 10,10);
const data3 = timeSeries()
let data = [
{
name: "Series 1",
data: data1,
},
{
name: "Series 2",
data: data2,
},
{
name: "Series 3",
data: data3,
},
];

var options = {
chart: {
height: 200,
width: 630,
type: "heatmap"
},
tooltip: {
x: { show: true, format: 'MMM dd HH:mm' },
},
xaxis: {
labels: {
datetimeFormatter: {
year: 'yyyy',
month: 'yyyy MMM',
day: 'MMM dd',
hour: 'HH:mm',
},
},
type: 'datetime'
},
plotOptions: {
heatmap: {
colorScale: {
ranges: [
{
from: 0,
to: 100,
name: 'orange',
color: '#FFB200'
}]
}
}
},
series: data,
};

var chart = new ApexCharts(document.querySelector("#chart"), options);

chart.render();
</script>
</body>
</html>
15 changes: 13 additions & 2 deletions src/charts/HeatMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,18 @@ export default class HeatMap {
let x1 = 0
let shadeIntensity = w.config.plotOptions.heatmap.shadeIntensity

for (let j = 0; j < heatSeries[i].length; j++) {
let j = 0;
for (let dIndex = 0; dIndex < w.globals.dataPoints; dIndex++) {

// Recognize gaps and align values based on x axis
if ((w.globals.minX + (w.globals.minXDiff * dIndex)) < w.globals.seriesX[i][j]) {
x1 = x1 + xDivision;
continue;
}

// Stop loop if index is out of array length
if (j >= heatSeries[i].length) break;

let heatColor = this.helpers.getShadeColor(
w.config.chart.type,
i,
Expand Down Expand Up @@ -114,7 +125,6 @@ export default class HeatMap {
cx: x1,
cy: y1,
})

rect.node.classList.add('apexcharts-heatmap-rect')
elSeries.add(rect)

Expand Down Expand Up @@ -186,6 +196,7 @@ export default class HeatMap {
}

x1 = x1 + xDivision
j++;
}

y1 = y1 + yDivision
Expand Down