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

Now displays alarm counts as %ges as well as pixels. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1058 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2004-05-05 16:22:04 +00:00
parent d60bcedf72
commit 4e21c59d46
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/zm_config.php.z
View File

@ -148,7 +148,7 @@ $jws = array(
'video' => array( 'w'=>100, 'h'=>80 ),
'image' => array( 'w'=>48, 'h'=>80 ),
'frames' => array( 'w'=>500, 'h'=>300 ),
'stats' => array( 'w'=>600, 'h'=>200 ),
'stats' => array( 'w'=>680, 'h'=>200 ),
'options' => array( 'w'=>760, 'h'=>480 ),
'optionhelp' => array( 'w'=>320, 'h'=>240 ),
'restarting' => array( 'w'=>250, 'h'=>150 ),

42
web/zm_html_view_stats.php
View File

@ -23,11 +23,19 @@ if ( !canView( 'Events' ) )
$view = "error";
return;
}
$result = mysql_query( "select S.*,E.*,Z.Name as ZoneName,M.Name as MonitorName,M.Width,M.Height from Stats as S left join Events as E on S.EventId = E.Id left join Zones as Z on S.ZoneId = Z.Id left join Monitors as M on E.MonitorId = M.Id where S.EventId = '$eid' and S.FrameId = '$fid' order by S.ZoneId" );
$result = mysql_query( "select S.*,E.*,Z.Name as ZoneName,Z.Units,Z.LoX,Z.LoY,Z.HiX,Z.HiY,M.Name as MonitorName,M.Width,M.Height from Stats as S left join Events as E on S.EventId = E.Id left join Zones as Z on S.ZoneId = Z.Id left join Monitors as M on E.MonitorId = M.Id where S.EventId = '$eid' and S.FrameId = '$fid' order by S.ZoneId" );
if ( !$result )
die( mysql_error() );
while ( $row = mysql_fetch_assoc( $result ) )
{
if ( $row['Units'] == 'Percent' )
{
$row['LoX'] = round(($row['LoX']*($row['Width']-1))/100);
$row['LoY'] = round(($row['LoY']*($row['Height']-1))/100);
$row['HiX'] = round(($row['HiX']*($row['Width']-1))/100);
$row['HiY'] = round(($row['HiY']*($row['Height']-1))/100);
}
$row['Area'] = (($row['HiX']-$row['LoX'])+1)*(($row['HiY']-$row['LoY'])+1);
$stats[] = $row;
}
@ -44,21 +52,21 @@ function closeWindow()
}
</script>
</head>
<body>
<table width="96%" border="0">
<body scroll="auto">
<table align="center" width="96%" border="0">
<tr>
<td align="left" class="smallhead"><b><?= $zmSlangFrame ?> <?= $eid."-".$fid ?></b></td>
<td align="right" class="text"><a href="javascript: closeWindow();"><?= $zmSlangClose ?></a></td>
</tr>
<tr><td colspan="2"><table width="100%" border="0" bgcolor="#7F7FB2" cellpadding="3" cellspacing="1"><tr bgcolor="#FFFFFF">
<td class="smallhead"><?= $zmSlangZone ?></td>
<td class="smallhead" align="right"><?= $zmSlangAlarmPx ?></td>
<td class="smallhead" align="right"><?= $zmSlangFilterPx ?></td>
<td class="smallhead" align="right"><?= $zmSlangBlobPx ?></td>
<td class="smallhead" align="right"><?= $zmSlangBlobs ?></td>
<td class="smallhead" align="right"><?= $zmSlangBlobSizes ?></td>
<td class="smallhead" align="right"><?= $zmSlangAlarmLimits ?></td>
<td class="smallhead" align="right"><?= $zmSlangScore ?></td>
<td class="smallhead" align="center"><?= $zmSlangAlarmPx ?></td>
<td class="smallhead" align="center"><?= $zmSlangFilterPx ?></td>
<td class="smallhead" align="center"><?= $zmSlangBlobPx ?></td>
<td class="smallhead" align="center"><?= $zmSlangBlobs ?></td>
<td class="smallhead" align="center"><?= $zmSlangBlobSizes ?></td>
<td class="smallhead" align="center"><?= $zmSlangAlarmLimits ?></td>
<td class="smallhead" align="center"><?= $zmSlangScore ?></td>
</tr>
<?php
if ( count($stats) )
@ -68,13 +76,13 @@ if ( count($stats) )
?>
<tr bgcolor="#FFFFFF">
<td class="text"><?= $stat['ZoneName'] ?></td>
<td class="text" align="right"><?= $stat['AlarmPixels'] ?></td>
<td class="text" align="right"><?= $stat['FilterPixels'] ?></td>
<td class="text" align="right"><?= $stat['BlobPixels'] ?></td>
<td class="text" align="right"><?= $stat['Blobs'] ?></td>
<td class="text" align="right"><?= $stat['MinBlobSize']."-".$stat['MaxBlobSize'] ?></td>
<td class="text" align="right"><?= $stat['MinX'].",".$stat['MinY']."-".$stat['MaxX'].",".$stat['MaxY'] ?></td>
<td class="text" align="right"><?= $stat['Score'] ?></td>
<td class="text" align="center"><?= sprintf( "%d (%d%%)", $stat['AlarmPixels'], (100*$stat['AlarmPixels']/$stat['Area']) ) ?></td>
<td class="text" align="center"><?= sprintf( "%d (%d%%)", $stat['FilterPixels'], (100*$stat['FilterPixels']/$stat['Area']) ) ?></td>
<td class="text" align="center"><?= sprintf( "%d (%d%%)", $stat['BlobPixels'], (100*$stat['BlobPixels']/$stat['Area']) ) ?></td>
<td class="text" align="center"><?= $stat['Blobs'] ?></td>
<td class="text" align="center"><?= sprintf( "%d-%d (%d%%-%d%%)", $stat['MinBlobSize'], $stat['MaxBlobSize'], (100*$stat['MinBlobSize']/$stat['Area']), (100*$stat['MaxBlobSize']/$stat['Area']) ) ?></td>
<td class="text" align="center"><?= $stat['MinX'].",".$stat['MinY']."-".$stat['MaxX'].",".$stat['MaxY'] ?></td>
<td class="text" align="center"><?= $stat['Score'] ?></td>
</tr>
<?php
}