Bug 301 - Added monitor specific alarm maximum FPS

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1901 e3e1d417-86f3-4887-817a-d78f3d33393f

web/zm_html_view_monitor.php

@@ -96,6 +96,7 @@ else
 	$monitor['FrameSkip'] = 0;
 	$monitor['EventPrefix'] = 'Event-';
 	$monitor['MaxFPS'] = "";
+	$monitor['AlarmMaxFPS'] = "";
 	$monitor['FPSReportInterval'] = 1000;
 	$monitor['RefBlendPerc'] = 7;
 	$monitor['DefaultRate'] = '100';
@@ -111,7 +112,7 @@ if ( !isset( $new_monitor ) )
 }
 if ( !empty($preset) )
 {
-	$result = mysql_query( "select Type, Device, Channel, Format, Host, Port, Path, Width, Height, Palette, MaxFPS, Controllable, ControlId, ControlDevice, ControlAddress, DefaultRate, DefaultScale from MonitorPresets where Id = '$preset'" );
+	$result = mysql_query( "select Type, Device, Channel, Format, Host, Port, Path, Width, Height, Palette, MaxFPS, AlarmMaxFPS, Controllable, ControlId, ControlDevice, ControlAddress, DefaultRate, DefaultScale from MonitorPresets where Id = '$preset'" );
 	if ( !$result )
 		die( mysql_error() );
 	$preset = mysql_fetch_assoc( $result );
@@ -157,6 +158,10 @@ function validateForm(form)
 	{
 		errors[errors.length] = "<?= $zmSlangBadMaxFPS ?>";
 	}
+	if ( form.elements['new_monitor[AlarmMaxFPS]'].value && !(parseFloat(form.elements['new_monitor[AlarmMaxFPS]'].value) > 0 ) )
+	{
+		errors[errors.length] = "<?= $zmSlangBadAlarmMaxFPS ?>";
+	}
 	if ( !form.elements['new_monitor[RefBlendPerc]'].value || !(parseInt(form.elements['new_monitor[RefBlendPerc]'].value) > 0 ) )
 	{
 		errors[errors.length] = "<?= $zmSlangBadRefBlendPerc ?>";
@@ -388,6 +393,7 @@ if ( $tab != 'general' )
 <input type="hidden" name="new_monitor[LinkedMonitors]" value="<?= $new_monitor['LinkedMonitors'] ?>">
 <input type="hidden" name="new_monitor[RefBlendPerc]" value="<?= $new_monitor['RefBlendPerc'] ?>">
 <input type="hidden" name="new_monitor[MaxFPS]" value="<?= $new_monitor['MaxFPS'] ?>">
+<input type="hidden" name="new_monitor[AlarmMaxFPS]" value="<?= $new_monitor['AlarmMaxFPS'] ?>">
 <?php
 	if ( isset($new_monitor['Triggers']) )
 	{
@@ -514,6 +520,7 @@ switch ( $tab )
 <tr><td align="left" class="text"><?= $zmSlangEnabled ?></td><td align="left" class="text"><input type="checkbox" name="new_monitor[Enabled]" value="1" class="form-noborder"<?php if ( !empty($new_monitor['Enabled']) ) { ?> checked<?php } ?>></td></tr>
 <tr><td align="left" class="text"><?= $zmSlangLinkedMonitors ?></td><td align="left" class="text"><input type="text" name="new_monitor[LinkedMonitors]" value="<?= $new_monitor['LinkedMonitors'] ?>" size="16" class="form">&nbsp;<a href="#" onClick="selectLinkedMonitors()"><?= $zmSlangSelect ?></a></td></tr>
 <tr><td align="left" class="text"><?= $zmSlangMaximumFPS ?></td><td align="left" class="text"><input type="text" name="new_monitor[MaxFPS]" value="<?= $new_monitor['MaxFPS'] ?>" size="6" class="form"></td></tr>
+<tr><td align="left" class="text"><?= $zmSlangAlarmMaximumFPS ?></td><td align="left" class="text"><input type="text" name="new_monitor[AlarmMaxFPS]" value="<?= $new_monitor['AlarmMaxFPS'] ?>" size="6" class="form"></td></tr>
 <tr><td align="left" class="text"><?= $zmSlangRefImageBlendPct ?></td><td align="left" class="text"><input type="text" name="new_monitor[RefBlendPerc]" value="<?= $new_monitor['RefBlendPerc'] ?>" size="4" class="form"></td></tr>
 <tr><td align="left" class="text"><?= $zmSlangTriggers ?></td><td align="left" class="text">
 <?php

web/zm_lang_cs_cz.php

@@ -83,6 +83,7 @@ $zmSlangAlarmBrFrames        = 'Alarm<br/>Sn
 $zmSlangAlarmFrame           = 'Alarm snímek';
 $zmSlangAlarmFrameCount      = 'Poèet alarm snímkù';
 $zmSlangAlarmLimits          = 'Limity alarmu';
+$zmSlangAlarmMaximumFPS      = 'Alarm Maximum FPS';
 $zmSlangAlarmPx              = 'Alarm Px';
 $zmSlangAlarmRGBUnset        = 'You must set an alarm RGB colour';
 $zmSlangAlert                = 'Pozor';
@@ -132,6 +133,7 @@ $zmSlangAutoVideoAbbr        = 'Video';
 $zmSlangAutoVideoEvents      = 'Automatically create video for all matches';
 $zmSlangAvgBrScore           = 'Prùm.<br/>Skóre';
 $zmSlangBadAlarmFrameCount   = 'Alarm frame count must be an integer of one or more';
+$zmSlangBadAlarmMaxFPS       = 'Alarm Maximum FPS must be a positive integer or floating point value';
 $zmSlangBadChannel           = 'Channel must be set to an integer of zero or more';
 $zmSlangBadDevice            = 'Device must be set to a valid value';
 $zmSlangBadFormat            = 'Format must be set to an integer of zero or more';

web/zm_lang_de_de.php

@@ -83,6 +83,7 @@ $zmSlangAlarmBrFrames        = 'Alarm<br />Bilder';
 $zmSlangAlarmFrame           = 'Alarm Bilder';
 $zmSlangAlarmFrameCount      = 'Alarm Bilderanzahl';
 $zmSlangAlarmLimits          = 'Alarm Limits';
+$zmSlangAlarmMaximumFPS      = 'Alarm Maximum FPS';
 $zmSlangAlarmPx              = 'Alarm Pixel';
 $zmSlangAlarmRGBUnset        = 'You must set an alarm RGB colour';
 $zmSlangAlert                = 'Alarm';
@@ -132,6 +133,7 @@ $zmSlangAutoVideoAbbr        = 'Video';
 $zmSlangAutoVideoEvents      = 'Automatically create video for all matches';
 $zmSlangAvgBrScore           = 'Mitt.<br/>Z&auml;hler';
 $zmSlangBadAlarmFrameCount   = 'Alarm frame count must be an integer of one or more';
+$zmSlangBadAlarmMaxFPS       = 'Alarm Maximum FPS must be a positive integer or floating point value';
 $zmSlangBadChannel           = 'Channel must be set to an integer of zero or more';
 $zmSlangBadDevice            = 'Device must be set to a valid value';
 $zmSlangBadFormat            = 'Format must be set to an integer of zero or more';

web/zm_lang_dk_dk.php

@@ -84,6 +84,7 @@ $zmSlangAlarmBrFrames        = 'Alarm<br/>Billeder';
 $zmSlangAlarmFrame           = 'Alarm Billede';
 $zmSlangAlarmFrameCount      = 'Alarm Billede Tæller';
 $zmSlangAlarmLimits          = 'Alarm Begrændsing';
+$zmSlangAlarmMaximumFPS      = 'Alarm Maximum FPS';
 $zmSlangAlarmPx              = 'Alarm Px';
 $zmSlangAlarmRGBUnset        = 'You must set an alarm RGB colour';
 $zmSlangAlert                = 'Alarm';
@@ -133,6 +134,7 @@ $zmSlangAutoVideoAbbr        = 'Video';
 $zmSlangAutoVideoEvents      = 'Automatically create video for all matches';
 $zmSlangAvgBrScore           = 'Avg.<br/>Skore';
 $zmSlangBadAlarmFrameCount   = 'Alarm frame count must be an integer of one or more';
+$zmSlangBadAlarmMaxFPS       = 'Alarm Maximum FPS must be a positive integer or floating point value';
 $zmSlangBadChannel           = 'Channel must be set to an integer of zero or more';
 $zmSlangBadDevice            = 'Device must be set to a valid value';
 $zmSlangBadFormat            = 'Format must be set to an integer of zero or more';

web/zm_lang_en_gb.php

@@ -83,6 +83,7 @@ $zmSlangAlarmBrFrames        = 'Alarm<br/>Frames';
 $zmSlangAlarmFrame           = 'Alarm Frame';
 $zmSlangAlarmFrameCount      = 'Alarm Frame Count';
 $zmSlangAlarmLimits          = 'Alarm Limits';
+$zmSlangAlarmMaximumFPS      = 'Alarm Maximum FPS';
 $zmSlangAlarmPx              = 'Alarm Px';
 $zmSlangAlarmRGBUnset        = 'You must set an alarm RGB colour';
 $zmSlangAlert                = 'Alert';
@@ -131,6 +132,7 @@ $zmSlangAutoUploadAbbr       = 'Upload';
 $zmSlangAutoVideoEvents      = 'Automatically create video for all matches';
 $zmSlangAutoVideoAbbr        = 'Video';
 $zmSlangAvgBrScore           = 'Avg.<br/>Score';
+$zmSlangBadAlarmMaxFPS       = 'Alarm Maximum FPS must be a positive integer or floating point value';
 $zmSlangBadNameChars         = 'Names may only contain alphanumeric characters plus hyphen and underscore';
 $zmSlangBadMaxFPS            = 'Maximum FPS must be a positive integer or floating point value';
 $zmSlangBadRefBlendPerc      = 'Reference blendpercentage must be a positive integer';

web/zm_lang_es_ar.php

@@ -34,6 +34,7 @@ $zmSlangAlarmBrFrames        = 'Alarma<br/>Cuadros';
 $zmSlangAlarmFrameCount      = 'Alarm Frame Count';
 $zmSlangAlarmFrame           = 'Cuadro Alarma';
 $zmSlangAlarmLimits          = 'Alarm Limits';
+$zmSlangAlarmMaximumFPS      = 'Alarm Maximum FPS';
 $zmSlangAlarmPx              = 'Alarm Px';
 $zmSlangAlarmRGBUnset        = 'You must set an alarm RGB colour';
 $zmSlangAlert                = 'Alerta';
@@ -84,6 +85,7 @@ $zmSlangAutoVideoAbbr        = 'Video';
 $zmSlangAutoVideoEvents      = 'Automatically create video for all matches';
 $zmSlangAvgBrScore           = 'Punt.<br/>Promedio';
 $zmSlangBadAlarmFrameCount   = 'Alarm frame count must be an integer of one or more';
+$zmSlangBadAlarmMaxFPS       = 'Alarm Maximum FPS must be a positive integer or floating point value';
 $zmSlangBadChannel           = 'Channel must be set to an integer of zero or more';
 $zmSlangBadDevice            = 'Device must be set to a valid value';
 $zmSlangBadFormat            = 'Format must be set to an integer of zero or more';

web/zm_lang_fr_fr.php

@@ -83,6 +83,7 @@ $zmSlangAlarmBrFrames        = 'Images<br/>alarme';
 $zmSlangAlarmFrameCount      = 'Alarm Frame Count';
 $zmSlangAlarmFrame           = 'Image alarme';
 $zmSlangAlarmLimits          = 'Limites alarme';
+$zmSlangAlarmMaximumFPS      = 'Alarm Maximum FPS';
 $zmSlangAlarmPx              = 'Px Alarme';
 $zmSlangAlarmRGBUnset        = 'You must set an alarm RGB colour';
 $zmSlangAlert                = 'Alerte';
@@ -132,6 +133,7 @@ $zmSlangAutoVideoAbbr        = 'Video';
 $zmSlangAutoVideoEvents      = 'Automatically create video for all matches';
 $zmSlangAvgBrScore           = 'Score<br/>moy.';
 $zmSlangBadAlarmFrameCount   = 'Alarm frame count must be an integer of one or more';
+$zmSlangBadAlarmMaxFPS       = 'Alarm Maximum FPS must be a positive integer or floating point value';
 $zmSlangBadChannel           = 'Channel must be set to an integer of zero or more';
 $zmSlangBadDevice            = 'Device must be set to a valid value';
 $zmSlangBadFormat            = 'Format must be set to an integer of zero or more';

web/zm_lang_it_it.php

@@ -86,6 +86,7 @@ $zmSlangAlarmBrFrames        = 'Immagini<br/>Allarme';
 $zmSlangAlarmFrameCount      = 'Allarme Conta frame';
 $zmSlangAlarmFrame           = 'Immagine Allarme';
 $zmSlangAlarmLimits          = 'Limiti Allarme';
+$zmSlangAlarmMaximumFPS      = 'Alarm Maximum FPS';
 $zmSlangAlarmPx              = 'Px Allarme';
 $zmSlangAlarmRGBUnset        = 'You must set an alarm RGB colour';
 $zmSlangAlert                = 'Attenzione';
@@ -135,6 +136,7 @@ $zmSlangAutoVideoAbbr        = 'Video';
 $zmSlangAutoVideoEvents      = 'Automatically create video for all matches';
 $zmSlangAvgBrScore           = 'Punteggio<br/>medio';
 $zmSlangBadAlarmFrameCount   = 'Alarm frame count must be an integer of one or more';
+$zmSlangBadAlarmMaxFPS       = 'Alarm Maximum FPS must be a positive integer or floating point value';
 $zmSlangBadChannel           = 'Channel must be set to an integer of zero or more';
 $zmSlangBadDevice            = 'Device must be set to a valid value';
 $zmSlangBadFormat            = 'Format must be set to an integer of zero or more';

web/zm_lang_ja_jp.php

@@ -82,6 +82,7 @@ $zmSlangAlarmBrFrames        = '
 $zmSlangAlarmFrameCount      = 'Alarm Frame Count';
 $zmSlangAlarmFrame           = '±×°Ñ ÌÚ°Ñ';
 $zmSlangAlarmLimits          = '±×°ÑŒÀ“x';
+$zmSlangAlarmMaximumFPS      = 'Alarm Maximum FPS';
 $zmSlangAlarm                = '±×°Ñ';
 $zmSlangAlarmPx              = '±×°Ñ Px';
 $zmSlangAlarmRGBUnset        = 'You must set an alarm RGB colour';
@@ -132,6 +133,7 @@ $zmSlangAutoVideoAbbr        = 'Video';
 $zmSlangAutoVideoEvents      = 'Automatically create video for all matches';
 $zmSlangAvgBrScore           = '•½‹Ï<br/>½º±°';
 $zmSlangBadAlarmFrameCount   = 'Alarm frame count must be an integer of one or more';
+$zmSlangBadAlarmMaxFPS       = 'Alarm Maximum FPS must be a positive integer or floating point value';
 $zmSlangBadChannel           = 'Channel must be set to an integer of zero or more';
 $zmSlangBadDevice            = 'Device must be set to a valid value';
 $zmSlangBadFormat            = 'Format must be set to an integer of zero or more';

web/zm_lang_nl_nl.php

@@ -83,6 +83,7 @@ $zmSlangAlarmBrFrames        = 'Alarm<br/>Frames';
 $zmSlangAlarmFrame           = 'Alarm Frame';
 $zmSlangAlarmFrameCount      = 'Alarm Frame Count';
 $zmSlangAlarmLimits          = 'Alarm Limieten';
+$zmSlangAlarmMaximumFPS      = 'Alarm Maximum FPS';
 $zmSlangAlarmPx              = 'Alarm Px';
 $zmSlangAlarmRGBUnset        = 'You must set an alarm RGB colour';
 $zmSlangAlert                = 'Waarschuwing';
@@ -133,6 +134,7 @@ $zmSlangAutoVideoAbbr        = 'Video';
 $zmSlangAutoVideoEvents      = 'Automatically create video for all matches';
 $zmSlangAvgBrScore           = 'Gem.<br/>score';
 $zmSlangBadAlarmFrameCount   = 'Alarm frame count must be an integer of one or more';
+$zmSlangBadAlarmMaxFPS       = 'Alarm Maximum FPS must be a positive integer or floating point value';
 $zmSlangBadChannel           = 'Channel must be set to an integer of zero or more';
 $zmSlangBadDevice            = 'Device must be set to a valid value';
 $zmSlangBadFormat            = 'Format must be set to an integer of zero or more';

web/zm_lang_pl_pl.php

@@ -83,6 +83,7 @@ $zmSlangAlarmBrFrames        = 'Ramki<br/>alarmowe';
 $zmSlangAlarmFrameCount      = 'Alarm Frame Count';
 $zmSlangAlarmFrame           = 'Ramka alarmowa';
 $zmSlangAlarmLimits          = 'Ograniczenia alarmu';
+$zmSlangAlarmMaximumFPS      = 'Alarm Maximum FPS';
 $zmSlangAlarmPx              = 'Alarm Px';
 $zmSlangAlarmRGBUnset        = 'You must set an alarm RGB colour';
 $zmSlangAlert                = 'Gotowosc';
@@ -133,6 +134,7 @@ $zmSlangAutoVideoAbbr        = 'Video';
 $zmSlangAutoVideoEvents      = 'Automatically create video for all matches';
 $zmSlangAvgBrScore           = '¦red.<br/>wynik';
 $zmSlangBadAlarmFrameCount   = 'Alarm frame count must be an integer of one or more';
+$zmSlangBadAlarmMaxFPS       = 'Alarm Maximum FPS must be a positive integer or floating point value';
 $zmSlangBadChannel           = 'Channel must be set to an integer of zero or more';
 $zmSlangBadDevice            = 'Device must be set to a valid value';
 $zmSlangBadFormat            = 'Format must be set to an integer of zero or more';

web/zm_lang_pt_br.php

@@ -23,6 +23,7 @@ $zmSlangAlarmBrFrames        = 'Imagens<br/>Alarmadas';
 $zmSlangAlarmFrameCount      = 'Alarm Frame Count';
 $zmSlangAlarmFrame           = 'Imagem Alarmada';
 $zmSlangAlarmLimits          = 'Limites de Alarme';
+$zmSlangAlarmMaximumFPS      = 'Alarm Maximum FPS';
 $zmSlangAlarmPx              = 'Pixel de Alarme';
 $zmSlangAlarmRGBUnset        = 'You must set an alarm RGB colour';
 $zmSlangAlert                = 'Alerta';
@@ -72,6 +73,7 @@ $zmSlangAutoVideoAbbr        = 'Video';
 $zmSlangAutoVideoEvents      = 'Automatically create video for all matches';
 $zmSlangAvgBrScore           = 'Maior<br/>Score';
 $zmSlangBadAlarmFrameCount   = 'Alarm frame count must be an integer of one or more';
+$zmSlangBadAlarmMaxFPS       = 'Alarm Maximum FPS must be a positive integer or floating point value';
 $zmSlangBadChannel           = 'Channel must be set to an integer of zero or more';
 $zmSlangBadDevice            = 'Device must be set to a valid value';
 $zmSlangBadFormat            = 'Format must be set to an integer of zero or more';

web/zm_lang_ro_ro.php

@@ -54,6 +54,7 @@ $zmSlangAlarmBrFrames        = 'Alarm<br/>Frames';
 $zmSlangAlarmFrame           = 'Cadru alarma';
 $zmSlangAlarmFrameCount      = 'Nr. cadru alarma';
 $zmSlangAlarmLimits          = 'Alarm Limits';
+$zmSlangAlarmMaximumFPS      = 'Alarm Maximum FPS';
 $zmSlangAlarmPx              = 'Alarm Px';
 $zmSlangAlarmRGBUnset        = 'You must set an alarm RGB colour';
 $zmSlangAlert                = 'Alert';
@@ -103,6 +104,7 @@ $zmSlangAutoVideoAbbr        = 'Video';
 $zmSlangAutoVideoEvents      = 'Automatically create video for all matches';
 $zmSlangAvgBrScore           = 'Cota<br/>medie';
 $zmSlangBadAlarmFrameCount   = 'Alarm frame count must be an integer of one or more';
+$zmSlangBadAlarmMaxFPS       = 'Alarm Maximum FPS must be a positive integer or floating point value';
 $zmSlangBadChannel           = 'Channel must be set to an integer of zero or more';
 $zmSlangBadDevice            = 'Device must be set to a valid value';
 $zmSlangBadFormat            = 'Format must be set to an integer of zero or more';

web/zm_lang_ru_ru.php

@@ -82,6 +82,7 @@ $zmSlangAlarmBrFrames        = '
 $zmSlangAlarmFrameCount      = 'Alarm Frame Count';
 $zmSlangAlarmFrame           = 'ëÁÄÒ ÔÒÅ×ÏÇÉ';
 $zmSlangAlarmLimits          = 'çÒÁÎ. ÚÏÎÙ ÔÒÅ×.';
+$zmSlangAlarmMaximumFPS      = 'Alarm Maximum FPS';
 $zmSlangAlarm                = 'ôÒÅ×ÏÇÁ';
 $zmSlangAlarmPx              = 'ðËÓ ÔÒÅ×.';
 $zmSlangAlarmRGBUnset        = 'You must set an alarm RGB colour';
@@ -133,6 +134,7 @@ $zmSlangAutoVideoAbbr        = 'Video';
 $zmSlangAutoVideoEvents      = 'Automatically create video for all matches';
 $zmSlangAvgBrScore           = 'óÒÅÄ.<br/>ÏÃÅÎËÁ';
 $zmSlangBadAlarmFrameCount   = 'Alarm frame count must be an integer of one or more';
+$zmSlangBadAlarmMaxFPS       = 'Alarm Maximum FPS must be a positive integer or floating point value';
 $zmSlangBadChannel           = 'Channel must be set to an integer of zero or more';
 $zmSlangBadDevice            = 'Device must be set to a valid value';
 $zmSlangBadFormat            = 'Format must be set to an integer of zero or more';

web/zm_lang_se_se.php

@@ -83,6 +83,7 @@ $zmSlangAlarmFrameCount      = 'Larmramsr
 $zmSlangAlarmFrame           = 'Larmram';
 $zmSlangAlarm                = 'Larm';
 $zmSlangAlarmLimits          = 'Larmgränser';
+$zmSlangAlarmMaximumFPS      = 'Alarm Maximum FPS';
 $zmSlangAlarmPx              = 'Larm Pix';
 $zmSlangAlarmRGBUnset        = 'Du måste sätta en lam RGB färg';
 $zmSlangAlert                = 'Varning';
@@ -132,6 +133,7 @@ $zmSlangAutoVideoAbbr        = 'Video';
 $zmSlangAutoVideoEvents      = 'Skapa video för alla träffar automatiskt';
 $zmSlangAvgBrScore           = 'Ung.<br/>träff';
 $zmSlangBadAlarmFrameCount   = 'Alarm frame count must be an integer of one or more';
+$zmSlangBadAlarmMaxFPS       = 'Alarm Maximum FPS must be a positive integer or floating point value';
 $zmSlangBadChannel           = 'Channel must be set to an integer of zero or more';
 $zmSlangBadDevice            = 'Device must be set to a valid value';
 $zmSlangBadFormat            = 'Format must be set to an integer of zero or more';