add magnification label

Author: yusukeiwama

iMandelbrot.xcodeproj/project.pbxproj

@@ -399,7 +399,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_OPTIMIZATION_LEVEL = fast;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "iMandelbrot/iMandelbrot-Prefix.pch";
 				INFOPLIST_FILE = "iMandelbrot/iMandelbrot-Info.plist";

iMandelbrot/USKFractalView.h

@@ -8,8 +8,17 @@
 
 #import <UIKit/UIKit.h>
 
+@protocol USKFractalViewDelegate <NSObject>
+
+- (void)updateMagnificationLabel;
+
+@end
+
 @interface USKFractalView : UIImageView
 
+@property id delegate;
+@property (readonly) double currentMagnification;
+
 - (void)drawMandelbrotSet;
 - (void)drawMandelbrotSetInComplexRect:(CGRect)cRect;
 

iMandelbrot/USKFractalView.m

@@ -14,13 +14,31 @@ @implementation USKFractalView {
 	CGRect currentCRect;
 }
 
+@synthesize delegate;
+@synthesize currentMagnification;
+
 - (id)initWithFrame:(CGRect)frame
 {
     self = [super initWithFrame:frame];
     if (self) {
         // Initialization code
 		self.contentMode = UIViewContentModeScaleAspectFit;
 		self.userInteractionEnabled = YES;
+
+		width = frame.size.width;
+		height = frame.size.height;
+		
+//		if ([[UIScreen mainScreen] respondsToSelector:@selector(displayLinkWithTarget:selector:)] &&
+//			([UIScreen mainScreen].scale == 2.0)) {
+//			// Retina display
+//			width = frame.size.width * 2.0;
+//			height = frame.size.height * 2.0;
+//		} else {
+//			// non-Retina display
+//			width = frame.size.width;
+//			height = frame.size.height;
+//		}
+		
 		[self drawMandelbrotSet];
     }
     return self;
@@ -29,6 +47,8 @@ - (id)initWithFrame:(CGRect)frame
 - (void)drawMandelbrotSet
 {
 	CGRect complexRect = CGRectMake(-2.0, -2.0, 4.0, 4.0);
+	currentMagnification = 1.0;
+	[delegate updateMagnificationLabel];
 	[self drawMandelbrotSetInComplexRect:complexRect];
 }
 
@@ -41,9 +61,6 @@ - (void)drawMandelbrotSetInComplexRect:(CGRect)cRect
 	NSUInteger iteration;
 	double _Complex z0 = 0 + 0 * I;
 
-	width = 1536;
-	height = width;
-	
 	size_t bytePerPixel = sizeof(unsigned char) * 3;
 	size_t bitsPerPixel, bytesPerRow;
 	unsigned char *imageData = calloc(width * height, sizeof(unsigned char) * bytePerPixel);
@@ -113,10 +130,15 @@ - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
 	CGPoint complexP = CGPointMake(currentCRect.origin.x + currentCRect.size.width * relativeP.x,
 								   currentCRect.origin.y + currentCRect.size.height * relativeP.y);
 	CGSize newSize = CGSizeMake(currentCRect.size.width / magnification, currentCRect.size.height / magnification);
-	[self drawMandelbrotSetInComplexRect:CGRectMake(complexP.x - newSize.width / 2.0,
-													complexP.y - newSize.height / 2.0,
-													newSize.width,
-													newSize.height)];
+	
+	[UIView animateWithDuration:0.5 animations:^{
+		[self drawMandelbrotSetInComplexRect:CGRectMake(complexP.x - newSize.width / 2.0,
+														complexP.y - newSize.height / 2.0,
+														newSize.width,
+														newSize.height)];
+	}];
+	currentMagnification *= magnification;
+	[delegate updateMagnificationLabel];
 }
 
 

iMandelbrot/USKViewController.h

@@ -7,7 +7,8 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "USKFractalView.h"
 
-@interface USKViewController : UIViewController
+@interface USKViewController : UIViewController <USKFractalViewDelegate>
 
 @end

iMandelbrot/USKViewController.m

@@ -7,9 +7,11 @@
 //
 
 #import "USKViewController.h"
-#import "USKFractalView.h"
 
-@interface USKViewController ()
+@interface USKViewController () {
+	USKFractalView *fractalView;
+	UILabel *magnificationLabel;
+}
 
 @end
 
@@ -20,16 +22,24 @@ - (void)viewDidLoad
     [super viewDidLoad];
 	// Do any additional setup after loading the view, typically from a nib.
 
-	USKFractalView *iv = [[USKFractalView alloc] initWithFrame:CGRectMake(0, 0, [[UIScreen mainScreen] bounds].size.width, [[UIScreen mainScreen] bounds].size.width)];
-	iv.center = self.view.center;
-	[self.view addSubview:iv];
+	fractalView = [[USKFractalView alloc] initWithFrame:CGRectMake(0, 0, [[UIScreen mainScreen] bounds].size.width, [[UIScreen mainScreen] bounds].size.width)];
+	fractalView.delegate = self;
+	fractalView.center = self.view.center;
+	[self.view addSubview:fractalView];
 	self.view.backgroundColor = [UIColor whiteColor];
 
 	UIButton *backButton = [UIButton buttonWithType:UIButtonTypeSystem];
-	[backButton addTarget:iv action:@selector(drawMandelbrotSet) forControlEvents:UIControlEventTouchUpInside];
+	[backButton addTarget:fractalView action:@selector(drawMandelbrotSet) forControlEvents:UIControlEventTouchUpInside];
 	backButton.frame = CGRectMake(20, [[UIScreen mainScreen] bounds].size.height - 108, [[UIScreen mainScreen] bounds].size.width - 40, 88);
 	[backButton setTitle:@"Back" forState:UIControlStateNormal];
 	[self.view addSubview:backButton];
+	
+	magnificationLabel = [[UILabel alloc] initWithFrame:CGRectMake(20, 20, [[UIScreen mainScreen] bounds].size.width - 40, 88)];
+	magnificationLabel.textAlignment = NSTextAlignmentRight;
+	magnificationLabel.adjustsFontSizeToFitWidth = YES;
+	magnificationLabel.font = [UIFont fontWithName:@"Helvetica" size:88];
+	[self updateMagnificationLabel];
+	[self.view addSubview:magnificationLabel];
 }
 
 - (void)didReceiveMemoryWarning
@@ -38,4 +48,9 @@ - (void)didReceiveMemoryWarning
     // Dispose of any resources that can be recreated.
 }
 
+- (void)updateMagnificationLabel
+{
+	magnificationLabel.text = [NSString stringWithFormat:@"x%.1f", fractalView.currentMagnification];
+}
+
 @end