pull/2993/head
Isaac Connor 2020-07-22 17:30:39 -04:00
parent 07165aed98
commit f635afe00f
1 changed files with 19 additions and 15 deletions

View File

@ -122,7 +122,7 @@ void Zone::Setup(
} else {
diag_path[0] = 0;
}
} // end Zone::Setup
} // end Zone::Setup
Zone::~Zone() {
delete[] label;
@ -131,7 +131,7 @@ Zone::~Zone() {
delete[] ranges;
}
void Zone::RecordStats( const Event *event ) {
void Zone::RecordStats(const Event *event) {
static char sql[ZM_SQL_MED_BUFSIZ];
db_mutex.lock();
snprintf(sql, sizeof(sql),
@ -142,7 +142,7 @@ void Zone::RecordStats( const Event *event ) {
Error("Can't insert event stats: %s", mysql_error(&dbconn));
}
db_mutex.unlock();
} // end void Zone::RecordStats( const Event *event )
} // end void Zone::RecordStats( const Event *event )
bool Zone::CheckOverloadCount() {
if ( overload_count ) {
@ -151,40 +151,40 @@ bool Zone::CheckOverloadCount() {
return false;
}
return true;
} // end bool Zone::CheckOverloadCount()
} // end bool Zone::CheckOverloadCount()
void Zone::SetScore(unsigned int nScore) {
score = nScore;
} // end void Zone::SetScore(unsigned int nScore)
} // end void Zone::SetScore(unsigned int nScore)
void Zone::SetAlarmImage(const Image* srcImage) {
delete image;
image = new Image(*srcImage);
} // end void Zone::SetAlarmImage( const Image* srcImage )
} // end void Zone::SetAlarmImage( const Image* srcImage )
int Zone::GetOverloadCount() {
return overload_count;
} // end int Zone::GetOverloadCount()
} // end int Zone::GetOverloadCount()
void Zone::SetOverloadCount(int nOverCount) {
overload_count = nOverCount;
} // end void Zone::SetOverloadCount(int nOverCount )
} // end void Zone::SetOverloadCount(int nOverCount )
int Zone::GetOverloadFrames() {
return overload_frames;
} // end int Zone::GetOverloadFrames
} // end int Zone::GetOverloadFrames
int Zone::GetExtendAlarmCount() {
return extend_alarm_count;
} // end int Zone::GetExtendAlarmCount()
} // end int Zone::GetExtendAlarmCount()
void Zone::SetExtendAlarmCount(int nExtendAlarmCount) {
extend_alarm_count = nExtendAlarmCount;
} // end void Zone::SetExtendAlarmCount( int nExtendAlarmCount )
} // end void Zone::SetExtendAlarmCount( int nExtendAlarmCount )
int Zone::GetExtendAlarmFrames() {
return extend_alarm_frames;
} // end int Zone::GetExtendAlarmFrames()
} // end int Zone::GetExtendAlarmFrames()
bool Zone::CheckExtendAlarmCount() {
Info("ExtendAlarm count: %d, ExtendAlarm frames: %d", extend_alarm_count, extend_alarm_frames);
@ -194,7 +194,7 @@ bool Zone::CheckExtendAlarmCount() {
return true;
}
return false;
} // end bool Zone::CheckExtendAlarmCount
} // end bool Zone::CheckExtendAlarmCount
bool Zone::CheckAlarms(const Image *delta_image) {
ResetStats();
@ -984,10 +984,14 @@ bool Zone::DumpSettings(char *output, bool /*verbose*/) {
sprintf( output+strlen(output), " Max Blob Pixels : %d\n", max_blob_pixels );
sprintf( output+strlen(output), " Min Blobs : %d\n", min_blobs );
sprintf( output+strlen(output), " Max Blobs : %d\n", max_blobs );
return( true );
return true;
}
void Zone::std_alarmedpixels(Image* pdiff_image, const Image* ppoly_image, unsigned int* pixel_count, unsigned int* pixel_sum) {
void Zone::std_alarmedpixels(
Image* pdiff_image,
const Image* ppoly_image,
unsigned int* pixel_count,
unsigned int* pixel_sum) {
uint32_t pixelsalarmed = 0;
uint32_t pixelsdifference = 0;
uint8_t calc_max_pixel_threshold = 255;