summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
authorArjun Roychowdhury <pliablepixels@gmail.com>2016-01-08 07:12:19 +0530
committerArjun Roychowdhury <pliablepixels@gmail.com>2016-01-08 07:12:19 +0530
commit468b14fa8f0c5ce33f9f4e6787d19be5dd2a5123 (patch)
tree624155b40e2fed42e6fe16122c2031fa6e9dd7e6 /www/js
parent7208b29599a8e5c4892345bb15f62df7a4e677d9 (diff)
#116 - initial code for preset suppport - still needs work
Former-commit-id: e5fcac51dc6c4d836e7c78827b52ed3f3787afcf
Diffstat (limited to 'www/js')
-rw-r--r--www/js/ModalCtrl.js7
-rw-r--r--www/js/MonitorCtrl.js12
2 files changed, 18 insertions, 1 deletions
diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js
index 1e3a8e80..185f71a4 100644
--- a/www/js/ModalCtrl.js
+++ b/www/js/ModalCtrl.js
@@ -268,7 +268,12 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
var intervalModalHandle;
-
+$scope.togglePresets = function()
+{
+ $scope.presetOn = !$scope.presetOn;
+ console.log ("Changing preset to " + $scope.presetOn);
+};
+
//-------------------------------------------------------------
// Send PTZ command to ZM
// Note: PTZ fails on desktop, don't bother about it
diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index 7fcb8dac..b5f5a47e 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -295,6 +295,7 @@ angular.module('zmApp.controllers')
$rootScope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
$scope.ptzMoveCommand = "";
+ $scope.presetOn = false;
// This is a modal to show the monitor footage
@@ -329,6 +330,17 @@ angular.module('zmApp.controllers')
$scope.ptzStopCommand = "moveStop";
}
+ // presets
+ ZMDataModel.zmDebug ("Preset value is " +data.control.Control.HasPresets);
+
+ if (data.control.Control.HasPresets == '1')
+ {
+ $scope.ptzPresetCount = parseInt(data.control.Control.NumPresets);
+ $scope.ptzPresetCount = 13;
+ ZMDataModel.zmDebug ("Number of presets is " + $scope.ptzPresetCount);
+ $scope.ptzPresets = new Array($scope.ptzPresetCount);
+
+ }
console.log("***moveCommand: " + $scope.ptzMoveCommand);