diff options
| -rw-r--r-- | README.md | 28 | ||||
| -rw-r--r-- | config.xml | 2 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 65 |
3 files changed, 51 insertions, 44 deletions
@@ -40,39 +40,45 @@ Screenshots: Menu: - + Events List: - + Full Screen Events Footage View (with floating buttons) - + Sliding Montage View 1: - + -Sliding Montage View 2: +Sliding Montage View 2 (Different sizes): + +![] (http://www.pbase.com/arjunrc/image/160697822/medium.jpg "Sliding Montage View again") + + +Montage Re-order and show/hide: + +![] (http://www.pbase.com/arjunrc/image/160697740/medium.jpg "Montage re-order and hide") -![] (http://www.pbase.com/arjunrc/image/159760953/medium.jpg "Sliding Montage View again") Monitor View: - + Graphs: -![] (http://www.pbase.com/arjunrc/image/159760956/medium.jpg "Graphs") +![] (http://www.pbase.com/arjunrc/image/160697738/medium.jpg "Graphs") -Control ZM start/stop/restart: +Control ZM custom states/start/stop/restart: -![] (http://www.pbase.com/arjunrc/image/160096322/medium.jpg "Graphs") +![] (http://www.pbase.com/arjunrc/image/160697735/medium.jpg "Control ZM") Change Monitor Modes: -![] (http://www.pbase.com/arjunrc/image/160096314/medium.jpg "Graphs") +![] (http://www.pbase.com/arjunrc/image/160697731/medium.jpg "Monitor Modes") Pan/Tilt/Zoom Mode: @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<widget id="com.pliablepixels.zmninja" version="0.62" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget id="com.pliablepixels.zmninja" version="0.63" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>zmNinja</name> <description> High performance ZoneMinder client diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index bf4d4347..94ec78ab 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -67,49 +67,50 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' var myorder = window.localStorage.getItem("montageOrder"); var myhiddenorder = window.localStorage.getItem("montageHiddenOrder"); + console.log("Montage order is " + myorder); console.log("Hidden order is " + myhiddenorder); montageOrder = myorder.split(","); hiddenOrder = myhiddenorder.split(","); - // at this stage, the monitor arrangement is not matching - // the montage order. Its in true order. Let us first process the hiddenOrder part - // now - - for (i = 0; i < montageOrder.length; i++) { - montageOrder[i] = parseInt(montageOrder[i]); - hiddenOrder[i] = parseInt(hiddenOrder[i]); - // $scope.monitors[i].Monitor.sortOrder = montageOrder[i]; - // FIXME: This will briefly show and then hide - // disabled monitors - if (hiddenOrder[i] == 1) { - // $scope.monitors[i].Monitor.listDisplay='noshow'; - $scope.monitors[i].Monitor.listDisplay = 'noshow'; - ZMDataModel.zmLog("Monitor " + i + " is marked as hidden in montage"); - } else { - $scope.monitors[i].Monitor.listDisplay = 'show'; - } + } // at this stage, the monitor arrangement is not matching + // the montage order. Its in true order. Let us first process the hiddenOrder part + // now + + for (i = 0; i < montageOrder.length; i++) { + montageOrder[i] = parseInt(montageOrder[i]); + hiddenOrder[i] = parseInt(hiddenOrder[i]); + // $scope.monitors[i].Monitor.sortOrder = montageOrder[i]; + // FIXME: This will briefly show and then hide + // disabled monitors + if (hiddenOrder[i] == 1) { + // $scope.monitors[i].Monitor.listDisplay='noshow'; + $scope.monitors[i].Monitor.listDisplay = 'noshow'; + ZMDataModel.zmLog("Monitor " + i + " is marked as hidden in montage"); + } else { + $scope.monitors[i].Monitor.listDisplay = 'show'; } - // now arrange monitors according to montage order - // FIXME: Incredibly horrible logic - // I really need to organize this properly into one structure - - // empty out monitors as I'll need to insert them as per montageOrder - // remember to assign - $scope.MontageMonitors = []; - - for (i = 0; i < montageOrder.length; i++) { - for (j = 0; j < montageOrder.length; j++) { - if (montageOrder[j] == i) { - $scope.MontageMonitors.push($scope.monitors[j]); - } + } + // now arrange monitors according to montage order + // FIXME: Incredibly horrible logic + // I really need to organize this properly into one structure + + // empty out monitors as I'll need to insert them as per montageOrder + // remember to assign + $scope.MontageMonitors = []; + + for (i = 0; i < montageOrder.length; i++) { + for (j = 0; j < montageOrder.length; j++) { + if (montageOrder[j] == i) { + $scope.MontageMonitors.push($scope.monitors[j]); } } + } - ZMDataModel.zmLog("After reloading saved order, view order is " + montageOrder.toString() + " and hidden order is " + hiddenOrder.toString()); + ZMDataModel.zmLog("view order is " + montageOrder.toString() + " and hidden order is " + hiddenOrder.toString()); + - } // Do we have a saved montage array size? No? |