diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-30 03:30:57 +0100 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-30 03:30:57 +0100 |
| commit | 8812d6fd22b1710e019ba53e94723c76b97af6b7 (patch) | |
| tree | e5e2a74d56715f20d3604cab15943dfa4f9f54f6 /www/js/TimelineCtrl.js | |
| parent | af2a626dedb251670b573356b6993c5d7197f0ec (diff) | |
#108 - minAlarmCount is now part of each serverProfile and will persist
Former-commit-id: 89ecf51624e78a95474630b48c05d9fa921164c0
Diffstat (limited to 'www/js/TimelineCtrl.js')
| -rw-r--r-- | www/js/TimelineCtrl.js | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 048fc03e..b5dc5711 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -59,6 +59,19 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla // console.log ("*** MS COUNT " + (1000.0/(myframes/mylen))); return (Math.round(1000 / (myframes / mylen))); }; + + + $scope.toggleMinAlarmFrameCount = function () { + console.log ("Toggling"); + + var ld = ZMDataModel.getLogin(); + ld.minAlarmCount = ld.minAlarmCount=="0"? "1":"0"; + ZMDataModel.setLogin(ld); + + + drawGraph(curFromDate, curToDate, curCount); + + }; //----------------------------------------------------------- // Move/Zoom are used to move the timeline around @@ -212,6 +225,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla //console.log ("TIMELINE MONITORS: " + JSON.stringify(message)); var ld = ZMDataModel.getLogin(); + $scope.loginData = ZMDataModel.getLogin(); if (ld.persistMontageOrder) { @@ -245,6 +259,9 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla //------------------------------------------------- //var currentEvent=""; + + // keep a record for redraw + var curFromDate, curToDate, curCount; // Make sure sliding for menu is disabled so it // does not interfere with graph panning @@ -400,6 +417,11 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla //------------------------------------------------- function drawGraph(fromDate, toDate, count) { + + + curFromDate = fromDate; + curToDate = toDate; + curCount = count; $ionicLoading.show({ template: "Loading graph...", |