ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-07 21:58:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

separate annotation guard

Browse Source
This commit is contained in:
Scott Bell 2023-04-25 14:02:34 +02:00
parent bd356653db
commit 3a77efb010
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/imagery/components/Compass/compass.scss
View File

@ -14,7 +14,7 @@ $elemBg: rgba(black, 0.7);
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
z-index: 4; z-index: 3;
@include userSelectNone; @include userSelectNone;
} }

17
src/plugins/imagery/components/ImageryView.vue
View File

@ -97,7 +97,7 @@
:sized-image-dimensions="sizedImageDimensions" :sized-image-dimensions="sizedImageDimensions"
/> />
<AnnotationsCanvas <AnnotationsCanvas
v-if="shouldDisplayCompass" v-if="shouldDisplayAnnotations"
:image="focusedImage" :image="focusedImage"
:imagery-annotations="imageryAnnotations[focusedImage.time]" :imagery-annotations="imageryAnnotations[focusedImage.time]"
/> />
@ -429,6 +429,19 @@ export default {
return result; return result;
}, },
shouldDisplayAnnotations() {
const imageHeightAndWidth = this.sizedImageHeight !== 0
&& this.sizedImageWidth !== 0;
const display = this.focusedImage !== undefined
&& this.focusedImageNaturalAspectRatio !== undefined
&& this.imageContainerWidth !== undefined
&& this.imageContainerHeight !== undefined
&& imageHeightAndWidth
&& this.zoomFactor === 1
&& this.imagePanned !== true;
return display;
},
shouldDisplayCompass() { shouldDisplayCompass() {
const imageHeightAndWidth = this.sizedImageHeight !== 0 const imageHeightAndWidth = this.sizedImageHeight !== 0
&& this.sizedImageWidth !== 0; && this.sizedImageWidth !== 0;
@ -763,7 +776,7 @@ export default {
const incomingSelectedAnnotation = selection?.[0]?.[0]?.context?.annotations?.[0]; const incomingSelectedAnnotation = selection?.[0]?.[0]?.context?.annotations?.[0];
console.debug(`📲 incoming search selections`, incomingSelectedAnnotation); console.debug(`📲 incoming search selections`, incomingSelectedAnnotation);
// for incoming search results, we should: // TODO: for incoming search results, we should:
// 1. set the the time bounds to match the search result // 1. set the the time bounds to match the search result
// 2. search the imageHistory for the image that matches the time of the search result // 2. search the imageHistory for the image that matches the time of the search result
// 3. using the index from the above, "click" on the image to select it // 3. using the index from the above, "click" on the image to select it

2
src/plugins/imagery/components/imagery-view.scss
View File

@ -532,5 +532,5 @@
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
z-index: 3; z-index: 2;
} }