diff --git a/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/components/Openc3Screen.vue b/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/components/Openc3Screen.vue index 92db23eca..821f86ed3 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/components/Openc3Screen.vue +++ b/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/components/Openc3Screen.vue @@ -779,4 +779,8 @@ export default { .v-textarea :deep(textarea) { padding: 5px; } +.v-textarea .v-field__input { + -webkit-mask-image: unset; + mask-image: unset; +} diff --git a/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/widgets/BarColumn.js b/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/widgets/BarColumn.js index 53641b9b5..b7f709b3a 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/widgets/BarColumn.js +++ b/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/widgets/BarColumn.js @@ -101,6 +101,9 @@ export default { }, methods: { modifyLimits(limitsSettings) { + if (!limitsSettings) { + return + } // By default the red bars take 10% of the display this.redLow = 10 this.redHigh = 10 diff --git a/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/widgets/LimitsbarWidget.vue b/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/widgets/LimitsbarWidget.vue index 7277e3b28..671005994 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/widgets/LimitsbarWidget.vue +++ b/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/widgets/LimitsbarWidget.vue @@ -52,11 +52,17 @@ export default { computed: { limitsRange() { let values = this.limitsSettings[this.selectedLimitsSet] - // Format like the DetailsDialog formatLimit function - if (values.length === 4) { - return `RL/${values[0]} YL/${values[1]} YH/${values[2]} RH/${values[3]}` + if (values) { + // Format like the DetailsDialog formatLimit function + if (values.length === 4) { + return `RL/${values[0]} YL/${values[1]} YH/${values[2]} RH/${values[3]}` + } else { + return `RL/${values[0]} YL/${values[1]} YH/${values[2]} RH/${values[3]} GL/${values[4]} GH/${values[5]}` + } } else { - return `RL/${values[0]} YL/${values[1]} YH/${values[2]} RH/${values[3]} GL/${values[4]} GH/${values[5]}` + throw new Error( + `Item ${this.parameters.slice(0, 3).join(' ')} has no limits settings`, + ) } }, }, diff --git a/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/widgets/LimitscolumnWidget.vue b/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/widgets/LimitscolumnWidget.vue index ab1fb488f..23e4315f4 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/widgets/LimitscolumnWidget.vue +++ b/openc3-cosmos-init/plugins/packages/openc3-vue-common/src/widgets/LimitscolumnWidget.vue @@ -52,19 +52,25 @@ export default { let limits = this.modifyLimits( this.limitsSettings[this.selectedLimitsSet], ) - this.calcLimits(limits) - return { - '--height': this.height + 'px', - '--width': this.width + 'px', - '--container-width': this.width - 5 + 'px', - '--position': this.calcPosition(value, limits) + '%', - '--redlow-height': this.redLow + '%', - '--redhigh-height': this.redHigh + '%', - '--yellowlow-height': this.yellowLow + '%', - '--yellowhigh-height': this.yellowHigh + '%', - '--greenlow-height': this.greenLow + '%', - '--greenhigh-height': this.greenHigh + '%', - '--blue-height': this.blue + '%', + if (limits) { + this.calcLimits(limits) + return { + '--height': this.height + 'px', + '--width': this.width + 'px', + '--container-width': this.width - 5 + 'px', + '--position': this.calcPosition(value, limits) + '%', + '--redlow-height': this.redLow + '%', + '--redhigh-height': this.redHigh + '%', + '--yellowlow-height': this.yellowLow + '%', + '--yellowhigh-height': this.yellowHigh + '%', + '--greenlow-height': this.greenLow + '%', + '--greenhigh-height': this.greenHigh + '%', + '--blue-height': this.blue + '%', + } + } else { + throw new Error( + `Item ${this.parameters.slice(0, 3).join(' ')} has no limits settings`, + ) } }, },