feat: change to resolution increase on zoom

This commit is contained in:
Christoph Kluge
2024-09-02 18:22:34 +02:00
parent 54f3a261c5
commit 7602641909
3 changed files with 90 additions and 41 deletions

View File

@@ -32,12 +32,14 @@
? ["core", "accelerator"]
: ["core"]
: ["node"];
let selectedResolution = 600;
let zoomStates = {};
const cluster = getContext("clusters").find((c) => c.name == job.cluster);
const client = getContextClient();
const query = gql`
query ($id: ID!, $metrics: [String!]!, $scopes: [MetricScope!]!) {
jobMetrics(id: $id, metrics: $metrics, scopes: $scopes) {
query ($id: ID!, $metrics: [String!]!, $scopes: [MetricScope!]!, $selectedResolution: Int) {
jobMetrics(id: $id, metrics: $metrics, scopes: $scopes, resolution: $selectedResolution) {
name
scope
metric {
@@ -66,17 +68,30 @@
}
`;
function handleZoom(detail, metric) {
if (
(zoomStates[metric]?.x?.min !== detail?.lastZoomState?.x?.min) &&
(zoomStates[metric]?.y?.max !== detail?.lastZoomState?.y?.max)
) {
zoomStates[metric] = {...detail.lastZoomState}
}
if (detail?.newRes) { // Triggers GQL
selectedResolution = detail.newRes
}
}
$: metricsQuery = queryStore({
client: client,
query: query,
variables: { id, metrics, scopes },
variables: { id, metrics, scopes, selectedResolution },
});
function refreshMetrics() {
metricsQuery = queryStore({
client: client,
query: query,
variables: { id, metrics, scopes },
variables: { id, metrics, scopes, selectedResolution },
// requestPolicy: 'network-only' // use default cache-first for refresh
});
}
@@ -159,10 +174,7 @@
<!-- Subluster Metricconfig remove keyword for jobtables (joblist main, user joblist, project joblist) to be used here as toplevel case-->
{#if metric.disabled == false && metric.data}
<MetricPlot
on:zoom-in={({ detail }) => {
// filterComponent.updateFilters(detail)
console.log("Upstream New Res:", detail)
}}
on:zoom={({detail}) => { handleZoom(detail, metric.data.name) }}
width={plotWidth}
height={plotHeight}
timestep={metric.data.metric.timestep}
@@ -175,6 +187,7 @@
isShared={job.exclusive != 1}
numhwthreads={job.numHWThreads}
numaccs={job.numAcc}
zoomState={zoomStates[metric.data.name]}
/>
{:else if metric.disabled == true && metric.data}
<Card body color="info"

View File

@@ -129,6 +129,9 @@
export let forNode = false;
export let numhwthreads = 0;
export let numaccs = 0;
export let zoomState = null;
// $: console.log('Changed ZoomState for', metric, zoomState)
if (useStatsSeries == null) useStatsSeries = statisticsSeries != null;
@@ -393,6 +396,19 @@
bands: plotBands,
padding: [5, 10, -20, 0],
hooks: {
init: [
(u) => {
u.over.addEventListener("dblclick", (e) => {
console.log('Dispatch Reset')
dispatch('zoom', {
lastZoomState: {
x: { time: false },
y: { auto: true }
}
});
});
}
],
draw: [
(u) => {
// Draw plot type label:
@@ -437,17 +453,26 @@
setScale: [
(u, key) => {
if (key === 'x') {
// Start
console.log('setScale X', key);
// Decide which resolution to request
// Dispatch request
const res = 1337;
dispatch('zoom-in', {
newres: res,
});
const numX = (u.series[0].idxs[1] - u.series[0].idxs[0])
if (numX <= 20 && timestep !== 60) { // Zoom IN if not at MAX
console.log('Dispatch Zoom')
if (timestep == 600) {
dispatch('zoom', {
newRes: 240,
lastZoomState: u?.scales
});
} else if (timestep === 240) {
dispatch('zoom', {
newRes: 60,
lastZoomState: u?.scales
});
}
} else {
console.log('Dispatch Update')
dispatch('zoom', {
lastZoomState: u?.scales
});
}
};
}
]
@@ -481,6 +506,10 @@
if (!uplot) {
opts.width = width;
opts.height = height;
if (zoomState) {
// console.log('Use last state for uPlot init:', metric, scope, zoomState)
opts.scales = {...zoomState}
}
uplot = new uPlot(opts, plotData, plotWrapper);
} else {
uplot.setSize({ width, height });
@@ -489,7 +518,6 @@
function onSizeChange() {
if (!uplot) return;
if (timeoutId != null) clearTimeout(timeoutId);
timeoutId = setTimeout(() => {