diff options
| author | PliablePixels <pliablepixels@gmail.com> | 2015-08-19 15:12:58 -0400 |
|---|---|---|
| committer | PliablePixels <pliablepixels@gmail.com> | 2015-08-19 15:12:58 -0400 |
| commit | d2b35b896c5960b27047321769186b32819e9a0b (patch) | |
| tree | 92172015955f95e3db1e139f647a943acc60ec6e /www/templates | |
| parent | 9f0172691266b92b5204e440c0b31188f0eeb4ac (diff) | |
Fixed monitor view and montage performance - nph-zms instances were building up at the server killing it after repeated use. phew
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/monitors-modal.html | 5 | ||||
| -rw-r--r-- | www/templates/montage.html | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 04596dca..9ee970c9 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -11,12 +11,15 @@ <!-- android needs this 100vh - otherwise max- does not work --> <div style="height: 100vh;" class="main"> + <img imageonload="finishedLoadingImage()" image-spinner-loader="lines" - image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitorId}}&maxfps={{LoginData.maxFPS}}&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.modalRand}}" ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}" on-swipe-left="onSwipeLeft(monitorId,-1)" on-swipe-right="onSwipeRight(monitorId,1)" /> + image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/nph-zms?mode=single&monitor={{monitorId}}&maxfps={{LoginData.maxFPS}}&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.modalRand}}" ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}" on-swipe-left="onSwipeLeft(monitorId,-1)" on-swipe-right="onSwipeRight(monitorId,1)" /> </div> </ion-scroll> + <span style="background-color:red; color:white"> Modal Rand:{{$root.modalRand}} </span> </ion-content> + <div ng-show="isControllable=='1' && showPTZ"> <div class="ptzcentered"> diff --git a/www/templates/montage.html b/www/templates/montage.html index fa95234f..c3ad91e5 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -45,13 +45,20 @@ <!-- back to ng-src. spinner was not updating when rand changes--> <!-- FIXME: Scale is 50% hardcoded --> <!-- moving to single so I can rely on rand for reloads --> - <img id="img-$index" image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=jpeg&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.rand}}" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" + + <div ng-if="!isModalActive"> + <img id="img-$index" image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.rand}}" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId)" on-hold="onHold($index)" on-release="onRelease($index)" style="display:block;" image-spinner-loader="lines" /> + </div> + + <div ng-if="isModalActive"> + <img id="img-$index" ng-src="img/novideo.png" style="display:block;" width="{{((devWidth)/(7-monitorSize[$index]))}}px;"/> + </div> |