ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-10-31 07:55:06 +01:00
Code Issues Packages Releases Activity

add zoom in metric histograms for running and completed states

Browse Source 
- keeping last zoomstate doe snot work
This commit is contained in:
Christoph Kluge
2025-01-23 17:48:45 +01:00
parent 6683a350aa
commit a3e5c424fd
4 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
web/frontend/src/generic/plots/Histogram.svelte
View File

@@ -41,7 +41,7 @@
points: 2,
};
const binCounts = xtime ? [24, 48, 96, 144, 288, 720, 1440] : [10, 20, 50, 100, 200, 500, 1000];
const binCounts = xtime ? [24, 48, 96, 144, 288, 720, 1440] : [10, 20, 50, 100, 200]; // , 500, 1000
function formatTime(t) {
if (t !== null) {
@@ -142,7 +142,7 @@
(u) => {
if (zoomableHistogram) {
u.over.addEventListener("dblclick", (e) => {
// console.log('Dispatch Reset')
console.log('Dispatch Reset')
dispatch('zoom', {
lastZoomState: {
x: { time: false },
@@ -159,17 +159,17 @@
if (zoomableHistogram) {
const numX = (u.series[0].idxs[1] - u.series[0].idxs[0])
if (xtime && numX <= 12 && lastBinCount !== 1440) {
console.log("Dispatch for Duration: ", numX, lastBinCount, binCounts[binCounts.indexOf(lastBinCount) + 1])
// console.log("Dispatch for Duration: ", numX, lastBinCount, binCounts[binCounts.indexOf(lastBinCount) + 1])
dispatch('zoom', {
durationBinCount: binCounts[binCounts.indexOf(lastBinCount) + 1],
lastZoomState: u?.scales,
});
} else if (!xtime && numX <= 5 && lastBinCount !== 1000) {
} else if (!xtime && numX <= 6 && lastBinCount !== 200) {
// console.log("Dispatch for Metrics: ", numX, lastBinCount, binCounts[binCounts.indexOf(lastBinCount) + 1])
// dispatch('zoom', {
// metricBinCount: binCounts[binCounts.indexOf(lastBinCount) + 1],
// lastZoomState: u?.scales,
// });
dispatch('zoom', {
metricBinCount: binCounts[binCounts.indexOf(lastBinCount) + 1],
lastZoomState: u?.scales,
});
};
}
};
@@ -212,7 +212,6 @@
stroke: "#000000",
},
values: (_, t) => t.map((v) => {
// if (!usesBins) console.log("X Scale Val", xlabel, v)
if (xtime) {
return formatTime(v);
} else {
@@ -236,7 +235,6 @@
stroke: "#000000",
},
values: (_, t) => t.map((v) => {
// if (!usesBins) console.log("Y Scale Val", ylabel, v)
return formatNumber(v)
}),
},
@@ -275,6 +273,7 @@
};
if (zoomableHistogram && zoomState) {
console.log("Apply ZoomState ...", zoomState)
opts.scales = {...zoomState}
}

2
web/frontend/src/generic/utils.js
View File

@@ -413,7 +413,7 @@ export function convert2uplot(canvasData, secondsToMinutes = false, secondsToHou
canvasData.forEach( cd => {
if (Object.keys(cd).length == 4) { // MetricHisto Datafromat
uplotData[0].push(cd?.max ? cd.max : 0)
uplotData[1].push(cd.count)
uplotData[1].push(cd?.count ? cd.count : 0)
} else { // Default -> Fill Histodata with zero values on unused value placing -> maybe allows zoom trigger as known
if (secondsToHours) {
let hours = cd.value / 3600