diff --git a/web/zmactions.php b/web/zmactions.php index 3ac85d8ed..8c2b72d7a 100644 --- a/web/zmactions.php +++ b/web/zmactions.php @@ -242,12 +242,21 @@ if ( $action ) if ( $new_width != $monitor['Width'] ) $changes[] = "Width = '$new_width'"; if ( $new_height != $monitor['Height'] ) $changes[] = "Height = '$new_height'"; if ( $new_colours != $monitor['Colours'] ) $changes[] = "Colours = '$new_colours'"; + if ( $new_label_format != $monitor['LabelFormat'] ) $changes[] = "LabelFormat = '$new_label_format'"; + if ( $new_label_x != $monitor['LabelX'] ) $changes[] = "LabelX = '$new_label_x'"; + if ( $new_label_y != $monitor['LabelY'] ) $changes[] = "LabelY = '$new_label_y'"; + if ( $new_image_buffer_count != $monitor['ImageBufferCount'] ) $changes[] = "ImageBufferCount = '$new_image_buffer_count'"; + if ( $new_warmup_count != $monitor['WarmupCount'] ) $changes[] = "WarmupCount = '$new_warmup_count'"; + if ( $new_pre_event_count != $monitor['PreEventCount'] ) $changes[] = "PreEventCount = '$new_pre_event_count'"; + if ( $new_post_event_count != $monitor['PostEventCount'] ) $changes[] = "PostEventCount = '$new_post_event_count'"; + if ( $new_fps_report_interval != $monitor['FPSReportInterval'] ) $changes[] = "FPSReportInterval = '$new_fps_report_interval'"; + if ( $new_ref_blend_perc != $monitor['RefBlendPerc'] ) $changes[] = "RefBlendPerc = '$new_ref_blend_perc'"; if ( count( $changes ) ) { if ( $mid > 0 ) { - $sql = "update Monitors set ".implode( ", ", $changes )." where MonitorId = '$mid'"; + $sql = "update Monitors set ".implode( ", ", $changes )." where Id = '$mid'"; $result = mysql_query( $sql ); if ( !$result ) die( mysql_error() ); diff --git a/web/zmconfig.php.z b/web/zmconfig.php.z index b74b73009..71c2d4622 100644 --- a/web/zmconfig.php.z +++ b/web/zmconfig.php.z @@ -100,7 +100,7 @@ switch ( $bandwidth ) $jws = array( 'console' => array( 'w'=>720, 'h'=>400 ), 'cycle' => array( 'w'=>36, 'h'=>72 ), - 'monitor' => array( 'w'=>360, 'h'=>320 ), + 'monitor' => array( 'w'=>360, 'h'=>400 ), 'watch' => array( 'w'=>72, 'h'=>360 ), 'device' => array( 'w'=>196, 'h'=>164 ), 'function' => array( 'w'=>248, 'h'=>72 ), diff --git a/web/zmhtml.php b/web/zmhtml.php index d16ff4b22..45b3a0270 100644 --- a/web/zmhtml.php +++ b/web/zmhtml.php @@ -1386,6 +1386,15 @@ function closeWindow() Device Width (pixels) Device Height (pixels) Device Colour Depth +Timestamp Label Format +Timestamp Label X +Timestamp Label Y +Image Buffer Size (frames) +Warmup Frames +Pre Event Image Buffer +Post Event Image Buffer +FPS Report Interval +Reference Image Blend %ge