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

Bug 346 - Stills event view now shows all frames. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2070 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2006-11-16 19:06:31 +00:00
parent fd3eb96298
commit c8b03f530c
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/zm_html_view_event.php
View File

@ -449,12 +449,12 @@ else
{
if ( $paged && !empty($page) )
{
$lo_frame_id = (($page-1)*$frames_per_page);
$lo_frame_id = (($page-1)*$frames_per_page)+1;
$hi_frame_id = min( $page*$frames_per_page, $event['Frames'] );
}
else
{
$lo_frame_id = 0;
$lo_frame_id = 1;
$hi_frame_id = $event['Frames'];
}
$sql = "select * from Frames where EventId = '$eid'";
@ -467,7 +467,7 @@ else
$frames = array();
while( $frame = mysql_fetch_assoc( $result ) )
{
$frames[] = $frame;
$frames[$frame['FrameId']] = $frame;
}
mysql_free_result( $result );
?>
@ -479,9 +479,12 @@ else
$thumb_height = (int)round($event['Height']/ZM_WEB_FRAMES_PER_LINE);
$thumb_scale = (int)round( SCALE_BASE/ZM_WEB_FRAMES_PER_LINE );
for ( $i = 0; $i < count($frames); $i++ )
for ( $i = $lo_frame_id; $i <= $hi_frame_id; $i++ )
{
$frame = $frames[$i];
if ( !($frame = $frames[$i]) )
{
$frame = array( 'FrameId'=>$i, 'Type'=>'Normal' );
}
$image_data = getImageSrc( $event, $frame, $thumb_scale );
?>
<a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=frame&eid=<?= $eid ?>&fid=<?= $frame['FrameId'] ?>&scale=<?= $scale ?>', 'zmImage', <?= reScale( $event['Width'], $scale )+$jws['image']['w'] ?>, <?= reScale( $event['Height'], $scale )+$jws['image']['h'] ?> );"><img src="<?= $image_data['thumbPath'] ?>" width="<?= $thumb_width ?>" height="<?= $thumb_height ?>" class="<?= $image_data['imageClass'] ?>" alt="<?= $frame['FrameId'] ?>/<?= $frame['Type']=='alarm'?$frame['Score']:0 ?>"></a>

6
web/zm_html_view_frame.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//
error_reporting( E_ALL );
if ( !canView( 'Events' ) )
{
$view = "error";
@ -36,7 +35,10 @@ if ( $fid )
$result = mysql_query( "select * from Frames where EventId = '$eid' and FrameId = '$fid'" );
if ( !$result )
die( mysql_error() );
$frame = mysql_fetch_assoc( $result );
if ( !($frame = mysql_fetch_assoc( $result )) )
{
$frame = array( 'FrameId'=>$fid, 'Type'=>'Normal', 'Score'=>0 );
}
mysql_free_result( $result );
}
else