ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-01 23:20:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compass rose rotation fixes (#6260)

Browse Source
This commit is contained in:
Charles Hacskaylo 2023-02-02 17:18:41 -08:00 committed by GitHub
parent 800062d37e
commit 422b7f3e09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/plugins/imagery/components/Compass/CompassRose.vue
View File

@ -107,48 +107,53 @@
height="100" height="100"
/> />
</mask> </mask>
<!-- Equipment (spacecraft) body holder. Transforms relative to the camera position. -->
<g <g
v-if="hasHeading" class="c-cr-cam-and-body"
class="cr-vrover"
:style="camAngleAndPositionStyle"
>
<!-- Equipment body. Rotates relative to the camera gimbal value for cams that gimbal. -->
<path
class="cr-vrover__body"
:style="camGimbalAngleStyle"
fill-rule="evenodd"
clip-rule="evenodd"
d="M5 0C2.23858 0 0 2.23858 0 5V95C0 97.7614 2.23858 100 5 100H95C97.7614 100 100 97.7614 100 95V5C100 2.23858 97.7614 0 95 0H5ZM85 59L50 24L15 59H33V75H67.0455V59H85Z"
/>
</g>
<g
class="c-cr__cam-fov"
:style="cameraHeadingStyle" :style="cameraHeadingStyle"
> >
<g mask="url(#mask2)"> <!-- Equipment (spacecraft) body holder. Transforms relative to the camera position. -->
<rect <g
class="c-cr__cam-fov-r" v-if="hasHeading"
x="49" class="cr-vrover"
width="51" :style="camAngleAndPositionStyle"
height="100" >
:style="cameraFOVStyleRightHalf" <!-- Equipment body. Rotates relative to the camera pan value for cams that gimbal. -->
<path
class="cr-vrover__body"
:style="camGimbalAngleStyle"
x
fill-rule="evenodd"
clip-rule="evenodd"
d="M5 0C2.23858 0 0 2.23858 0 5V95C0 97.7614 2.23858 100 5 100H95C97.7614 100 100 97.7614 100 95V5C100 2.23858 97.7614 0 95 0H5ZM85 59L50 24L15 59H33V75H67.0455V59H85Z"
/> />
</g> </g>
<g mask="url(#mask1)">
<rect <g
class="c-cr__cam-fov-l" class="c-cr__cam-fov"
width="51" >
height="100" <g mask="url(#mask2)">
:style="cameraFOVStyleLeftHalf" <rect
class="c-cr__cam-fov-r"
x="49"
width="51"
height="100"
:style="cameraFOVStyleRightHalf"
/>
</g>
<g mask="url(#mask1)">
<rect
class="c-cr__cam-fov-l"
width="51"
height="100"
:style="cameraFOVStyleLeftHalf"
/>
</g>
<polygon
class="c-cr__cam"
points="0,0 100,0 70,40 70,100 30,100 30,40"
/> />
</g> </g>
<polygon
class="c-cr__cam"
points="0,0 100,0 70,40 70,100 30,100 30,40"
/>
</g> </g>
</g> </g>
@ -305,7 +310,7 @@ export default {
return { transform: `translate(${translateX}%, ${translateY}%) rotate(${rotation}deg) scale(${scale})` }; return { transform: `translate(${translateX}%, ${translateY}%) rotate(${rotation}deg) scale(${scale})` };
}, },
camGimbalAngleStyle() { camGimbalAngleStyle() {
const rotation = rotate(this.north, this.heading); const rotation = rotate(this.heading);
return { return {
transform: `rotate(${ rotation }deg)` transform: `rotate(${ rotation }deg)`
@ -332,14 +337,6 @@ export default {
hasHeading() { hasHeading() {
return this.heading !== undefined; return this.heading !== undefined;
}, },
headingStyle() {
/* Replaced with computed camGimbalStyle, but left here just in case. */
const rotation = rotate(this.north, this.heading);
return {
transform: `rotate(${ rotation }deg)`
};
},
hasSunHeading() { hasSunHeading() {
return this.sunHeading !== undefined; return this.sunHeading !== undefined;
}, },