Further fixes for more substantive comments on PR #295

Fix top reference line offset bug
Adds categories for UIKit extensions in MasterVC
Adds Options title for iPhone version of TestBed
Only changes in storyboard due to newer IB

Author: mackworth

Classes/BEMLine.m

@@ -73,7 +73,7 @@ - (void)drawRect:(CGRect)rect {
 
         if (self.enableTopReferenceFrameLine) {
             // Top Line
-            [referenceFramePath moveToPoint:   CGPointMake(0+offset,                       offset)];
+            [referenceFramePath moveToPoint:   CGPointMake(0,                              offset)];
             [referenceFramePath addLineToPoint:CGPointMake(self.frame.size.width,          offset)];
         }
 

Sample Project/SimpleLineChart.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1E03A0321EC8BED200CA4247 /* UITextField+Numbers.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E03A0311EC8BED200CA4247 /* UITextField+Numbers.m */; };
+		1E03A0351EC8BF4C00CA4247 /* UIButton+Switch.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E03A0341EC8BF4C00CA4247 /* UIButton+Switch.m */; };
 		1E960A851E7DF942000E2BB8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E960A841E7DF942000E2BB8 /* main.m */; };
 		1E960A881E7DF942000E2BB8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E960A871E7DF942000E2BB8 /* AppDelegate.m */; };
 		1E960A8E1E7DF942000E2BB8 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1E960A8C1E7DF942000E2BB8 /* Main.storyboard */; };
@@ -68,6 +70,10 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		1E03A0301EC8BED200CA4247 /* UITextField+Numbers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UITextField+Numbers.h"; sourceTree = "<group>"; };
+		1E03A0311EC8BED200CA4247 /* UITextField+Numbers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UITextField+Numbers.m"; sourceTree = "<group>"; };
+		1E03A0331EC8BF4C00CA4247 /* UIButton+Switch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIButton+Switch.h"; sourceTree = "<group>"; };
+		1E03A0341EC8BF4C00CA4247 /* UIButton+Switch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIButton+Switch.m"; sourceTree = "<group>"; };
 		1E960A811E7DF942000E2BB8 /* TestBed.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestBed.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		1E960A841E7DF942000E2BB8 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		1E960A861E7DF942000E2BB8 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -187,6 +193,10 @@
 				1E960A9B1E7DF9BB000E2BB8 /* DetailViewController.m */,
 				1E960A9C1E7DF9BB000E2BB8 /* MasterViewController.h */,
 				1E960A9D1E7DF9BB000E2BB8 /* MasterViewController.m */,
+				1E03A0331EC8BF4C00CA4247 /* UIButton+Switch.h */,
+				1E03A0341EC8BF4C00CA4247 /* UIButton+Switch.m */,
+				1E03A0301EC8BED200CA4247 /* UITextField+Numbers.h */,
+				1E03A0311EC8BED200CA4247 /* UITextField+Numbers.m */,
 				1E960A9E1E7DF9BB000E2BB8 /* StatsViewController.h */,
 				1E960A9F1E7DF9BC000E2BB8 /* StatsViewController.m */,
 				1E960AFB1E7F9C80000E2BB8 /* MSColorPicker */,
@@ -482,10 +492,12 @@
 				1E960AA81E7E0990000E2BB8 /* BEMGraphCalculator.m in Sources */,
 				1E960AA01E7DF9BC000E2BB8 /* ARFontPickerViewController.m in Sources */,
 				1E960B171E7F9C80000E2BB8 /* MSHSBView.m in Sources */,
+				1E03A0351EC8BF4C00CA4247 /* UIButton+Switch.m in Sources */,
 				1E960B121E7F9C80000E2BB8 /* MSColorComponentView.m in Sources */,
 				1E960A881E7DF942000E2BB8 /* AppDelegate.m in Sources */,
 				1E960AA31E7DF9BC000E2BB8 /* StatsViewController.m in Sources */,
 				1E960AA21E7DF9BC000E2BB8 /* MasterViewController.m in Sources */,
+				1E03A0321EC8BED200CA4247 /* UITextField+Numbers.m in Sources */,
 				1E960B141E7F9C80000E2BB8 /* MSColorSelectionViewController.m in Sources */,
 				1E960B161E7F9C80000E2BB8 /* MSColorWheelView.m in Sources */,
 				1E960A851E7DF942000E2BB8 /* main.m in Sources */,

Sample Project/TestBed/Base.lproj/Main.storyboard

@@ -10,13 +10,8 @@
 #import "DetailViewController.h"
 #import "ARFontPickerViewController.h"
 #import "MSColorSelectionViewController.h"
-
-//some convenience extensions for setting and reading
-@interface UITextField (Numbers)
-@property (nonatomic) CGFloat floatValue;
-@property (nonatomic) NSUInteger intValue;
-
-@end
+#import "UITextField+Numbers.h"
+#import "UIButton+Switch.h"
 
 @interface MasterViewController () <MSColorSelectionViewControllerDelegate, UIPopoverPresentationControllerDelegate>
 
@@ -26,67 +21,6 @@ @interface MasterViewController () <MSColorSelectionViewControllerDelegate, UIPo
 @property (strong, nonatomic) UIView * currentColorChip;
 @end
 
-@implementation UITextField (Numbers)
-
-- (void)setFloatValue:(CGFloat) num {
-    if (num < 0.0) {
-        self.text = @"";
-    } else if (num >= NSNotFound ) {
-            self.text = @"oopsf";
-    } else {
-        self.text = [NSString stringWithFormat:@"%0.1f",num];
-    }
-}
-
-- (void)setIntValue:(NSUInteger) num {
-    if (num == NSNotFound ) {
-        self.text = @"";
-    } else if (num == (NSUInteger)-1 ) {
-        self.text = @"oops";
-    }else {
-        self.text = [NSString stringWithFormat:@"%d",(int)num];
-    }
-}
-
-- (CGFloat)floatValue {
-    if (self.text.length ==0) {
-        return -1.0;
-    } else {
-        return (CGFloat) self.text.floatValue;
-    }
-}
-
-- (NSUInteger)intValue {
-    if (self.text.length ==0) {
-        return NSNotFound;
-    } else {
-        return (NSUInteger) self.text.integerValue;
-    }
-
-}
-
-@end
-
-@interface UIButton (Switch)
-@property (nonatomic) BOOL on;
-@end\
-
-@implementation UIButton (Switch)
-static NSString * checkOff = @"☐";
-static NSString * checkOn = @"☒";
-
-- (void)setOn: (BOOL) on {
-    [self setTitle: (on ? checkOn : checkOff) forState:UIControlStateNormal];
-}
-
-- (BOOL)on  {
-    if (!self.currentTitle) return NO;
-    return [checkOff isEqualToString: ( NSString * _Nonnull )self.currentTitle ];
-}
-
-@end
-
-
 @interface MasterViewController () <ARFontPickerViewControllerDelegate, UITextFieldDelegate>
 
 @property (nonatomic) BOOL hasRestoredUI;
@@ -199,6 +133,7 @@ CGGradientRef createGradient () {
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view, typically from a nib.
+    self.title = @"Options";
     self.hasRestoredUI = NO;
     self.detailViewController = (DetailViewController *)[[self.splitViewController.viewControllers lastObject] topViewController];
 }

Sample Project/TestBed/MasterViewController.m

@@ -0,0 +1,14 @@
+//
+//  UIButton+Switch.h
+//  SimpleLineChart
+//
+//  Created by Hugh Mackworth on 5/14/17.
+//  Copyright © 2017 Boris Emorine. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UIButton (Switch)
+@property (nonatomic) BOOL on;
+
+@end

Sample Project/TestBed/UIButton+Switch.h

@@ -0,0 +1,24 @@
+//
+//  UIButton+Switch.m
+//  SimpleLineChart
+//
+//  Created by Hugh Mackworth on 5/14/17.
+//  Copyright © 2017 Boris Emorine. All rights reserved.
+//
+
+#import "UIButton+Switch.h"
+
+@implementation UIButton (Switch)
+static NSString * checkOff = @"☐";
+static NSString * checkOn = @"☒";
+
+- (void)setOn: (BOOL) on {
+    [self setTitle: (on ? checkOn : checkOff) forState:UIControlStateNormal];
+}
+
+- (BOOL)on {
+    if (!self.currentTitle) return NO;
+    return [checkOff isEqualToString: ( NSString * _Nonnull )self.currentTitle ];
+}
+
+@end

Sample Project/TestBed/UIButton+Switch.m

@@ -0,0 +1,16 @@
+//
+//  UITextField+Numbers.h
+//  SimpleLineChart
+//
+//  Created by Hugh Mackworth on 5/14/17.
+//  Copyright © 2017 Boris Emorine. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//some convenience extensions for setting and reading
+@interface UITextField (Numbers)
+@property (nonatomic) CGFloat floatValue;
+@property (nonatomic) NSUInteger intValue;
+
+@end

Sample Project/TestBed/UITextField+Numbers.h

@@ -0,0 +1,50 @@
+//
+//  UITextField+Numbers.m
+//  SimpleLineChart
+//
+//  Created by Hugh Mackworth on 5/14/17.
+//  Copyright © 2017 Boris Emorine. All rights reserved.
+//
+
+#import "UITextField+Numbers.h"
+
+@implementation UITextField (Numbers)
+
+- (void)setFloatValue:(CGFloat) num {
+    if (num < 0.0) {
+        self.text = @"";
+    } else if (num >= NSNotFound ) {
+        self.text = @"oopsf";
+    } else {
+        self.text = [NSString stringWithFormat:@"%0.1f",num];
+    }
+}
+
+- (void)setIntValue:(NSUInteger) num {
+    if (num == NSNotFound ) {
+        self.text = @"";
+    } else if (num == (NSUInteger)-1 ) {
+        self.text = @"oops";
+    }else {
+        self.text = [NSString stringWithFormat:@"%d",(int)num];
+    }
+}
+
+- (CGFloat)floatValue {
+    if (self.text.length ==0) {
+        return -1.0;
+    } else {
+        return (CGFloat) self.text.floatValue;
+    }
+}
+
+- (NSUInteger)intValue {
+    if (self.text.length ==0) {
+        return NSNotFound;
+    } else {
+        return (NSUInteger) self.text.integerValue;
+    }
+
+}
+
+@end