From cca9fb13cc064f38027f431471f12a5449a90061 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@tesla.com>
Date: Tue, 14 Nov 2017 15:33:31 -0800
Subject: [PATCH] add FPS to console

---
 web/includes/Event.php              | 2 +-
 web/skins/classic/views/console.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/web/includes/Event.php b/web/includes/Event.php
index 189f4eefe..b56c9962a 100644
--- a/web/includes/Event.php
+++ b/web/includes/Event.php
@@ -215,7 +215,7 @@ class Event {
     $eventPath = $this->Path();
     if ( file_exists( $eventPath.'/snapshot.jpg' ) ) {
       $frame = 'snapshot';
-      $humbData = array('Path'=>$eventPath.'/snapshot.jpg'); 
+      $thumbData = array('Path'=>$eventPath.'/snapshot.jpg'); 
     } else {
 # Load the frame with the highest score to use as a thumbnail
       if ( !($frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventId=? AND Score=? ORDER BY FrameId LIMIT 1', NULL, array( $this->{'Id'}, $this->{'MaxScore'} ) )) ) {
diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 4433b0afc..92c1a82c7 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -212,7 +212,10 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
   }
 ?>
             <td class="colName"><?php echo makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], ($monitor['Function'] != 'None') && canView('Stream') ) ?></td>
-            <td class="colFunction"><?php echo makePopupLink( '?view=function&amp;mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.translate('Fn'.$monitor['Function']).( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?></td>
+            <td class="colFunction">
+              <?php echo makePopupLink( '?view=function&amp;mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.translate('Fn'.$monitor['Function']).( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?><br/>
+<?php echo $monitor['CaptureFPS'] . ( ( $monitor['Function'] == 'Mocord' or $monitor['Function'] == 'Modect' ) ? ' / ' . $monitor['AnalysisFPS'] : '' ) . ' FPS' ?>
+              </td>
 <?php
   if ( count($servers) ) { ?>
             <td class="colServer"><?php $Server = isset($ServersById[$monitor['ServerId']]) ? $ServersById[$monitor['ServerId']] : new Server( $monitor['ServerId'] ); echo $Server->Name(); ?></td>