From 41411b6201fa5e6ca0f78bb78073bbf525d4b573 Mon Sep 17 00:00:00 2001 From: PliablePixels Date: Thu, 4 Jun 2015 13:32:00 -0400 Subject: whoops - broke live view auth when adding montage view optimizations - fixed --- www/js/DataModel.js | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'www/js/DataModel.js') 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"); @@ -163,6 +172,12 @@ angular.module('zmApp.controllers').service('ZMDataModel', ['$http', '$q', '$ion window.localStorage.getItem("maxFPS"); 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); + }, -- cgit v1.2.3