fly/fgdata
1
0
Fork 0
Code Activity

Phi: add some control buttons to the property graph

Browse source
This commit is contained in:
Torsten Dreyer 2015-03-02 22:00:18 +01:00
parent b806dead95
commit 8ffe4ea003
2 changed files with 47 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
webgui/topics/Simulator/Properties.html
View file

@ -21,10 +21,16 @@
text-align: right;
}
</style>
<div class="ui-widget ui-widget-content ui-corner-all" data-bind="visible: hasGraphItems">
<div class="ui-widget ui-widget-content ui-corner-all" data-bind="visible: hasGraphItems" style="padding-bottom: 1ex; margin-bottom: 1ex;">
<div class="ui-widget-header">Property Graph</div>
<div style="height: 300px; width: 100%"
data-bind="flotchart: { data: flotData, options: flotOptions, hover: graphHover }"></div>
<div class="ui-dialog-buttonpane ui-widget-content ui-helper-clearfix">
<div style="display: inline; float: left">
<div data-bind="button: { icons: { primary : 'ui-icon-gear' }, text: true, label: 'Settings' }, click: settings"></div>
<div data-bind="button: { icons: startIcons, text: true, label: startLabel }, click: startPause "></div>
</div>
</div>
</div>
<div class=" ui-widget
ui-widget-contentui-corner-all">
@ -87,4 +93,4 @@
</script>
<script type="text/html" id="inplace-editor-template">
<input style="width: 8em" >
</script>
</script>

41
webgui/topics/Simulator/Properties.js
View file

@ -11,7 +11,6 @@ define([
this.samples = [];
this.sample = function(timeStamp) {
console.log(this.samples.length,this.maxSamples);
while (this.samples.length >= this.maxSamples) {
this.samples.shift();
}
@ -205,6 +204,30 @@ define([
self.root.isExpanded(true);
self.properties = self.root.children;
self.startLabel = ko.pureComputed(function() {
return self.running() ? "Pause" : "Start";
});
self.startIcons = ko.pureComputed(function() {
return self.running() ? {
primary : 'ui-icon-pause'
} : {
primary : 'ui-icon-play'
};
});
self.settings = function() {
}
self.running = ko.observable(false);
self.startPause = function() {
if( self.running() ) {
self.stop();
} else {
self.start();
}
}
self.flotOptions = ko.observable({
xaxes : [
{
@ -245,6 +268,7 @@ define([
});
self.propertySampler.start();
self.running(true);
self.toggleProp = function(prop) {
@ -298,7 +322,20 @@ define([
}, 100);
}
self.update(++self.updateId);
self.start = function() {
self.update(++self.updateId);
self.propertySampler.start();
self.running(true);
}
self.stop = function() {
self.updateId++;
self.propertySampler.stop();
self.running(false);
}
self.start();
}
ViewModel.prototype.dispose = function() {