Skip to content

Commit

Permalink
#963 revert dynamic size changes, go back to collection repeat. Still…
Browse files Browse the repository at this point in the history 
… needs cleanup for large thumbs
  • Loading branch information
@pliablepixels
pliablepixels committed Sep 6, 2020
1 parent 47a8f79 commit e399b0a
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 82 deletions.
120 changes: 42 additions & 78 deletions www/js/EventCtrl.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,14 +195,23 @@ angular.module('zmApp.controllers')
//console.log ("********* BEFORE ENTER");
//

$scope.thumbClass = 'small';


var ld = NVR.getLogin();
if (ld.eventViewThumbsSize == 'large') {
NVR.debug ('Switching to big thumbs style');
$scope.thumbClass = 'large';
$scope.rowHeightRegular = 400;
$scope.rowHeightExpanded = $scope.rowHeightRegular + 200;
} else {
NVR.debug ('using small thumbs style');
$scope.thumbClass = 'small';
$scope.rowHeightRegular = 250;
$scope.rowHeightExpanded = $scope.rowHeightRegular + 200;

}

$scope.rowHeight = $scope.rowHeightRegular;
$scope.mid = '';

$scope.$on ("alarm", function() {
Expand Down Expand Up @@ -2024,9 +2033,10 @@ angular.module('zmApp.controllers')
if (!$ionicScrollDelegate.$getByHandle("mainScroll")) $scope.navTitle = "";
if (!$ionicScrollDelegate.$getByHandle("mainScroll").getScrollPosition()) $scope.navTitle = "";
var scrl = parseFloat($ionicScrollDelegate.$getByHandle("mainScroll").getScrollPosition().top);
eventHeight = $scope.rowHeight;
if (eventHeight == 0 && !$scope.eventsBeingLoaded && document.getElementById('item-0') != null) {
eventHeight = document.getElementById('item-0').offsetHeight;
NVR.debug("scrl: " + scrl + ", eventHeight: " + eventHeight);
//NVR.debug("scrl: " + scrl + ", eventHeight: " + eventHeight);
}
var item = 0;
if (eventHeight) {
Expand Down Expand Up @@ -2129,6 +2139,7 @@ angular.module('zmApp.controllers')

NVR.debug("EventCtrl:Old event scrub will hide now");
oldEvent.Event.ShowScrub = false;
event.Event.rowHeight = $scope.rowHeightRegular;
oldEvent = "";
}

Expand All @@ -2155,7 +2166,7 @@ angular.module('zmApp.controllers')
if (event.Event.ShowScrub == true) // turn on display now
{


event.Event.rowHeight = $scope.rowHeightExpanded;
if (groupType == 'alarms') {
// $ionicListDelegate.canSwipeItems(false);
//NVR.debug ("Disabling flag swipe as alarms are swipable");
Expand Down Expand Up @@ -2263,7 +2274,9 @@ angular.module('zmApp.controllers')

};

event.Event.rowHeight = $scope.rowHeightExpanded;
$ionicScrollDelegate.resize();

$scope.mycarousel.index = 0;
$scope.ionRange.index = 1;
//console.log("**Resetting range");
Expand Down Expand Up @@ -2371,6 +2384,14 @@ angular.module('zmApp.controllers')
var objheight = parseInt(locobject.height);
// console.log("top location is " + toplocation);
var distdiff = parseInt($rootScope.devHeight) - toplocation - objheight;

if (distdiff < $scope.rowHeight) // size of the scroller with bars
{
scrollbynumber = $scope.rowHeight - distdiff;
$ionicScrollDelegate.$getByHandle("mainScroll").scrollBy(0, scrollbynumber, true);

// we need to scroll up to make space
}
// console.log("*****Space at bottom is " + distdiff);
} // end of groupType == scrub
} // end of ShowScrub == true
Expand All @@ -2379,7 +2400,7 @@ angular.module('zmApp.controllers')
//
// $ionicListDelegate.canSwipeItems(true);
// NVR.debug ("enabling options swipe");

event.Event.rowHeight = $scope.rowHeightRegular;
$ionicSideMenuDelegate.canDragContent(true);
$ionicScrollDelegate.resize();

Expand Down Expand Up @@ -2908,6 +2929,9 @@ angular.module('zmApp.controllers')
var th = computeThumbnailSize(mw, mh, mo);
myevents[currentPagePosition].Event.thumbWidth = th.w;
myevents[currentPagePosition].Event.thumbHeight = th.h;
myevents[currentPagePosition].Event.rowHeight = $scope.rowHeight;
// myevents[currentPagePosition].Event.rowHeight = th.h + 50;
// console.log ("************* RH:"+myevents[currentPagePosition].Event.rowHeight);
}

// in multiserver BasePath is login url for frames
Expand Down Expand Up @@ -2978,88 +3002,28 @@ angular.module('zmApp.controllers')
mh = tmp;
}
var ld = NVR.getLogin();
var landscape = ($rootScope.devWidth > $rootScope.devHeight) ? true:false;

// landscape
if ($rootScope.devWidth > $rootScope.devHeight) {
var maxRowHeight = $scope.rowHeight - ($scope.thumbClass=='large'?200: 120);

if (ld.eventViewThumbsSize == 'large') {
return calculateAspectRatioFit(mw, mh, 0.8* $rootScope.devWidth, 1.5 * $rootScope.devHeight);

} else {
return calculateAspectRatioFit(mw, mh, 0.5 * $rootScope.devWidth, 0.7 * $rootScope.devHeight);

}
} else {
// portrait
if (ld.eventViewThumbsSize == 'large') {
return calculateAspectRatioFit(mw, mh, 0.9* $rootScope.devWidth, 0.4 * $rootScope.devHeight);

} else {
return calculateAspectRatioFit(mw, mh, 0.3 * $rootScope.devWidth, 0.3 * $rootScope.devHeight);

}

}


/*
if (ld.eventViewThumbsSize == 'large') {
tw = Math.round(0.9 * $rootScope.devWidth);
th = Math.round(0.7 * $rootScope.devHeight);
} else {
tw = Math.round(0.4 * $rootScope.devWidth);
th = Math.round(0.3 * $rootScope.devHeight);
}
var ratio = mw / mh;
var result = {
w: 0,
h: 0
};
if (landscape) {
return calculateAspectRatioFit(mw, mh, 0.8* $rootScope.devWidth, maxRowHeight);
} else {
return calculateAspectRatioFit(mw, mh, 0.5* $rootScope.devWidth, maxRowHeight);
}

*/
/* seems I really should be using strings due to horz and very
but luckily parseInt will make them 0 which gets treated as "nothing to do"
'0' => translate('Normal'),
'90' => translate('RotateRight'),
'180' => translate('Inverted'),
'270' => translate('RotateLeft'),
'horz' => translate('FlippedHori'),
'vert' => translate('FlippedVert')
*/
/*
if (mo != 0 && mo != 180) {
} else { // small

var tmp = mw;
mw = mh;
mh = tmp;
}
if (landscape) {
return calculateAspectRatioFit(mw, mh, 0.6* $rootScope.devWidth, maxRowHeight);

if (mw > mh) {
mw = tw;
mh = tw / ratio;
if (mh > th) {
mw = th * ratio;
mh = th;
} else {
return calculateAspectRatioFit(mw, mh, 0.4* $rootScope.devWidth, maxRowHeight);
}
} else if (mh > mw) {
mh = th;
mw = th * ratio;
} else {
mh = th;
mw = tw;
}
mw = Math.round(mw);
mh = Math.round(mh);

result.w = mw;
result.h = mh;
return result;
*/
}

}


Expand Down
9 changes: 5 additions & 4 deletions www/templates/events.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@
<!-- lets make sure the events list is not empty as collection repeat needs height -->
<div ng-if="!eventsBeingLoaded">
<ion-list show-delete="eventList.showDelete">
<div ng-repeat="event in events| filter:search.text | eventListFilter" id="item-{{$index}}"
style="min-height: 50px;">
<ion-item force-refresh-images="true" on-swipe-left="checkSwipe($index);" force-refresh-images="true">

<ion-item force-refresh-images="true" collection-repeat="event in events| filter:search.text | eventListFilter" force-refresh-images=true
item-height="event.Event.rowHeight" id="item-{{$index}}" on-swipe-left="checkSwipe($index);" force-refresh-images="true" >

<span
style="float:left;margin-top:-18px;background-color:#96281B;color:#fff;font-size:11px;opacity:0.7;border-radius: 0px 0px 5px 5px;">&nbsp;&nbsp;&nbsp;
<i
Expand Down Expand Up @@ -254,7 +255,7 @@
<!-- isGroupShown -->
</div>
</ion-item>
</div>

</ion-list>
</div>
<!-- !eventsBeingLoaded-->
Expand Down

0 comments on commit e399b0a

Please sign in to comment.