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

[Plot] #638 Changed plot series to an array

Browse Source
This commit is contained in:
Henry 2016-02-10 20:27:04 -08:00
parent 24c750b41e
commit 7d0de68db9
2 changed files with 62 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/features/plot/res/templates/plot-options-browse.html
View File

@ -64,7 +64,7 @@
</span>
<mct-form
ng-class="{hidden: !toggle.isActive()}"
ng-model="configuration.plot.series[child.getId()]"
ng-model="configuration.plot.series[$index]"
structure="plotSeriesForm"
name="plotOptionsState"
class="flex-elem l-flex-row l-controls-first no-validate">

80
platform/features/plot/src/PlotOptionsController.js
View File

@ -53,6 +53,7 @@ define(
this.configuration = this.domainObject.getModel().configuration || {};
this.plotOptionsForm = new PlotOptionsForm();
this.composition = [];
this.watches = [];
/*
Listen for changes to the domain object and update the object's
@ -79,7 +80,7 @@ define(
this.defaultConfiguration();
this.updateChildren();
/**
/*
* Setup a number of watches for changes to form values. On
* change, update the model configuration via mutation
*/
@ -89,17 +90,52 @@ define(
$scope.$watchCollection('configuration.plot.xAxis', function(newValue, oldValue){
self.updateConfiguration(newValue, oldValue);
});
($scope.children || []).forEach(function(child){
$scope.$watchCollection('configuration.plot.series[' + child.getId() + ']', function(newValue, oldValue){
self.updateConfiguration(newValue, oldValue);
});
});
this.watchSeries();
}
/*
/**
* Unregister all watches for series data (ie. the configuration for
* child objects)
* @private
*/
PlotOptionsController.prototype.clearSeriesWatches = function() {
this.watches.forEach(function(watch) {
watch();
});
this.watches = [];
}
/**
* Attach watches for each object in the plot's composition
* @private
*/
PlotOptionsController.prototype.watchSeries = function() {
var self = this;
this.clearSeriesWatches();
console.log("watches before: " + this.watches.length);
(self.$scope.children || []).forEach(function(child, index){
self.watches.push(
self.$scope.$watchCollection(
'configuration.plot.series[' + index + ']',
function(newValue, oldValue){
self.updateConfiguration(newValue, oldValue);
}
)
);
});
console.log("watches after: " + self.watches.length);
};
/**
* Determine whether the changes to the model that triggered a
* mutation event were purely compositional.
*
* @private
*/
PlotOptionsController.prototype.hasCompositionChanged = function(oldComposition, newComposition){
// Framed slightly strangely, but the boolean logic is
@ -114,36 +150,42 @@ define(
return !isUnchanged;
};
/*
Default the plot options model
/**
* Default the plot options model
*
* @private
*/
PlotOptionsController.prototype.defaultConfiguration = function () {
this.configuration.plot = this.configuration.plot || {};
this.configuration.plot.xAxis = this.configuration.plot.xAxis || {};
this.configuration.plot.yAxis = this.configuration.plot.yAxis || {}; // y-axes will be associative array keyed on axis key
this.configuration.plot.series = this.configuration.plot.series || {}; // series will be associative array keyed on sub-object id
this.configuration.plot.series = this.configuration.plot.series || []; // series will be associative array keyed on sub-object id
this.$scope.configuration = this.configuration;
};
/*
When a child is added to, or removed from a plot, update the
plot options model
/**
* When a child is added to, or removed from a plot, update the
* plot options model
* @private
*/
PlotOptionsController.prototype.updateChildren = function() {
var self = this;
this.domainObject.useCapability('composition').then(function(children){
self.$scope.children = children;
self.composition = self.domainObject.getModel().composition;
children.forEach(function(child){
self.configuration.plot.series[child.getId()] = self.configuration.plot.series[child.getId()] || {};
children.forEach(function(child, index){
self.configuration.plot.series[index] =
self.configuration.plot.series[index] || {'id': child.getId()};
});
self.watchSeries();
});
};
/*
On changes to the form, update the configuration on the domain
object
*/
/**
* On changes to the form, update the configuration on the domain
* object
* @private
*/
PlotOptionsController.prototype.updateConfiguration = function() {
var self = this;
this.domainObject.useCapability('mutation', function(model){