-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
challenge
authored and
challenge
committed
Feb 7, 2015
1 parent
b3eef04
commit 1a4b895
Showing
2 changed files
with
26 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,16 +24,16 @@ class ViewController: UIViewController,UIImagePickerControllerDelegate,UINavigat | |
@IBOutlet var fbLoginView : FBLoginView! //creating the outlet | ||
|
||
@IBOutlet var mainView: UIView! | ||
@IBOutlet weak var crosshair: UIImageView! | ||
@IBOutlet weak var btnStart: UIButton! | ||
@IBOutlet weak var backgroundImage: UIImageView! | ||
//@IBOutlet weak var crosshair: UIImageView! | ||
//@IBOutlet weak var backgroundImage: UIImageView! | ||
|
||
@IBOutlet weak var btnStart: UIButton! | ||
var array = [] | ||
override func viewDidLoad() { | ||
super.viewDidLoad() | ||
self.btnStart.hidden = true | ||
self.backgroundImage.hidden = true | ||
self.crosshair.hidden = true | ||
//self.backgroundImage.hidden = true | ||
//self.crosshair.hidden = true | ||
//initiating LoginView | ||
self.fbLoginView.delegate = self | ||
//initiating permission levels (could be modified for photo permis sions etc.) | ||
|
@@ -51,7 +51,7 @@ class ViewController: UIViewController,UIImagePickerControllerDelegate,UINavigat | |
|
||
} | ||
|
||
|
||
/* | ||
func createOverlayView() -> UIView{ | ||
|
||
//Initialize the overlay view | ||
|
@@ -71,6 +71,7 @@ class ViewController: UIViewController,UIImagePickerControllerDelegate,UINavigat | |
|
||
return overlay | ||
} | ||
*/ | ||
/* | ||
@IBAction func btnStartTapped(sender: AnyObject) { | ||
//TESTING CODE | ||
|
@@ -108,6 +109,7 @@ class ViewController: UIViewController,UIImagePickerControllerDelegate,UINavigat | |
} | ||
*/ | ||
/*New method using AVCaptureSession*/ | ||
/* | ||
func openCamera(){ | ||
var error : NSError? | ||
var session : AVCaptureSession = AVCaptureSession() | ||
|
@@ -161,11 +163,12 @@ class ViewController: UIViewController,UIImagePickerControllerDelegate,UINavigat | |
alertView.show() | ||
} | ||
} | ||
*/ | ||
/* | ||
Responsible for face detection. | ||
@author Towhid Absar <[email protected]> | ||
*/ | ||
/* | ||
func imagePickerController(picker: UIImagePickerController!, didFinishPickingMediaWithInfo info: NSDictionary) { | ||
//picks the image from the picker controller. | ||
let photo = info[UIImagePickerControllerOriginalImage] as UIImage | ||
|
@@ -272,7 +275,7 @@ class ViewController: UIViewController,UIImagePickerControllerDelegate,UINavigat | |
|
||
} | ||
|
||
|
||
*/ | ||
|
||
|
||
|
||
|