ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-22 10:11:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pr edits

Browse Source
This commit is contained in:
Jamie Vigliotta 2020-07-17 15:10:17 -07:00
parent d2b9a7754f
commit 68eb5e6286
5 changed files with 26 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/plugins/LADTable/components/LADTable.vue
View File

@ -53,8 +53,17 @@ export default {
}, },
data() { data() {
return { return {
items: [], items: []
hasUnits: false }
},
computed: {
hasUnits() {
let itemsWithUnits = this.items.filter((item) => {
let metadata = this.openmct.telemetry.getMetadata(item.domainObject);
return this.metadataHasUnits(metadata.valueMetadatas);
}).length;
return itemsWithUnits !== 0;
} }
}, },
mounted() { mounted() {
@ -76,13 +85,13 @@ export default {
item.key = this.openmct.objects.makeKeyString(domainObject.identifier); item.key = this.openmct.objects.makeKeyString(domainObject.identifier);
this.items.push(item); this.items.push(item);
this.checkForUnits(); // this.checkForUnits();
}, },
removeItem(identifier) { removeItem(identifier) {
let index = this.items.findIndex(item => this.openmct.objects.makeKeyString(identifier) === item.key); let index = this.items.findIndex(item => this.openmct.objects.makeKeyString(identifier) === item.key);
this.items.splice(index, 1); this.items.splice(index, 1);
this.checkForUnits(); // this.checkForUnits();
}, },
reorder(reorderPlan) { reorder(reorderPlan) {
let oldItems = this.items.slice(); let oldItems = this.items.slice();
@ -90,20 +99,10 @@ export default {
this.$set(this.items, reorderEvent.newIndex, oldItems[reorderEvent.oldIndex]); this.$set(this.items, reorderEvent.newIndex, oldItems[reorderEvent.oldIndex]);
}); });
}, },
checkForUnits() { metadataHasUnits(valueMetadatas) {
let metadatas = []; return valueMetadatas.filter((metadatum) => {
let hasUnits = false; return metadatum.unit;
this.items.forEach((item) => { }).length;
let metadata = this.openmct.telemetry.getMetadata(item.domainObject);
metadatas = metadatas.concat(metadata.valueMetadatas);
});
for(let metadatum of metadatas) {
if(metadatum.unit) {
hasUnits = true;
break;
}
}
this.hasUnits = hasUnits;
} }
} }
} }

10
src/plugins/LADTable/components/LadTableSet.vue
View File

@ -142,11 +142,12 @@ export default {
array.splice(index, 1); array.splice(index, 1);
this.$set(this.secondaryTelemetryObjects, primary.key, array); this.$set(this.secondaryTelemetryObjects, primary.key, array);
this.checkForUnits(); if(this.hasUnits) {
this.checkForUnits();
}
} }
}, },
checkForUnits() { checkForUnits() {
let hasUnits = false;
for(let telemetryObject in this.secondaryTelemetryObjects) { for(let telemetryObject in this.secondaryTelemetryObjects) {
if(this.secondaryTelemetryObjects[telemetryObject]) { if(this.secondaryTelemetryObjects[telemetryObject]) {
let objects = this.secondaryTelemetryObjects[telemetryObject]; let objects = this.secondaryTelemetryObjects[telemetryObject];
@ -154,13 +155,14 @@ export default {
let metadata = this.openmct.telemetry.getMetadata(current.domainObject); let metadata = this.openmct.telemetry.getMetadata(current.domainObject);
for(let metadatum of metadata.valueMetadatas) { for(let metadatum of metadata.valueMetadatas) {
if(metadatum.unit) { if(metadatum.unit) {
hasUnits = true; this.hasUnits = true;
return;
} }
} }
} }
} }
} }
this.hasUnits = hasUnits; this.hasUnits = false;
} }
} }
} }

2
src/plugins/plot/res/templates/mct-plot.html
View File

@ -44,7 +44,7 @@
ng-style="{ 'background-color': series.get('color').asHexString() }"> ng-style="{ 'background-color': series.get('color').asHexString() }">
</span> </span>
<span class="is-missing__indicator" title="This item is missing"></span> <span class="is-missing__indicator" title="This item is missing"></span>
<span class="plot-series-name">{{ series.get('name') + (series.get('unit') ? ' ' + series.get('unit') : '')}}</span> <span class="plot-series-name">{{ series.get('nameWithUnit') }}</span>
</div> </div>
<div class="plot-series-value hover-value-enabled value-to-display-{{ legend.get('valueToShowWhenCollapsed') }} {{ series.closest.mctLimitState.cssClass }}" <div class="plot-series-value hover-value-enabled value-to-display-{{ legend.get('valueToShowWhenCollapsed') }} {{ series.closest.mctLimitState.cssClass }}"
ng-class="{ 'cursor-hover': (legend.get('valueToShowWhenCollapsed').indexOf('nearest') != -1) }" ng-class="{ 'cursor-hover': (legend.get('valueToShowWhenCollapsed').indexOf('nearest') != -1) }"

3
src/plugins/plot/src/configuration/PlotSeries.js
View File

@ -101,7 +101,8 @@ define([
var range = this.metadata.valuesForHints(['range'])[0]; var range = this.metadata.valuesForHints(['range'])[0];
return { return {
name: options.domainObject.name, name: options.domainObject.name,
unit: range.unit || '', unit: range.unit,
nameWithUnit: options.domainObject.name + (range.unit ? ' ' + range.unit : ''),
xKey: options.collection.plot.xAxis.get('key'), xKey: options.collection.plot.xAxis.get('key'),
yKey: range.key, yKey: range.key,
markers: true, markers: true,

37
src/plugins/telemetryTable/TelemetryTable.js
View File

@ -225,43 +225,6 @@ define([
createUnitColumn(metadatum) { createUnitColumn(metadatum) {
return new TelemetryTableUnitColumn(this.openmct, metadatum); return new TelemetryTableUnitColumn(this.openmct, metadatum);
// let unitColumn = {
// isUnit: true,
// metadatum,
// titleValue: metadatum.name + ' Unit',
// selectable: false,
// formatter: {
// format(telemetryDatum) {
// return metadatum.unit;
// },
// parse(telemetryDatum) {
// return metadatum.unit;
// }
// },
// getKey() {
// return this.metadatum.key + '-unit';
// },
// getTitle() {
// return this.titleValue;
// },
// getMetadatum() {
// return this.metadatum;
// },
// hasValueForDatum(telemetryDatum) {
// return telemetryDatum.hasOwnProperty(this.metadatum.source);
// },
// getRawValue(telemetryDatum) {
// return this.metadatum.unit;
// },
// getFormattedValue(telemetryDatum) {
// return this.formatter.format(telemetryDatum);
// },
// getParsedValue(telemetryDatum) {
// return this.formatter.parse(telemetryDatum);
// }
// };
// return unitColumn;
} }
subscribeTo(telemetryObject) { subscribeTo(telemetryObject) {