[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809

[rpechayr]

The following commit has been merged in the upstream branch:
commit e39da7d3710129cd669e2c6aef10b3b7033f6a55
Author: rpechayr <rpechayr at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Sat Jun 19 16:58:19 2010 +0000

    [iphone][ScanTest] updated after update of ZingWidgetController
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1449 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/iphone/ScanTest/Classes/RootViewController.h b/iphone/ScanTest/Classes/RootViewController.h
index 3a26d1b..4da7839 100644
--- a/iphone/ScanTest/Classes/RootViewController.h
+++ b/iphone/ScanTest/Classes/RootViewController.h
@@ -11,7 +11,6 @@
 
 @interface RootViewController : UIViewController <ZXingDelegate> {
 	IBOutlet UITextView *resultsView;
-	ZXingWidgetController *scanController;
   NSString *resultsToDisplay;
 }
 @property (nonatomic, retain) IBOutlet UITextView *resultsView;
diff --git a/iphone/ScanTest/Classes/RootViewController.mm b/iphone/ScanTest/Classes/RootViewController.mm
index 36ff820..a0c3b60 100644
--- a/iphone/ScanTest/Classes/RootViewController.mm
+++ b/iphone/ScanTest/Classes/RootViewController.mm
@@ -9,8 +9,8 @@
 #import "RootViewController.h"
 #import "QRCodeReader.h"
 
+
 @interface RootViewController()
- at property (nonatomic,retain) ZXingWidgetController *scanController;
 
 @end
 
@@ -18,105 +18,96 @@
 @implementation RootViewController
 @synthesize resultsView;
 @synthesize resultsToDisplay;
- at synthesize scanController;
 #pragma mark -
 #pragma mark View lifecycle
 
 - (void)viewDidLoad {
-    [super viewDidLoad];
+  [super viewDidLoad];
 	[self setTitle:@"ZXing"];
-  
+}
+
+- (IBAction)scanPressed:(id)sender {
+	
   ZXingWidgetController *widController = [[ZXingWidgetController alloc] initWithDelegate:self showCancel:YES OneDMode:NO];
   QRCodeReader* qrcodeReader = [[QRCodeReader alloc] init];
   NSSet *readers = [[NSSet alloc ] initWithObjects:qrcodeReader,nil];
   [qrcodeReader release];
   widController.readers = readers;
   [readers release];
-  
-	self.scanController = widController;
+  NSBundle *mainBundle = [NSBundle mainBundle];
+	[widController setSoundToPlay:[[NSURL fileURLWithPath:[mainBundle pathForResource:@"beep-beep" ofType:@"aiff"] isDirectory:NO] retain]];
+  [self presentModalViewController:widController
+                          animated:YES];
   [widController release];
-	NSBundle *mainBundle = [NSBundle mainBundle];
-	[scanController setSoundToPlay:[[NSURL fileURLWithPath:[mainBundle pathForResource:@"beep-beep" ofType:@"aiff"] isDirectory:NO] retain]];
-   
 }
 
-- (IBAction)scanPressed:(id)sender {
-  //UIImagePickerController *picker = [[UIImagePickerController alloc] init];
-	[self presentModalViewController:scanController
-                          animated:YES];
-//	[self.navigationController pushViewController:scanController animated:true];
-}
 
-/*
 - (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
+  [super viewWillAppear:animated];
+  if (resultsToDisplay)
+  {
+    [resultsView setText:resultsToDisplay];
+    [resultsView setNeedsDisplay];
+  }
 }
-*/
+
 /*
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
-}
-*/
+ - (void)viewDidAppear:(BOOL)animated {
+ [super viewDidAppear:animated];
+ }
+ */
 /*
-- (void)viewWillDisappear:(BOOL)animated {
-	[super viewWillDisappear:animated];
-}
-*/
+ - (void)viewWillDisappear:(BOOL)animated {
+ [super viewWillDisappear:animated];
+ }
+ */
 /*
-- (void)viewDidDisappear:(BOOL)animated {
-	[super viewDidDisappear:animated];
-}
-*/
+ - (void)viewDidDisappear:(BOOL)animated {
+ [super viewDidDisappear:animated];
+ }
+ */
 
 /*
  // Override to allow orientations other than the default portrait orientation.
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-	// Return YES for supported orientations.
-	return (interfaceOrientation == UIInterfaceOrientationPortrait);
-}
+ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+ // Return YES for supported orientations.
+ return (interfaceOrientation == UIInterfaceOrientationPortrait);
+ }
  */
 
-#pragma mark Memory management
+#pragma mark -
+#pragma mark ZXingDelegateMethods
 
-- (void)scanResult:(NSString *)result {
-	//[self.resultsView setText:result];
-	[self dismissModalViewControllerAnimated:NO];
+- (void)zxingController:(ZXingWidgetController*)controller didScanResult:(NSString *)result {
+  [self dismissModalViewControllerAnimated:NO];
   self.resultsToDisplay = result;
 }
 
-- (void)viewWillAppear:(BOOL)animated {
-  if (resultsToDisplay)
-  {
-    [resultsView setText:resultsToDisplay];
-    [resultsView setNeedsDisplay];
-  }
+- (void)zxingControllerDidCancel:(ZXingWidgetController*)controller {
+  [self dismissModalViewControllerAnimated:YES];
 }
 
-- (void)cancelled {
-	[self dismissModalViewControllerAnimated:YES];
-}
 
 #pragma mark -
 #pragma mark Memory management
 
 - (void)didReceiveMemoryWarning {
-    // Releases the view if it doesn't have a superview.
-    [super didReceiveMemoryWarning];
-    
-    // Relinquish ownership any cached data, images, etc that aren't in use.
+  // Releases the view if it doesn't have a superview.
+  [super didReceiveMemoryWarning];
+  
+  // Relinquish ownership any cached data, images, etc that aren't in use.
 }
 
 - (void)viewDidUnload {
-    // Relinquish ownership of anything that can be recreated in viewDidLoad or on demand.
-    // For example: self.myOutlet = nil;
+  // Relinquish ownership of anything that can be recreated in viewDidLoad or on demand.
+  // For example: self.myOutlet = nil;
 }
 
 
 - (void)dealloc {
   [resultsView release];
-	[scanController release];
   [resultsToDisplay release];
-    [super dealloc];
+  [super dealloc];
 }
 
 
diff --git a/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj b/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj
index 4927b7c..1ddf1c1 100755
--- a/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj
+++ b/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj
@@ -118,8 +118,8 @@
 				080E96DDFE201D6D7F000001 /* Classes */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
-				29B97323FDCFA39411CA2CEA /* Frameworks */,
 				1F027F6D11A7BAB1006B06DE /* Dependencies */,
+				29B97323FDCFA39411CA2CEA /* Frameworks */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
 			);
 			name = CustomTemplate;

-- 
Multi-format 1D/2D barcode image processing library