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.

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

5059 bug unable to see intervention in output chart for calibrate #5110

Merged
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bb2b5e3
show intervention marker on chart, improve label position
mloppie Oct 9, 2024
7b5e1b7
show intervention on calibrate node graph, improve label position
mloppie Oct 9, 2024
63ca70f
lint
mloppie Oct 9, 2024
fbf44cb
Merge branch 'main' into 5059-bug-unable-to-see-intervention-in-outpu…
mloppie Oct 9, 2024
8e4f4d5
Merge branch 'main' into 5059-bug-unable-to-see-intervention-in-outpu…
mloppie Oct 11, 2024
952fcd0
Merge branch 'main' into 5059-bug-unable-to-see-intervention-in-outpu…
mloppie Oct 16, 2024
364cd67
add intervention charts to calibrate dd
mloppie Oct 16, 2024
f1b56b8
Merge branch 'main' into 5059-bug-unable-to-see-intervention-in-outpu…
mloppie Oct 16, 2024
38dba26
Merge branch 'main' into 5059-bug-unable-to-see-intervention-in-outpu…
mloppie Oct 17, 2024
a14f149
partial
mloppie Oct 18, 2024
bc249fd
hope this is what youre looking for
Tom-Szendrey Oct 18, 2024
0aa4e20
add intervention chart marker
mloppie Oct 18, 2024
5cfbb7a
Merge branch 'main' into 5059-bug-unable-to-see-intervention-in-outpu…
mloppie Oct 18, 2024
bb78656
restore intervention marker on variable charts
mloppie Oct 21, 2024
c18835c
Merge branch 'main' into 5059-bug-unable-to-see-intervention-in-outpu…
mloppie Oct 21, 2024
d8eff7c
Update packages/client/hmi-client/src/components/workflow/ops/calibra…
mloppie Oct 21, 2024
f655a9c
chore: lint and format client codebase
github-actions[bot] Oct 21, 2024
c64c0ad
typo
mloppie Oct 21, 2024
b580df6
Merge branch '5059-bug-unable-to-see-intervention-in-output-chart-for…
mloppie Oct 21, 2024
a224055
add intervention charts to calibrate node
mloppie Oct 21, 2024
c43fe04
fix chart marker position on simulate node
mloppie Oct 21, 2024
acf022c
Merge branch 'main' into 5059-bug-unable-to-see-intervention-in-outpu…
mloppie Oct 22, 2024
48a845f
lint
mloppie Oct 22, 2024
3645a36
linter fixes
mwdchang Oct 22, 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
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,11 @@ const preparedCharts = computed(() => {
annotations
);

mloppie marked this conversation as resolved.
Show resolved Hide resolved
charts[variable].layer.push(...createInterventionChartMarkers(groupedInterventionOutputs.value[variable]));
mloppie marked this conversation as resolved.
Show resolved Hide resolved
Object.entries(groupedInterventionOutputs.value).forEach((item) => {
item[1].forEach((intervention) => {
charts[variable].layer.push(...createInterventionChartMarkers([intervention], false, -180));
});
});
});
mloppie marked this conversation as resolved.
Show resolved Hide resolved
return charts;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,11 @@ const preparedCharts = computed(() => {
}
);
applyForecastChartAnnotations(chart, annotations);
chart.layer.push(...createInterventionChartMarkers(groupedInterventionOutputs.value[variable]));

Object.entries(groupedInterventionOutputs.value).forEach((item) => {
item[1].forEach((intervention) => {
chart.layer.push(...createInterventionChartMarkers([intervention], false, -80));
YohannParis marked this conversation as resolved.
Show resolved Hide resolved
});
});
return chart;
});
});
Expand Down
5 changes: 3 additions & 2 deletions packages/client/hmi-client/src/services/charts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,8 @@ export function createSuccessCriteriaChart(

export function createInterventionChartMarkers(
data: ReturnType<typeof flattenInterventionData>,
hideLabels = false
hideLabels = false,
labelXOffset = 5
): any[] {
const markerSpec = {
data: { values: data },
Expand All @@ -749,7 +750,7 @@ export function createInterventionChartMarkers(
type: 'text',
align: 'left',
angle: 90,
dx: 5,
dx: labelXOffset,
dy: -10
YohannParis marked this conversation as resolved.
Show resolved Hide resolved
},
encoding: {
Expand Down