From 28cde4ed89ca8a377eddb0af9dd624e9b64224ba Mon Sep 17 00:00:00 2001 From: stan Date: Fri, 31 Mar 2006 12:47:39 +0000 Subject: [PATCH] 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 | 9 ++++++++- web/zm_lang_cs_cz.php | 2 ++ web/zm_lang_de_de.php | 2 ++ web/zm_lang_dk_dk.php | 2 ++ web/zm_lang_en_gb.php | 2 ++ web/zm_lang_es_ar.php | 2 ++ web/zm_lang_fr_fr.php | 2 ++ web/zm_lang_it_it.php | 2 ++ web/zm_lang_ja_jp.php | 2 ++ web/zm_lang_nl_nl.php | 2 ++ web/zm_lang_pl_pl.php | 2 ++ web/zm_lang_pt_br.php | 2 ++ web/zm_lang_ro_ro.php | 2 ++ web/zm_lang_ru_ru.php | 2 ++ web/zm_lang_se_se.php | 2 ++ 15 files changed, 36 insertions(+), 1 deletion(-) diff --git a/web/zm_html_view_monitor.php b/web/zm_html_view_monitor.php index 8500517d9..8a7e8c476 100644 --- a/web/zm_html_view_monitor.php +++ b/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] = ""; } + if ( form.elements['new_monitor[AlarmMaxFPS]'].value && !(parseFloat(form.elements['new_monitor[AlarmMaxFPS]'].value) > 0 ) ) + { + errors[errors.length] = ""; + } if ( !form.elements['new_monitor[RefBlendPerc]'].value || !(parseInt(form.elements['new_monitor[RefBlendPerc]'].value) > 0 ) ) { errors[errors.length] = ""; @@ -388,6 +393,7 @@ if ( $tab != 'general' ) + checked>   + 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.
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'; diff --git a/web/zm_lang_de_de.php b/web/zm_lang_de_de.php index fc31a4234..d4a659a9a 100644 --- a/web/zm_lang_de_de.php +++ b/web/zm_lang_de_de.php @@ -83,6 +83,7 @@ $zmSlangAlarmBrFrames = 'Alarm
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.
Zä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'; diff --git a/web/zm_lang_dk_dk.php b/web/zm_lang_dk_dk.php index 2a90b3cb6..9081fe163 100644 --- a/web/zm_lang_dk_dk.php +++ b/web/zm_lang_dk_dk.php @@ -84,6 +84,7 @@ $zmSlangAlarmBrFrames = 'Alarm
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.
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'; diff --git a/web/zm_lang_en_gb.php b/web/zm_lang_en_gb.php index 9c8978bd8..b8f380c40 100644 --- a/web/zm_lang_en_gb.php +++ b/web/zm_lang_en_gb.php @@ -83,6 +83,7 @@ $zmSlangAlarmBrFrames = 'Alarm
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.
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'; diff --git a/web/zm_lang_es_ar.php b/web/zm_lang_es_ar.php index fdf9d3924..ef0ac0fe7 100644 --- a/web/zm_lang_es_ar.php +++ b/web/zm_lang_es_ar.php @@ -34,6 +34,7 @@ $zmSlangAlarmBrFrames = 'Alarma
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.
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'; diff --git a/web/zm_lang_fr_fr.php b/web/zm_lang_fr_fr.php index 4a4293ab4..b43ec1060 100644 --- a/web/zm_lang_fr_fr.php +++ b/web/zm_lang_fr_fr.php @@ -83,6 +83,7 @@ $zmSlangAlarmBrFrames = 'Images
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
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'; diff --git a/web/zm_lang_it_it.php b/web/zm_lang_it_it.php index 9a8268307..d69ccf1ab 100644 --- a/web/zm_lang_it_it.php +++ b/web/zm_lang_it_it.php @@ -86,6 +86,7 @@ $zmSlangAlarmBrFrames = 'Immagini
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
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'; diff --git a/web/zm_lang_ja_jp.php b/web/zm_lang_ja_jp.php index ca767085a..c697551f2 100644 --- a/web/zm_lang_ja_jp.php +++ b/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 = '•½‹Ï
½º±°'; $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'; diff --git a/web/zm_lang_nl_nl.php b/web/zm_lang_nl_nl.php index 0b77f96b1..679e6e8df 100644 --- a/web/zm_lang_nl_nl.php +++ b/web/zm_lang_nl_nl.php @@ -83,6 +83,7 @@ $zmSlangAlarmBrFrames = 'Alarm
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.
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'; diff --git a/web/zm_lang_pl_pl.php b/web/zm_lang_pl_pl.php index eb4d29371..44b8b3734 100644 --- a/web/zm_lang_pl_pl.php +++ b/web/zm_lang_pl_pl.php @@ -83,6 +83,7 @@ $zmSlangAlarmBrFrames = 'Ramki
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.
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'; diff --git a/web/zm_lang_pt_br.php b/web/zm_lang_pt_br.php index c9ab6d43b..659024e34 100644 --- a/web/zm_lang_pt_br.php +++ b/web/zm_lang_pt_br.php @@ -23,6 +23,7 @@ $zmSlangAlarmBrFrames = 'Imagens
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
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'; diff --git a/web/zm_lang_ro_ro.php b/web/zm_lang_ro_ro.php index 6b6b35489..75174b57e 100755 --- a/web/zm_lang_ro_ro.php +++ b/web/zm_lang_ro_ro.php @@ -54,6 +54,7 @@ $zmSlangAlarmBrFrames = 'Alarm
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
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'; diff --git a/web/zm_lang_ru_ru.php b/web/zm_lang_ru_ru.php index 37f9712c0..a40610527 100644 --- a/web/zm_lang_ru_ru.php +++ b/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 = 'óÒÅÄ.
ÏÃÅÎËÁ'; $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'; diff --git a/web/zm_lang_se_se.php b/web/zm_lang_se_se.php index f119d37cc..a151979f2 100644 --- a/web/zm_lang_se_se.php +++ b/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.
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';