Skip to content

Commit 1b6bae4

Browse files
authored
Merge pull request #782 from SlideRuleEarth/carlos-dev4
YAPC color ramp legend is not being displayed for Photon cloud #779
2 parents 49cad70 + 4284e15 commit 1b6bae4

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

web-client/src/components/SrElevationPlot.vue

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,13 @@ const initOverlayLegendPosition = () => {
218218
}
219219
const reqId = computed(() => recTreeStore.selectedReqId)
220220
221+
const overlayReqId = computed(() => {
222+
if (atlChartFilterStore.selectedOverlayedReqIds.length > 0) {
223+
return atlChartFilterStore.selectedOverlayedReqIds[0]
224+
}
225+
return 0
226+
})
227+
221228
const shouldDisplayAtl03Colors = computed(() => {
222229
// Wait for tree to load before checking API
223230
if (!recTreeStore.isTreeLoaded) return false
@@ -353,6 +360,8 @@ const computedOverlayDataKey = computed(() => {
353360
const shouldDisplayOverlayGradient = computed(() => {
354361
return (
355362
atlChartFilterStore.selectedOverlayedReqIds.length > 0 &&
363+
computedOverlayDataKey.value != '' &&
364+
computedOverlayDataKey.value != 'solid' &&
356365
computedOverlayDataKey.value != 'atl03_cnf' &&
357366
computedOverlayDataKey.value != 'atl08_class' &&
358367
computedOverlayDataKey.value != 'atl24_class'
@@ -684,6 +693,13 @@ watch(
684693
<!-- {{ shouldDisplayOverlayGradient ? 'Overlay Gradient Displayed' : 'Overlay Gradient Not Displayed' }} -->
685694
<!-- {{ shouldDisplayAtl08Colors ? 'Atl08 Colors Displayed' : 'Atl08 Colors Not Displayed' }} -->
686695
<!-- {{ shouldDisplayAtl03Colors ? 'Atl03 Colors Displayed' : 'Atl03 Colors Not Displayed' }} -->
696+
<!-- <div style="background: yellow; color: black; padding: 0.5rem; margin: 0.5rem;">
697+
DEBUG: shouldDisplayOverlayGradient: {{ shouldDisplayOverlayGradient }} |
698+
shouldDisplayMainGradient: {{ shouldDisplayMainGradient }} |
699+
computedOverlayDataKey: {{ computedOverlayDataKey }} |
700+
computedDataKey: {{ computedDataKey }} |
701+
overlayedReqIds: {{ atlChartFilterStore.selectedOverlayedReqIds }}
702+
</div> -->
687703
<div class="sr-elevation-plot-content">
688704
<div ref="chartWrapperRef" class="chart-wrapper">
689705
<v-chart
@@ -767,7 +783,7 @@ watch(
767783
</Dialog>
768784
<Dialog
769785
v-if="chartWrapperRef !== undefined"
770-
v-model:visible="shouldDisplayGradientDialog"
786+
v-model:visible="shouldDisplayOverlayGradient"
771787
:closable="false"
772788
:draggable="true"
773789
:modal="false"
@@ -780,7 +796,7 @@ watch(
780796
class="chart-overlay"
781797
v-if="shouldDisplayOverlayGradient"
782798
:isOverlay="true"
783-
:reqId="reqId"
799+
:reqId="overlayReqId"
784800
:transparentBackground="true"
785801
/>
786802
</template>

0 commit comments

Comments
 (0)