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.

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

Jump to bottom

Funman output charts #4923

Merged
merged 33 commits into from
Oct 2, 2024
Merged

Funman output charts #4923

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
c41e9e1
test output
shawnyama Sep 25, 2024
97927ec
accordions
shawnyama Sep 25, 2024
b0fd3f5
s
shawnyama Sep 25, 2024
060e376
plot
shawnyama Sep 27, 2024
d7f8c53
organize chart func
shawnyama Sep 27, 2024
a742131
split param charts
shawnyama Sep 30, 2024
347b381
render all param charts with unique domains and fix y scale of state …
shawnyama Oct 1, 2024
e92b2ad
resolve conflicts
shawnyama Oct 1, 2024
7af47f8
no input overflow
shawnyama Oct 1, 2024
57cb620
rm log
shawnyama Oct 1, 2024
937d39b
Delete packages/gollm/gollm_task.egg-info/PKG-INFO
shawnyama Oct 1, 2024
2cd5da6
Delete packages/gollm/gollm_task.egg-info/SOURCES.txt
shawnyama Oct 1, 2024
0502a22
Delete packages/gollm/gollm_task.egg-info/dependency_links.txt
shawnyama Oct 1, 2024
0987a46
Delete packages/gollm/gollm_task.egg-info/entry_points.txt
shawnyama Oct 1, 2024
7a6a5a6
Delete packages/gollm/gollm_task.egg-info/top_level.txt
shawnyama Oct 1, 2024
baca651
variable naming and edge case
shawnyama Oct 1, 2024
0ec21ee
type function params
shawnyama Oct 1, 2024
b00bef6
Merge branch 'main' into funman-output
shawnyama Oct 1, 2024
30d4cdd
s
shawnyama Oct 1, 2024
7820f0e
s
shawnyama Oct 1, 2024
3b01e6e
Merge branch 'funman-output' into save-funman-model
shawnyama Oct 1, 2024
6d204ed
Merge branch 'main' into funman-output
shawnyama Oct 1, 2024
501dd63
debug
shawnyama Oct 2, 2024
5425ed0
point markers
shawnyama Oct 2, 2024
1b28a31
Merge branch 'funman-output' of https://github.com/DARPA-ASKEM/terari…
shawnyama Oct 2, 2024
618f884
Merge branch 'main' into funman-output
shawnyama Oct 2, 2024
14ae212
Merge branch 'funman-output' into save-funman-model
shawnyama Oct 2, 2024
4a6209f
rm log
shawnyama Oct 2, 2024
370f302
s
shawnyama Oct 2, 2024
fd2d980
fix config
shawnyama Oct 2, 2024
525a2e5
Merge branch 'save-funman-model' into funman-output
shawnyama Oct 2, 2024
a063375
rm logs
shawnyama Oct 2, 2024
5183bd6
Merge branch 'main' into funman-output
shawnyama Oct 2, 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
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/components/drilldown/tera-drilldown-preview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ const slots = useSlots();
flex-direction: column;
gap: var(--gap-1);
flex-grow: 1;
padding: var(--gap);
overflow: hidden;
}

Expand All @@ -46,6 +45,7 @@ header {

.content-container > main {
overflow-y: auto;
padding: var(--gap-4);
flex-grow: 1;
}

Expand Down
9 changes: 9 additions & 0 deletions packages/client/hmi-client/src/components/widgets/tera-slider-panel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,15 @@ header:not(.tab) {
background-color: var(--surface-100);
border-right: 1px solid var(--surface-border-light);
}

/** Override default accordion styles */
&:deep(.p-accordion-header-link) {
background-color: var(--surface-100);
}

&:deep(.p-accordion-content) {
background-color: var(--surface-100);
}
}

.tab {
Expand Down
47 changes: 0 additions & 47 deletions packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-boundary-chart.vue
View file
Open in desktop

This file was deleted.

21 changes: 3 additions & 18 deletions packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,21 +139,16 @@
@update:selection="onSelection"
:options="outputs"
is-selectable
class="pb-3 pl-2 pr-4"
>
<template v-if="showSpinner">
<tera-progress-spinner :font-size="2" is-centered style="height: 100%" />
</template>
<tera-progress-spinner v-if="showSpinner" :font-size="2" is-centered style="height: 100%" />
<template v-else>
<tera-funman-output
v-if="activeOutput"
:fun-model-id="activeOutput.value?.[0]"
:trajectoryState="node.state.trajectoryState"
@update:trajectoryState="updateTrajectorystate"
/>
<div v-else class="flex flex-column h-full justify-content-center">
<tera-operator-placeholder :node="node" />
</div>
<tera-operator-placeholder v-else class="h-full" :node="node" />
</template>
</tera-drilldown-preview>
</template>
Expand Down Expand Up @@ -603,8 +598,7 @@ watch(
.timespan {
display: flex;
align-items: center;
gap: var(--gap-2);
/* overflow: auto; */
justify-content: space-between;

& .timespan-input {
display: flex;
Expand Down Expand Up @@ -644,15 +638,6 @@ ul {
padding: 0 var(--gap-2);
}

/** Override default accordion styles */
:deep(.p-accordion-header-link) {
background-color: var(--surface-100);
}

:deep(.p-accordion-content) {
background-color: var(--surface-100);
}

/* Override grid template so output expands when sidebar is closed */
.overlay-container:deep(section.scale main) {
grid-template-columns: auto 1fr;
Expand Down
Loading