rhodes 3.2.1 → 3.2.2.beta

data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewFactory.h

@@ -0,0 +1,7 @@
+#include "common/RhoNativeViewManager.h"
+
+
+class BarcodeViewFactorySingletone  {
+public: 
+  static NativeViewFactory* instance();
+};

data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewFactory.mm

@@ -0,0 +1,58 @@
+
+#import <UIKit/UIKit.h>
+
+#import "BarcodeViewFactory.h"
+#import "BarcodeViewController.h"
+
+#import <strings.h>
+
+
+class BarcodeNativeView : public NativeView {
+public:
+	BarcodeNativeView() {
+		//mView = nil;
+	}
+	virtual ~BarcodeNativeView() {
+		//[mView release];
+		//mView = nil;
+	}
+	
+	virtual void* getView() {
+		//if (mView == nil) {
+		//	ctrl = []
+		//	mView = [[RainbowView alloc] init];
+		//}
+		return [BarcodeViewController getCurrentView];
+	}
+	
+	virtual void navigate(const char* url) {
+		//[mView navigate:url];
+	}
+private:
+	//MapViewControllerESRI* ctrl;
+	//UIView* mView;
+};
+
+
+
+class BarcodeNativeViewFactory : public NativeViewFactory {
+public:
+	
+	virtual NativeView* getNativeView(const char* viewType) {
+		return new BarcodeNativeView();
+	}
+	
+	virtual void destroyNativeView(NativeView* nativeView) {
+		delete nativeView;
+	}
+	
+};
+
+static BarcodeNativeViewFactory* ourFactory = NULL; 
+
+NativeViewFactory* BarcodeViewFactorySingletone::instance() {
+	if (ourFactory == NULL) {
+		ourFactory = new BarcodeNativeViewFactory();
+	}
+	return ourFactory;
+}

data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewFactoryRegister.mm

@@ -0,0 +1,18 @@
+
+// rhodes/platform/shared/common/RhoNativeViewManager.h
+#include "common/RhoNativeViewManager.h"
+
+#include "BarcodeViewFactory.h"
+
+
+	
+//extern "C" void register_Barcode_mapViewProvider();
+
+
+
+
+extern "C" void register_Barcode_View(void) {
+    NativeViewFactory* factory = BarcodeViewFactorySingletone::instance();
+    RhoNativeViewManager::registerViewType("Barcode_View", factory);
+}
+	

data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewManager.h

@@ -0,0 +1,16 @@
+
+//  Copyright 2010 __Rhomobile__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface BarcodeViewManager : NSObject {
+
+}
+
++ (void)openView;
++ (void)closeView;
+
+@end
+

data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeViewManager.mm

@@ -0,0 +1,32 @@
+//
+//  RainbowSmallViewManager.m
+//  Rainbow
+//
+//  Created by Dmitry Soldatenkov on 10/15/10.
+//  Copyright 2010 __Rhomobile__. All rights reserved.
+//
+
+
+
+
+#import "BarcodeViewManager.h"
+#import "common/RhoNativeViewManager.h"
+
+
+
+@implementation BarcodeViewManager
+
+static int view_id = 0;
+
+
++ (void)openView {
+	view_id = RhoNativeViewManager::openNativeView("Barcode_View", OPEN_IN_MODAL_FULL_SCREEN_WINDOW, NULL);
+}
+
++ (void)closeView {
+	RhoNativeViewManager::closeNativeView(view_id);
+}
+
+
+@end
+

data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/barcode.m

@@ -4,16 +4,23 @@
 #include <stdlib.h>
 
 #include "zbar.h"
+#include "BarcodeViewController.h"
 
-
+#include "ruby/ext/rho/rhoruby.h"
 
 extern void rho_platform_image_load_grayscale(const char* url, void** image_pixels, int* pwidth, int* pheight);
 extern void rho_platform_image_free(void* image_pixels);
 
+extern void register_Barcode_View(void);
 
 static char strbuf[1024];
 
-void rho_barcode_take_barcode(const char* callback) {
+void rho_barcode_take_barcode(const char* callback, VALUE options) {
+    
+    register_Barcode_View();
+    
+    [BarcodeViewController createBarcodeView:[NSString stringWithCString:callback]];
+
 }
 
 

data/lib/extensions/barcode/ext/barcode/platform/iphone/ZBarSDK/Headers/ZBarSDK/ZBarCameraSimulator.h

@@ -0,0 +1,45 @@
+//------------------------------------------------------------------------
+//  Copyright 2010-2011 (c) Jeff Brown <spadix@users.sourceforge.net>
+//
+//  This file is part of the ZBar Bar Code Reader.
+//
+//  The ZBar Bar Code Reader is free software; you can redistribute it
+//  and/or modify it under the terms of the GNU Lesser Public License as
+//  published by the Free Software Foundation; either version 2.1 of
+//  the License, or (at your option) any later version.
+//
+//  The ZBar Bar Code Reader is distributed in the hope that it will be
+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser Public License
+//  along with the ZBar Bar Code Reader; if not, write to the Free
+//  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+//  Boston, MA  02110-1301  USA
+//
+//  http://sourceforge.net/projects/zbar
+//------------------------------------------------------------------------
+
+@class ZBarReaderView;
+
+// hack around missing simulator support for AVCapture interfaces
+
+@interface ZBarCameraSimulator
+    : NSObject
+    < UINavigationControllerDelegate,
+      UIImagePickerControllerDelegate,
+      UIPopoverControllerDelegate >
+{
+    UIViewController *viewController;
+    ZBarReaderView *readerView;
+    UIImagePickerController *picker;
+    UIPopoverController *pickerPopover;
+}
+
+- (id) initWithViewController: (UIViewController*) viewController;
+- (void) takePicture;
+
+@property (nonatomic, assign) ZBarReaderView *readerView;
+
+@end

data/lib/extensions/barcode/ext/barcode/platform/iphone/ZBarSDK/Headers/ZBarSDK/ZBarCaptureReader.h

@@ -46,6 +46,7 @@
 @interface ZBarCaptureReader
     : NSObject
 {
+#if !TARGET_IPHONE_SIMULATOR
     AVCaptureVideoDataOutput *captureOutput;
     id<ZBarCaptureDelegate> captureDelegate;
     ZBarImageScanner *scanner;
@@ -57,11 +58,12 @@
     dispatch_queue_t queue;
     ZBarImage *image;
     ZBarCVImage *result;
-    int32_t running;
+    volatile uint32_t state;
     int framecnt;
     unsigned width, height;
     uint64_t t_frame, t_fps, t_scan;
     CGFloat dt_frame;
+#endif
 }
 
 // supply a pre-configured image scanner
@@ -76,6 +78,10 @@
 // clear the internal result cache
 - (void) flushCache;
 
+// capture the next frame after processing.  the captured image will
+// follow the same delegate path as an image with decoded symbols.
+- (void) captureFrame;
+
 // the capture output.  add this to an instance of AVCaptureSession
 @property (nonatomic, readonly) AVCaptureOutput *captureOutput;
 

data/lib/extensions/barcode/ext/barcode/platform/iphone/ZBarSDK/Headers/ZBarSDK/ZBarReaderView.h

@@ -46,17 +46,22 @@
     : UIView
 {
     id<ZBarReaderViewDelegate> readerDelegate;
-    CGRect scanCrop, zoomCrop;
+    ZBarCaptureReader *captureReader;
+    CGRect scanCrop, effectiveCrop;
     CGAffineTransform previewTransform;
-    CGFloat zoom, zoom0;
+    CGFloat zoom, zoom0, maxZoom;
+    UIColor *trackingColor;
     BOOL tracksSymbols, showsFPS;
     NSInteger torchMode;
+    UIInterfaceOrientation interfaceOrientation;
+    NSTimeInterval animationDuration;
 
-    CALayer *preview, *overlay, *tracking;
+    CALayer *preview, *overlay, *tracking, *cropLayer;
     UIView *fpsView;
     UILabel *fpsLabel;
     UIPinchGestureRecognizer *pinch;
     CGFloat imageScale;
+    CGSize imageSize;
     BOOL started, running;
 }
 
@@ -72,6 +77,10 @@
 // clear the internal result cache
 - (void) flushCache;
 
+// compensate for device/camera/interface orientation
+- (void) willRotateToInterfaceOrientation: (UIInterfaceOrientation) orient
+                                 duration: (NSTimeInterval) duration;
+
 // delegate is notified of decode results.
 @property (nonatomic, assign) id<ZBarReaderViewDelegate> readerDelegate;
 
@@ -82,6 +91,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;
@@ -94,9 +106,14 @@
 @property (nonatomic) BOOL showsFPS;
 
 // zoom scale factor applied to video preview *and* scanCrop.
-// also updated by pinch-zoom gesture.  clipped to range [1,2],
+// also updated by pinch-zoom gesture.  clipped to range [1,maxZoom],
 // defaults to 1.25
 @property (nonatomic) CGFloat zoom;
+- (void) setZoom: (CGFloat) zoom
+        animated: (BOOL) animated;
+
+// maximum settable zoom factor.
+@property (nonatomic) CGFloat maxZoom;
 
 // the region of the image that will be scanned.  normalized coordinates.
 @property (nonatomic) CGRect scanCrop;

data/lib/extensions/barcode/ext/barcode/platform/iphone/ZBarSDK/Headers/ZBarSDK/ZBarReaderViewController.h

@@ -24,7 +24,15 @@
 #import <UIKit/UIKit.h>
 #import "ZBarReaderController.h"
 
-@class ZBarReaderView;
+// orientation set support
+#define ZBarOrientationMask(orient) (1 << orient)
+#define ZBarOrientationMaskAll \
+    (ZBarOrientationMask(UIInterfaceOrientationPortrait) | \
+     ZBarOrientationMask(UIInterfaceOrientationPortraitUpsideDown) | \
+     ZBarOrientationMask(UIInterfaceOrientationLandscapeLeft) | \
+     ZBarOrientationMask(UIInterfaceOrientationLandscapeRight))
+
+@class ZBarReaderView, ZBarCameraSimulator;
 
 // drop in video scanning replacement for ZBarReaderController.
 // this is a thin controller around a ZBarReaderView that adds the UI
@@ -41,10 +49,16 @@
     UIView *cameraOverlayView;
     CGAffineTransform cameraViewTransform;
     CGRect scanCrop;
+    NSUInteger supportedOrientationsMask;
+    UIImagePickerControllerCameraDevice cameraDevice;
+    UIImagePickerControllerCameraFlashMode cameraFlashMode;
+    UIImagePickerControllerQualityType videoQuality;
     BOOL showsZBarControls, tracksSymbols, enableCache;
 
+    ZBarHelpController *helpController;
     UIView *controls;
-    BOOL didHideStatusBar;
+    BOOL didHideStatusBar, rotating;
+    ZBarCameraSimulator *cameraSim;
 }
 
 // access to configure image scanner
@@ -60,6 +74,10 @@
 // enabled, the box will only be visible when scanning EAN and I2/5.
 @property (nonatomic) BOOL tracksSymbols;
 
+// interface orientation support.  bit-mask of accepted orientations.
+// see eg ZBarOrientationMask() and ZBarOrientationMaskAll
+@property (nonatomic) NSUInteger supportedOrientationsMask;
+
 // crop images for scanning.  the image will be cropped to this
 // rectangle before scanning.  the rectangle is normalized to the
 // image size and aspect ratio; useful values will place the rectangle
@@ -78,6 +96,18 @@
 // the onZBarHelp() javascript function.
 - (void) showHelpWithReason: (NSString*) reason;
 
+// capture the next frame and send it over the usual delegate path.
+- (void) takePicture;
+
+// these attempt to emulate UIImagePickerController
++ (BOOL) isCameraDeviceAvailable: (UIImagePickerControllerCameraDevice) cameraDevice;
++ (BOOL) isFlashAvailableForCameraDevice: (UIImagePickerControllerCameraDevice) cameraDevice;
++ (NSArray*) availableCaptureModesForCameraDevice: (UIImagePickerControllerCameraDevice) cameraDevice;
+@property(nonatomic) UIImagePickerControllerCameraDevice cameraDevice;
+@property(nonatomic) UIImagePickerControllerCameraFlashMode cameraFlashMode;
+@property(nonatomic) UIImagePickerControllerCameraCaptureMode cameraCaptureMode;
+@property(nonatomic) UIImagePickerControllerQualityType videoQuality;
+
 // direct access to the ZBarReaderView
 @property (nonatomic, readonly) ZBarReaderView *readerView;
 

data/lib/extensions/barcode/ext/barcode/platform/iphone/ZBarSDK/Headers/ZBarSDK/ZBarSDK.h

@@ -31,3 +31,4 @@
 #import "ZBarReaderController.h"
 #import "ZBarCaptureReader.h"
 #import "ZBarHelpController.h"
+#import "ZBarCameraSimulator.h"

data/lib/extensions/barcode/ext/barcode/platform/iphone/ZBarSDK/Headers/ZBarSDK/zbar.h

@@ -86,12 +86,15 @@ typedef enum zbar_color_e {
 typedef enum zbar_symbol_type_e {
     ZBAR_NONE        =      0,  /**< no symbol decoded */
     ZBAR_PARTIAL     =      1,  /**< intermediate status */
+    ZBAR_EAN2        =      2,  /**< GS1 2-digit add-on */
+    ZBAR_EAN5        =      5,  /**< GS1 5-digit add-on */
     ZBAR_EAN8        =      8,  /**< EAN-8 */
     ZBAR_UPCE        =      9,  /**< UPC-E */
     ZBAR_ISBN10      =     10,  /**< ISBN-10 (from EAN-13). @since 0.4 */
     ZBAR_UPCA        =     12,  /**< UPC-A */
     ZBAR_EAN13       =     13,  /**< EAN-13 */
     ZBAR_ISBN13      =     14,  /**< ISBN-13 (from EAN-13). @since 0.4 */
+    ZBAR_COMPOSITE   =     15,  /**< EAN/UPC composite */
     ZBAR_I25         =     25,  /**< Interleaved 2 of 5. @since 0.4 */
     ZBAR_DATABAR     =     34,  /**< GS1 DataBar (RSS). @since 0.11 */
     ZBAR_DATABAR_EXP =     35,  /**< GS1 DataBar Expanded. @since 0.11 */
@@ -100,10 +103,27 @@ typedef enum zbar_symbol_type_e {
     ZBAR_QRCODE      =     64,  /**< QR Code. @since 0.10 */
     ZBAR_CODE93      =     93,  /**< Code 93. @since 0.11 */
     ZBAR_CODE128     =    128,  /**< Code 128 */
-    ZBAR_SYMBOL      = 0x00ff,  /**< mask for base symbol type */
-    ZBAR_ADDON2      = 0x0200,  /**< 2-digit add-on flag */
-    ZBAR_ADDON5      = 0x0500,  /**< 5-digit add-on flag */
-    ZBAR_ADDON       = 0x0700,  /**< add-on flag mask */
+
+    /** mask for base symbol type.
+     * @deprecated in 0.11, remove this from existing code
+     */
+    ZBAR_SYMBOL      = 0x00ff,
+    /** 2-digit add-on flag.
+     * @deprecated in 0.11, a ::ZBAR_EAN2 component is used for
+     * 2-digit GS1 add-ons
+     */
+    ZBAR_ADDON2      = 0x0200,
+    /** 5-digit add-on flag.
+     * @deprecated in 0.11, a ::ZBAR_EAN5 component is used for
+     * 5-digit GS1 add-ons
+     */
+    ZBAR_ADDON5      = 0x0500,
+    /** add-on flag mask.
+     * @deprecated in 0.11, GS1 add-ons are represented using composite
+     * symbols of type ::ZBAR_COMPOSITE; add-on components use ::ZBAR_EAN2
+     * or ::ZBAR_EAN5
+     */
+    ZBAR_ADDON       = 0x0700,
 } zbar_symbol_type_t;
 
 /** decoded symbol coarse orientation.
@@ -203,6 +223,7 @@ extern const char *zbar_get_symbol_name(zbar_symbol_type_t sym);
  * @param sym symbol type encoding
  * @returns static string name for any addon, or the empty string
  * if no addons were decoded
+ * @deprecated in 0.11
  */
 extern const char *zbar_get_addon_name(zbar_symbol_type_t sym);
 
@@ -381,7 +402,7 @@ extern int zbar_symbol_get_loc_y(const zbar_symbol_t *symbol,
 
 /** retrieve general orientation of decoded symbol.
  * @returns a coarse, axis-aligned indication of symbol orientation or
- * ZBAR_ORIENT_UNKNOWN if unknown
+ * ::ZBAR_ORIENT_UNKNOWN if unknown
  * @since 0.11
  */
 extern zbar_orientation_t

data/lib/extensions/barcode/ext/barcode/platform/iphone/ZBarSDK/Headers/ZBarSDK/zbar/Decoder.h

@@ -115,6 +115,7 @@ class Decoder {
 
     /// retrieve string name for last decode addon.
     /// see zbar_get_addon_name()
+    /// @deprecated in 0.11
     const char *get_addon_name () const
     {
         return(zbar_get_addon_name(zbar_decoder_get_type(_decoder)));