add simulation mode via settings and in montage view. Events pending

4 files changed, 27 insertions, 0 deletions

diff --git a/www/img/demo.gif b/www/img/demo.gif
new file mode 100644
index 00000000..0b7ae707
--- /dev/null
+++ b/www/img/demo.gif
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 @@
                 <!-- does not route via APIs. As of today, there is no way to do this via apis.
                  FIXME: I should probably not pass username and password here - instead go the http interceptor
                  and auth token mode -->
+                <div ng-if="!isSimulated()">
                 <img  ng-src="{{LoginData.url}}/cgi-bin/nph-zms?mode=jpeg&amp;monitor={{monitor.Monitor.Id}}&scale=100&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;"   />
+
+                   </div>
+
+                   <div ng-if="isSimulated()">
+                       <img  ng-src="img/demo.gif?rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;"
+                   </div>
+
+                   <!-- <img  ng-src="img/demo.gif?rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;"   />-->
+
                     <!-- <br/><i class="ion-monitor"></i> Hello -->
      
                 </article>