diff options
Diffstat (limited to 'www/js')
| -rwxr-xr-x | www/js/DataModel.js | 2 | ||||
| -rw-r--r-- | www/js/EventCtrl.js | 77 | ||||
| -rwxr-xr-x | www/js/app.js | 4 |
3 files changed, 80 insertions, 3 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 4fd3a791..1b83ce48 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -2028,7 +2028,7 @@ angular.module('zmApp.controllers') } } - return "(Unknown)"; + return undefined; }, getImageMode: function (id) { diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 3468d988..73c6c77d 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -155,7 +155,7 @@ angular.module('zmApp.controllers') if (NVRDataModel.getLogin().enableThumbs) { NVRDataModel.debug ("--> thumbnail means increasing row size"); eventsListScrubHeight=370; - eventsListDetailsHeight=300; + eventsListDetailsHeight=330; } @@ -380,6 +380,7 @@ angular.module('zmApp.controllers') // console.log ("WE GOT EVENTS="+JSON.stringify(data)); var myevents = data; + NVRDataModel.debug("EventCtrl: success, got " + myevents.length + " events"); var loginData = NVRDataModel.getLogin(); for (var i = 0; i < myevents.length; i++) @@ -418,6 +419,46 @@ angular.module('zmApp.controllers') myevents[i].Event.BasePath = computeBasePath(myevents[i]); myevents[i].Event.relativePath = computeRelativePath(myevents[i]); + // get thumbW/H + + var tempMon = NVRDataModel.getMonitorObject(myevents[i].Event.MonitorId); + if (tempMon != undefined) { + + var ratio; + var mw = parseInt(tempMon.Monitor.Width); + var mh = parseInt(tempMon.Monitor.Height); + var mo = Math.abs(parseInt(tempMon.Monitor.Orientation)); + + // scale by X if width > height + if (mw > mh ) { + ratio = mw / zm.thumbWidth; + myevents[i].Event.thumbWidth = 200; + myevents[i].Event.thumbHeight = Math.round(mh/ratio); + } + else { + + ratio = mh / zm.thumbWidth; + myevents[i].Event.thumbHeight = 200; + myevents[i].Event.thumbWidth = Math.round(mw/ratio); + + } + + if (mo == 90) { + var t = myevents[i].Event.thumbHeight; + myevents[i].Event.thumbWidth = myevents[i].Event.thumbHeight; + myevents[i].Event.thumbHeight = t; + + + } // swap + + console.log ("--------->" +"MW:"+myevents[i].Event.thumbWidth+ " MH:"+ myevents[i].Event.thumbHeight + " for Monitor:" + myevents[i].Event.MonitorName); + + + + + + } + // in multiserver BasePath is login url for frames // http://login.url/index.php?view=frame&eid=19696772&fid=21 @@ -2919,6 +2960,40 @@ angular.module('zmApp.controllers') myevents[i].Event.relativePath = computeRelativePath(myevents[i]); myevents[i].Event.height = eventsListDetailsHeight; + // get thumbW/H + + var tempMon = NVRDataModel.getMonitorObject(myevents[i].Event.MonitorId); + if (tempMon != undefined) { + + var ratio; + var mw = parseInt(tempMon.Monitor.Width); + var mh = parseInt(tempMon.Monitor.Height); + var mo = Math.abs(parseInt(tempMon.Monitor.Orientation)); + + // scale by X if width > height + if (mw > mh ) { + ratio = mw / zm.thumbWidth; + myevents[i].Event.thumbWidth = 200; + myevents[i].Event.thumbHeight = Math.round(mh/ratio); + } + else { + + ratio = mh / zm.thumbWidth; + myevents[i].Event.thumbHeight = 200; + myevents[i].Event.thumbWidth = Math.round(mw/ratio); + + } + + if (mo == 90) { + var t = myevents[i].Event.thumbHeight; + myevents[i].Event.thumbWidth = myevents[i].Event.thumbHeight; + myevents[i].Event.thumbHeight = t; + + + } // swap + } + + if (myevents[i].Event.imageMode == 'path') //if (1) myevents[i].Event.videoPath = myevents[i].Event.baseURL + "/events/" + myevents[i].Event.relativePath + myevents[i].Event.DefaultVideo; diff --git a/www/js/app.js b/www/js/app.js index 15c6aeab..a4fafc9e 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -29,6 +29,7 @@ angular.module('zmApp', [ 'jett.ionic.scroll.sista', 'uk.ac.soton.ecs.videogular.plugins.cuepoints', 'dcbImgFallback', + 'ngImageAppear' ]) @@ -102,7 +103,8 @@ angular.module('zmApp', [ maxGifWidth: 800.0, quantSample: 15, hashSecret: 'unused at the moment', - forceMontageReloadDelay: 3600 // 1 hr + forceMontageReloadDelay: 3600, // 1 hr, + thumbWidth:200 }) |