ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added object detection frame rendering (#2505)

This commit is contained in:
Pliable Pixels 2019-02-08 13:49:00 -05:00 committed by Isaac Connor
parent 0eb1efff8b
commit 2dc935b488
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/views/image.php
View File

@ -77,7 +77,17 @@ if ( empty($_REQUEST['path']) ) {
return;
}
if ( $_REQUEST['fid'] == 'alarm' ) {
if ( $_REQUEST['fid'] == 'objdetect' ) {
$Event = new Event($_REQUEST['eid']);
$path = $Event->Path().'/objdetect.jpg';
unset($Event); # we don't want event object related processing later for this case
if ( !file_exists($path)) {
header('HTTP/1.0 404 Not Found');
Fatal("File ".$path." does not exist. Please make sure store_frame_in_zm is enabled in the object detection config");
}
}
else if ( $_REQUEST['fid'] == 'alarm' ) {
# look for first alarmed frame
$Frame = Frame::find_one(array('EventId'=>$_REQUEST['eid'], 'Type'=>'Alarm'),
array('order'=>'FrameId ASC'));
@ -220,6 +230,7 @@ if ( empty($_REQUEST['path']) ) {
}
}
# we now load the actual image to send
$scale = 0;
if ( !empty($_REQUEST['scale']) ) {
if ( is_numeric($_REQUEST['scale']) ) {