mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-21 23:32:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tweaked zone image dumping.

Browse Source 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3066 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan
2010-05-27 12:18:43 +00:00
parent 0cdc6e89ef
commit cd16c91ccd
3 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/zm_monitor.cpp
View File

@@ -597,7 +597,7 @@ int Monitor::GetImage( int index, int scale ) const
}
static char filename[PATH_MAX];
snprintf( filename, sizeof(filename), "%s.jpg", name );
snprintf( filename, sizeof(filename), "Monitor%d.jpg", id );
if ( !config.timestamp_on_capture )
{
TimestampImage( &snap_image, snap->timestamp );
@@ -933,29 +933,36 @@ void Monitor::DumpZoneImage( const char *zone_string )
zone_image.Colourise();
for( int i = 0; i < n_zones; i++ )
{
if ( exclude_id && zones[i]->Id() == exclude_id )
if ( exclude_id && (!extra_colour || extra_zone.getNumCoords()) && zones[i]->Id() == exclude_id )
continue;
Rgb colour;
if ( zones[i]->IsActive() )
if ( exclude_id && !extra_zone.getNumCoords() && zones[i]->Id() == exclude_id )
{
colour = RGB_RED;
}
else if ( zones[i]->IsInclusive() )
{
colour = RGB_ORANGE;
}
else if ( zones[i]->IsExclusive() )
{
colour = RGB_PURPLE;
}
else if ( zones[i]->IsPreclusive() )
{
colour = RGB_BLUE;
colour = extra_colour;
}
else
{
colour = RGB_WHITE;
if ( zones[i]->IsActive() )
{
colour = RGB_RED;
}
else if ( zones[i]->IsInclusive() )
{
colour = RGB_ORANGE;
}
else if ( zones[i]->IsExclusive() )
{
colour = RGB_PURPLE;
}
else if ( zones[i]->IsPreclusive() )
{
colour = RGB_BLUE;
}
else
{
colour = RGB_WHITE;
}
}
zone_image.Fill( colour, 2, zones[i]->GetPolygon() );
zone_image.Outline( colour, zones[i]->GetPolygon() );
@@ -978,8 +985,8 @@ void Monitor::DumpImage( Image *dump_image ) const
{
static char filename[PATH_MAX];
static char new_filename[PATH_MAX];
snprintf( filename, sizeof(filename), "%s.jpg", name );
snprintf( new_filename, sizeof(new_filename), "%s-new.jpg", name );
snprintf( filename, sizeof(filename), "Monitor%d.jpg", id );
snprintf( new_filename, sizeof(new_filename), "Monitor%d-new.jpg", id );
dump_image->WriteJpeg( new_filename );
rename( new_filename, filename );
}