mirror of
https://github.com/nasa/openmct.git
synced 2025-06-19 23:53:49 +00:00
Merge branch 'topic-conditionals' into dave/conditions-telemetry
This commit is contained in:
@ -36,7 +36,7 @@ export default class ConditionManager extends EventEmitter {
|
|||||||
this.initialize();
|
this.initialize();
|
||||||
|
|
||||||
this.stopObservingForChanges = this.openmct.objects.observe(this.conditionSetDomainObject, '*', (newDomainObject) => {
|
this.stopObservingForChanges = this.openmct.objects.observe(this.conditionSetDomainObject, '*', (newDomainObject) => {
|
||||||
this.update(newDomainObject);
|
this.conditionSetDomainObject = newDomainObject;
|
||||||
});
|
});
|
||||||
|
|
||||||
this.subscribeToTelemetry();
|
this.subscribeToTelemetry();
|
||||||
@ -56,15 +56,6 @@ export default class ConditionManager extends EventEmitter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
update(newDomainObject) {
|
|
||||||
this.destroy();
|
|
||||||
this.conditionSetDomainObject = newDomainObject;
|
|
||||||
this.stopObservingForChanges = this.openmct.objects.observe(this.conditionSetDomainObject, '*', (newDO) => {
|
|
||||||
this.update(newDO);
|
|
||||||
});
|
|
||||||
this.initialize();
|
|
||||||
}
|
|
||||||
|
|
||||||
updateCondition(conditionConfiguration, index) {
|
updateCondition(conditionConfiguration, index) {
|
||||||
let condition = this.conditionClassCollection[index];
|
let condition = this.conditionClassCollection[index];
|
||||||
condition.update(conditionConfiguration);
|
condition.update(conditionConfiguration);
|
||||||
|
Reference in New Issue
Block a user