From 4f85c93a83074f8a7a0dc754bd9516c51401c24e Mon Sep 17 00:00:00 2001 From: ARC Date: Sun, 26 Apr 2015 10:19:37 -0400 Subject: add simulation mode via settings and in montage view. Events pending --- www/img/demo.gif | Bin 0 -> 831681 bytes www/js/DataModel.js | 6 ++++++ www/js/MontageCtrl.js | 11 +++++++++++ www/templates/montage.html | 10 ++++++++++ 4 files changed, 27 insertions(+) create mode 100644 www/img/demo.gif diff --git a/www/img/demo.gif b/www/img/demo.gif new file mode 100644 index 00000000..0b7ae707 Binary files /dev/null and b/www/img/demo.gif differ diff --git a/www/js/DataModel.js b/www/js/DataModel.js index f42a8bcf..1e13effc 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -283,6 +283,12 @@ angular.module('zmApp.controllers').service('ZMDataModel', ['$http', '$q', '$ion return "(Unknown)"; }, + getMontageImagePath: function (){ + + var path = "{{LoginData.url}}/cgi-bin/nph-zms?mode=jpeg&monitor={{monitor.Monitor.Id}}&scale=100&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}"; + + return (path); + } }; diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 8a189dfb..ed7acc3d 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -7,6 +7,17 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', function ($s $ionicSideMenuDelegate.toggleLeft(); } + $scope.getMontageImagePath = function () + { + return ZMDataModel.getMontageImagePath(); + } + + $scope.isSimulated = function () + { + return ZMDataModel.isSimulated(); + } + + //var monsize =3; console.log("********* Inside Montage Ctrl"); $scope.LoginData = ZMDataModel.getLogin(); diff --git a/www/templates/montage.html b/www/templates/montage.html index 3ef1885b..8ba62f38 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -25,7 +25,17 @@ +
+ +
+ +
+ + + + -- cgit v1.2.3