whoops - broke live view auth when adding montage view optimizations - fixed

2 files changed, 25 insertions, 2 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index b9ede609..72dfc747 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -23,7 +23,8 @@ angular.module('zmApp.controllers').service('ZMDataModel', ['$http', '$q', '$ion
         'simulationMode': false, // if true, data will be simulated. Not using this now
         'maxMontage': "10", //total # of monitors to display in montage
         'streamingurl': "",
-        'maxFPS':"3" // image streaming FPS
+        'maxFPS':"3", // image streaming FPS
+        'montageQuality':"50", // montage streaming quality in %
     };
 
     // This is really a test mode. This is how I am validating
@@ -118,6 +119,14 @@ angular.module('zmApp.controllers').service('ZMDataModel', ['$http', '$q', '$ion
                     window.localStorage.getItem("username");
 
             }
+
+
+             if (window.localStorage.getItem("montageQuality") != undefined) {
+                loginData.montageQuality =
+                    window.localStorage.getItem("montageQuality");
+
+            }
+
             if (window.localStorage.getItem("password") != undefined) {
                 loginData.password =
                     window.localStorage.getItem("password");
@@ -164,6 +173,12 @@ angular.module('zmApp.controllers').service('ZMDataModel', ['$http', '$q', '$ion
                 console.log("maxFPS  " + loginData.maxFPS);
 
             }
+             if (window.localStorage.getItem("montageQuality") != undefined) {
+                loginData.montageQuality =
+                    window.localStorage.getItem("montageQuality");
+                console.log("montageQuality  " + loginData.montageQuality);
+
+            }
 
 
 
@@ -222,7 +237,8 @@ angular.module('zmApp.controllers').service('ZMDataModel', ['$http', '$q', '$ion
 
             window.localStorage.setItem("maxMontage", loginData.maxMontage);
 
-            console.log("********** SIMULATION IS " + loginData.simulationMode);
+             window.localStorage.setItem("montageQuality", loginData.montageQuality);
+
 
         },
 
diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js
index 9bb5a759..9964b036 100644
--- a/www/js/DevOptionsCtrl.js
+++ b/www/js/DevOptionsCtrl.js
@@ -29,6 +29,13 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
         }
 
 
+         if ((parseInt($scope.loginData.montageQuality) <10) || (parseInt($scope.loginData.montageQuality)>100))
+        {
+            $scope.loginData.montageQuality='50';
+        }
+
+
+
         ZMDataModel.setLogin($scope.loginData);
     };