From b813b51f2bc8bf83fdb2fd8531ee4b7977f7d8b2 Mon Sep 17 00:00:00 2001 From: Ian Date: Fri, 4 Nov 2016 07:15:21 -0700 Subject: [PATCH] Revert "Merge branch 'reword-create_analysis_images-help' into Memory-Map-FAQ-Additional-Details" This reverts commit aa74660aa40aebd62a235d7fb3d3ef60f3546f94, reversing changes made to 749a90f1992e21b40db75230977b7b90f3797fea. --- docs/userguide/options/options_config.rst | 2 +- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/userguide/options/options_config.rst b/docs/userguide/options/options_config.rst index 9d28fac02..0f419e2ab 100644 --- a/docs/userguide/options/options_config.rst +++ b/docs/userguide/options/options_config.rst @@ -27,7 +27,7 @@ BULK_FRAME_INTERVAL - Traditionally ZoneMinder writes an entry into the Frames d EVENT_CLOSE_MODE - When a monitor is running in a continuous recording mode (Record or Mocord) events are usually closed after a fixed period of time (the section length). However in Mocord mode it is possible that motion detection may occur near the end of a section. This option controls what happens when an alarm occurs in Mocord mode. The 'time' setting means that the event will be closed at the end of the section regardless of alarm activity. The 'idle' setting means that the event will be closed at the end of the section if there is no alarm activity occurring at the time otherwise it will be closed once the alarm is over meaning the event may end up being longer than the normal section length. The 'alarm' setting means that if an alarm occurs during the event, the event will be closed once the alarm is over regardless of when this occurs. This has the effect of limiting the number of alarms to one per event and the events will be shorter than the section length if an alarm has occurred. -CREATE_ANALYSIS_IMAGES - When enabled, for all alert frames within an event, all detected motion within zones that use blob as the 'Alarm Check Method' will be outlined in red. Note that this will incur some overhead. +CREATE_ANALYSIS_IMAGES - By default during an alarm ZoneMinder records both the raw captured image and one that has been analysed and had areas where motion was detected outlined. This can be very useful during zone configuration or in analysing why events occurred. However it also incurs some overhead and in a stable system may no longer be necessary. This parameter allows you to switch the generation of these images off. WEIGHTED_ALARM_CENTRES - ZoneMinder will always calculate the centre point of an alarm in a zone to give some indication of where on the screen it is. This can be used by the experimental motion tracking feature or your own custom extensions. In the alarmed or filtered pixels mode this is a simple midpoint between the extents of the detected pxiesl. However in the blob method this can instead be calculated using weighted pixel locations to give more accurate positioning for irregularly shaped blobs. This method, while more precise is also slower and so is turned off by default. diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in index c93cf0469..27f9a80d5 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in +++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in @@ -2617,10 +2617,13 @@ body = "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% s default => "yes", description => "Create analysed alarm images with motion outlined", help => qqq(" - When enabled, for all alert frames within an event, all - detected motion within zones that use blob as the 'Alarm - Check Method' will be outlined in red. Note that this will - incur some overhead. + By default during an alarm ZoneMinder records both the raw + captured image and one that has been analysed and had areas + where motion was detected outlined. This can be very useful + during zone configuration or in analysing why events occurred. + However it also incurs some overhead and in a stable system may + no longer be necessary. This parameter allows you to switch the + generation of these images off. "), type => $types{boolean}, category => "config",