Skip to content
Browse files

Move descriptions to html files.

  • Loading branch information...
1 parent db051ce commit 83f8e81ce21d8b70e9f688465a1b07a624922881 @jeradesign committed
Showing with 26 additions and 2 deletions.
  1. +3 −0 CVFCannyDemo.html
  2. +8 −0 CVFFaceDetect.html
  3. +8 −0 CVFunhouse.xcodeproj/project.pbxproj
  4. +7 −2 CVFunhouse/CVFMainViewController.m
View
3 CVFCannyDemo.html
@@ -0,0 +1,3 @@
+<h2>Canny Edge Detector</h2>
+<p>The Canny Edge Detector finds the edges of an image by looking for places where the intensity of the image changes rapidly. Edge detection is often a first step in object detection.</p>
+<p>For more information, see the <a href='http://en.wikipedia.org/wiki/Canny_edge_detector'> the WikiPedia article on the Canny Edge Detector</a>.</p>
View
8 CVFFaceDetect.html
@@ -0,0 +1,8 @@
+<h2>Face Detector</h2>
+<p>This face detector uses a technique called a cascade classifier to detect faces. The classifier scans across the entire image looking for face-like features. It's called a
+'cascade' because each candidate region is run through multiple dectectors, any of which
+can reject it.</p>
+<p>Note that this detector was trained with full-face images. If you tilt your head or show only a profile, the detector will not be able to find your face.</p>
+<p>For more information, see the
+<a href='http://docs.opencv.org/modules/objdetect/doc/cascade_classification.html'>
+the OpenCV Cascade Classifier documentation</a>.</p>
View
8 CVFunhouse.xcodeproj/project.pbxproj
@@ -27,6 +27,8 @@
4285252F15BF750000622EE8 /* haarcascade_frontalface_alt.xml in Resources */ = {isa = PBXBuildFile; fileRef = 4285252E15BF750000622EE8 /* haarcascade_frontalface_alt.xml */; };
4285253215BF792F00622EE8 /* CVFFarneback.m in Sources */ = {isa = PBXBuildFile; fileRef = 4285253115BF792F00622EE8 /* CVFFarneback.m */; };
4285253515BF83FF00622EE8 /* CVFLaplace.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4285253415BF83FF00622EE8 /* CVFLaplace.mm */; };
+ 428D978416A275450073329A /* CVFFaceDetect.html in Resources */ = {isa = PBXBuildFile; fileRef = 428D978216A275450073329A /* CVFFaceDetect.html */; };
+ 428D978516A275450073329A /* CVFCannyDemo.html in Resources */ = {isa = PBXBuildFile; fileRef = 428D978316A275450073329A /* CVFCannyDemo.html */; };
42AA08581508314600B379F4 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42AA08571508314600B379F4 /* UIKit.framework */; };
42AA085A1508314600B379F4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42AA08591508314600B379F4 /* Foundation.framework */; };
42AA085C1508314600B379F4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42AA085B1508314600B379F4 /* CoreGraphics.framework */; };
@@ -75,6 +77,8 @@
4285253115BF792F00622EE8 /* CVFFarneback.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CVFFarneback.m; path = CVFunhouse/CVFFarneback.m; sourceTree = "<group>"; };
4285253315BF83E700622EE8 /* CVFLaplace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CVFLaplace.h; path = CVFunhouse/CVFLaplace.h; sourceTree = "<group>"; };
4285253415BF83FF00622EE8 /* CVFLaplace.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CVFLaplace.mm; path = CVFunhouse/CVFLaplace.mm; sourceTree = "<group>"; };
+ 428D978216A275450073329A /* CVFFaceDetect.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = CVFFaceDetect.html; sourceTree = "<group>"; };
+ 428D978316A275450073329A /* CVFCannyDemo.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = CVFCannyDemo.html; sourceTree = "<group>"; };
42AA08531508314600B379F4 /* CVFunhouse.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CVFunhouse.app; sourceTree = BUILT_PRODUCTS_DIR; };
42AA08571508314600B379F4 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
42AA08591508314600B379F4 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -147,6 +151,8 @@
4285252915BF6CDF00622EE8 /* Resources */ = {
isa = PBXGroup;
children = (
+ 428D978216A275450073329A /* CVFFaceDetect.html */,
+ 428D978316A275450073329A /* CVFCannyDemo.html */,
423FA83915DB264B001D30AC /* iButton30.png */,
423FA83A15DB264B001D30AC /* iButton30@2x.png */,
423FA83515DB1AD3001D30AC /* SwitchCameraIcon44.png */,
@@ -294,6 +300,8 @@
423FA83B15DB264B001D30AC /* iButton30.png in Resources */,
423FA83C15DB264B001D30AC /* iButton30@2x.png in Resources */,
4208EEAD1612D46D006E7842 /* Default-568h@2x.png in Resources */,
+ 428D978416A275450073329A /* CVFFaceDetect.html in Resources */,
+ 428D978516A275450073329A /* CVFCannyDemo.html in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
9 CVFunhouse/CVFMainViewController.m
@@ -110,8 +110,10 @@ - (void)resetImageProcessor {
break;
}
- [self.descriptionView loadHTMLString:self.imageProcessor.demoDescription
- baseURL:nil];
+ NSString *className = NSStringFromClass([self.imageProcessor class]);
+ NSURL *descriptionUrl = [[NSBundle mainBundle] URLForResource:className withExtension:@"html"];
+ NSURLRequest *request = [NSURLRequest requestWithURL:descriptionUrl];
+ [self.descriptionView loadRequest:request];
}
- (void)showHideFPS {
@@ -228,6 +230,9 @@ - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)
if ([[url scheme] isEqual: @"about"]) {
return YES;
}
+ if ([[url scheme] isEqual:@"file"]) {
+ return YES;
+ }
[[UIApplication sharedApplication] openURL:url];
return NO;

0 comments on commit 83f8e81

Please sign in to comment.
Something went wrong with that request. Please try again.