[zbar-commits] push rev [289]: iPhone: expose tracking box color

[<sp...@us...>]

changeset: 289:0e1837880610
user:      sp...@us...
date:      Sun Jan 16 14:48:39 2011 -0800
details:   http://zbar.hg.sourceforge.net:8000/hgroot/zbar/zbarzbar/rev/0e1837880610
description:
iPhone: expose tracking box color

diffstat:

 iphone/ChangeLog                        |   3 +++
 iphone/ZBarReaderView.m                 |  21 ++++++++++++++++++---
 iphone/doc/ZBarReaderView.rst           |   4 ++++
 iphone/include/ZBarSDK/ZBarReaderView.h |   4 ++++
 4 files changed, 29 insertions(+), 3 deletions(-)

diffs (99 lines):

diff -r 74eeb4494438 -r 0e1837880610 iphone/ChangeLog
--- a/iphone/ChangeLog	Sun Jan 16 11:46:28 2011 -0800
+++ b/iphone/ChangeLog	Sun Jan 16 14:48:39 2011 -0800
@@ -1,3 +1,6 @@
+current:
+  * expose tracking box color
+
 version 1.1:
   * fix doc typo (bug #3139087)
     - add modifier bit docs
diff -r 74eeb4494438 -r 0e1837880610 iphone/ZBarReaderView.m
--- a/iphone/ZBarReaderView.m	Sun Jan 16 11:46:28 2011 -0800
+++ b/iphone/ZBarReaderView.m	Sun Jan 16 14:48:39 2011 -0800
@@ -32,8 +32,8 @@
 
 @implementation ZBarReaderView
 
-@synthesize readerDelegate, tracksSymbols, torchMode, showsFPS, zoom, scanCrop,
-    previewTransform;
+@synthesize readerDelegate, tracksSymbols, trackingColor, torchMode, showsFPS,
+    zoom, scanCrop, previewTransform;
 @dynamic scanner, allowsPinchZoom, enableCache, device, session, captureReader;
 
 + (id) alloc
@@ -61,9 +61,12 @@
     tracking.opacity = 0;
     tracking.borderWidth = 1;
     tracking.backgroundColor = [UIColor clearColor].CGColor;
-    tracking.borderColor = [UIColor greenColor].CGColor;
     [overlay addSublayer: tracking];
 
+    trackingColor = [[UIColor greenColor]
+                        retain];
+    tracking.borderColor = trackingColor.CGColor;
+
     r.origin.x = 3 * r.size.width / 4;
     r.origin.y = r.size.height - 32;
     r.size.width = r.size.width - r.origin.x + 12;
@@ -145,6 +148,8 @@
     overlay = nil;
     [tracking release];
     tracking = nil;
+    [trackingColor release];
+    trackingColor = nil;
     [fpsLabel release];
     fpsLabel = nil;
     [fpsView release];
@@ -226,6 +231,16 @@
     pinch.enabled = enabled;
 }
 
+- (void) setTrackingColor: (UIColor*) color
+{
+    if(!color)
+        return;
+    [color retain];
+    [trackingColor release];
+    trackingColor = color;
+    tracking.borderColor = color.CGColor;
+}
+
 - (void) setShowsFPS: (BOOL) show
 {
     if(show == showsFPS)
diff -r 74eeb4494438 -r 0e1837880610 iphone/doc/ZBarReaderView.rst
--- a/iphone/doc/ZBarReaderView.rst	Sun Jan 16 11:46:28 2011 -0800
+++ b/iphone/doc/ZBarReaderView.rst	Sun Jan 16 14:48:39 2011 -0800
@@ -27,6 +27,10 @@
 
       Whether to display the tracking annotation (default ``YES``).
 
+   .. member:: UIColor *trackingColor
+
+      The color of the tracking annotation (default green).
+
    .. member:: BOOL allowsPinchZoom
 
       Enable pinch gesture recognition for manually zooming the preview/decode
diff -r 74eeb4494438 -r 0e1837880610 iphone/include/ZBarSDK/ZBarReaderView.h
--- a/iphone/include/ZBarSDK/ZBarReaderView.h	Sun Jan 16 11:46:28 2011 -0800
+++ b/iphone/include/ZBarSDK/ZBarReaderView.h	Sun Jan 16 14:48:39 2011 -0800
@@ -49,6 +49,7 @@
     CGRect scanCrop, zoomCrop;
     CGAffineTransform previewTransform;
     CGFloat zoom, zoom0;
+    UIColor *trackingColor;
     BOOL tracksSymbols, showsFPS;
     NSInteger torchMode;
 
@@ -82,6 +83,9 @@
 // (default YES).
 @property (nonatomic) BOOL tracksSymbols;
 
+// color of the tracking box (default green)
+@property (nonatomic, retain) UIColor *trackingColor;
+
 // enable pinch gesture recognition for zooming the preview/decode
 // (default YES).
 @property (nonatomic) BOOL allowsPinchZoom;