From 41411b6201fa5e6ca0f78bb78073bbf525d4b573 Mon Sep 17 00:00:00 2001
From: PliablePixels <pliablepixels@gmail.com>
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 ++++++++++++++++++--
 www/js/DevOptionsCtrl.js          |  7 +++++++
 www/templates/devoptions.html     |  9 +++++++++
 www/templates/login.html          |  3 +++
 www/templates/monitors-modal.html |  3 ++-
 www/templates/montage.html        |  1 +
 6 files changed, 40 insertions(+), 3 deletions(-)

(limited to 'www')

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);
+
 
         },
 
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);
     };
 
diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 95c6d4e3..4930c3e8 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -30,6 +30,15 @@
 
             </div>
 
+             <div class="item item-input-inset">
+
+                Montage Streaming Quality(%)&nbsp;
+                <label class="item-input-wrapper">
+                    <input type="tel" placeholder="max is 30" ng-model="loginData.montageQuality">
+                </label>
+
+            </div>
+
 
 
             <button class="button button-block button-balanced icon ion-locked" ng-click="saveDevOptions()"> Save</button>
diff --git a/www/templates/login.html b/www/templates/login.html
index 3c074c99..1ad11b0c 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -28,5 +28,8 @@
             </label>
         </div>
 
+
+            <button class="button button-block button-balanced icon ion-locked" ng-click="login()"> Save</button>
+
     </ion-content>
 </ion-view>
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index 23562a7a..4bb36c1a 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -14,10 +14,11 @@
 
         <!-- replay can also be gapless imageonload="finishedLoadingImage()"-->
 
+
         <div ng-if="!isSimulated()">
             <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; ">
 
-                <img imageonload="finishedLoadingImage()" ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=jpeg&amp;monitor={{monitorId}}&maxfps={{LoginData.maxfps}}&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="100%" />
+                <img imageonload="finishedLoadingImage()" ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=jpeg&amp;monitor={{monitorId}}&maxfps={{LoginData.maxFPS}}&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="100%" />
 
                 <!-- <img  imageonload="finishedLoadingImage()" ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=jpeg&amp;monitor={{monitorId}}&maxfps=3&buffer=1000&rand={{rand}}" width="100%" />-->
             </ion-scroll>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index d69fdfa7..63f9b144 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -32,6 +32,7 @@
                  and auth token mode -->
                 <div ng-if="!isSimulated()">
 
+                    <!-- FIXME: Scale is hard coded to 50 for montage to save resources. Better way? -->
                     <img  ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{randomval}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable)"  />
 
                    </div>
-- 
cgit v1.2.3