mirror of
https://github.com/nasa/openmct.git
synced 2025-04-15 23:16:46 +00:00
[Limits] Show limits from scrolling list view
WTD-1223.
This commit is contained in:
parent
f4adc6a889
commit
4ab36bd421
@ -38,8 +38,9 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="row in rows">
|
||||
<td ng-repeat="cell in row">
|
||||
{{cell}}
|
||||
<td ng-repeat="cell in row"
|
||||
ng-class="cell.cssClass">
|
||||
{{cell.text}}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
@ -55,9 +55,11 @@ define(
|
||||
* @returns {string} the text to display
|
||||
*/
|
||||
getValue: function (domainObject, data, index) {
|
||||
return telemetryFormatter.formatDomainValue(
|
||||
data.getDomainValue(index, domainMetadata.key)
|
||||
);
|
||||
return {
|
||||
text: telemetryFormatter.formatDomainValue(
|
||||
data.getDomainValue(index, domainMetadata.key)
|
||||
)
|
||||
};
|
||||
}
|
||||
};
|
||||
}
|
||||
|
@ -50,7 +50,9 @@ define(
|
||||
* @returns {string} the text to display
|
||||
*/
|
||||
getValue: function (domainObject) {
|
||||
return domainObject.getModel().name;
|
||||
return {
|
||||
text: domainObject.getModel().name
|
||||
};
|
||||
}
|
||||
};
|
||||
}
|
||||
|
@ -58,13 +58,11 @@ define(
|
||||
var range = rangeMetadata.key,
|
||||
limit = domainObject.getCapability('limit'),
|
||||
value = data.getRangeValue(index, range),
|
||||
cell = telemetryFormatter.formatRangeValue(value);
|
||||
alarm = limit.evaluate(value, range);
|
||||
|
||||
return {
|
||||
cssClass: limit && limit.evaluate(value, range),
|
||||
toString: function () {
|
||||
return cell;
|
||||
}
|
||||
cssClass: alarm && alarm.cssClass,
|
||||
text: telemetryFormatter.formatRangeValue(value)
|
||||
};
|
||||
}
|
||||
};
|
||||
|
@ -142,7 +142,7 @@ define(
|
||||
// column object itself)
|
||||
return values.map(function (value) {
|
||||
return columns.map(function (column) {
|
||||
column.getValue(
|
||||
return column.getValue(
|
||||
objects[value.objectIndex],
|
||||
datas[value.objectIndex],
|
||||
value.pointIndex
|
||||
|
Loading…
x
Reference in New Issue
Block a user