Bug fixes:

Line clipsToBounds to avoid drawing outside the box (when extrapolating nulls or user set minValue too High)
Top/Bottom reference lines were outside box
When Bezier off and Interpolate nulls off, properly draws line segments now
Removed VMA NSLog from TestBed/MasterController

Author: mackworth

Classes/BEMLine.m

@@ -33,6 +33,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
         _enableLeftReferenceFrameLine = YES;
         _enableBottomReferenceFrameLine = YES;
         _interpolateNullValues = YES;
+        self.clipsToBounds = YES;
     }
     return self;
 }
@@ -59,8 +60,8 @@ - (void)drawRect:(CGRect)rect {
     if (self.enableReferenceFrame == YES) {
         if (self.enableBottomReferenceFrameLine) {
             // Bottom Line
-            [referenceFramePath moveToPoint:CGPointMake(0, self.frame.size.height)];
-            [referenceFramePath addLineToPoint:CGPointMake(self.frame.size.width, self.frame.size.height)];
+            [referenceFramePath moveToPoint:CGPointMake(0, self.frame.size.height-self.referenceLineWidth/4)];
+            [referenceFramePath addLineToPoint:CGPointMake(self.frame.size.width, self.frame.size.height-self.referenceLineWidth/4)];
         }
 
         if (self.enableLeftReferenceFrameLine) {
@@ -71,8 +72,8 @@ - (void)drawRect:(CGRect)rect {
 
         if (self.enableTopReferenceFrameLine) {
             // Top Line
-            [referenceFramePath moveToPoint:CGPointMake(0+self.referenceLineWidth/4, 0)];
-            [referenceFramePath addLineToPoint:CGPointMake(self.frame.size.width, 0)];
+            [referenceFramePath moveToPoint:CGPointMake(0+self.referenceLineWidth/4, self.referenceLineWidth/4)];
+            [referenceFramePath addLineToPoint:CGPointMake(self.frame.size.width, self.referenceLineWidth/4)];
         }
 
         if (self.enableRightReferenceFrameLine) {
@@ -192,12 +193,12 @@ - (void)drawRect:(CGRect)rect {
         fillBottom = [BEMLine quadCurvedPathWithPoints:self.bottomPointsArray open:NO];
         fillTop = [BEMLine quadCurvedPathWithPoints:self.topPointsArray open:NO];
     } else if (!self.disableMainLine && !self.bezierCurveIsEnabled) {
-        line = [BEMLine linesToPoints:self.points];
-        fillBottom = [BEMLine linesToPoints:self.bottomPointsArray];
-        fillTop = [BEMLine linesToPoints:self.topPointsArray];
+        line = [BEMLine linesToPoints:self.points open:YES];
+        fillBottom = [BEMLine linesToPoints:self.bottomPointsArray open:NO];
+        fillTop = [BEMLine linesToPoints:self.topPointsArray open:NO];
     } else {
-        fillBottom = [BEMLine linesToPoints:self.bottomPointsArray];
-        fillTop = [BEMLine linesToPoints:self.topPointsArray];
+        fillBottom = [BEMLine linesToPoints:self.bottomPointsArray open:NO];
+        fillTop = [BEMLine linesToPoints:self.topPointsArray open:NO];
     }
 
     //----------------------------//
@@ -340,15 +341,22 @@ - (void)drawRect:(CGRect)rect {
     return bottomPoints;
 }
 
-+ (UIBezierPath *)linesToPoints:(NSArray <NSValue *> *)points {
++ (UIBezierPath *)linesToPoints:(NSArray <NSValue *> *)points open:(BOOL) canSkipPoints {
     UIBezierPath *path = [UIBezierPath bezierPath];
     NSValue *value = points[0];
     CGPoint p1 = [value CGPointValue];
     [path moveToPoint:p1];
 
     for (NSValue * point in points) {
+        if (point == value) continue; //already at first point
         CGPoint p2 = [point CGPointValue];
-        [path addLineToPoint:p2];
+
+        if (canSkipPoints && (p1.y >= BEMNullGraphValue || p2.y >= BEMNullGraphValue)) {
+            [path moveToPoint:p2];
+        } else {
+            [path addLineToPoint:p2];
+        }
+        p1 = p2;
     }
     return path;
 }

Classes/BEMSimpleLineGraphView.m

@@ -519,7 +519,11 @@ - (CGFloat) calculateWidestLabel {
     } else {
         widestNumber  = [self labelWidthForValue:self.frame.size.height] ;
     }
-    return MAX(widestNumber,    [self.averageLine.title sizeWithAttributes:attributes].width);
+    if (self.averageLine.enableAverageLine) {
+        return MAX(widestNumber,    [self.averageLine.title sizeWithAttributes:attributes].width);
+    } else {
+        return widestNumber;
+    }
 }
 
 
@@ -1003,6 +1007,7 @@ - (void)drawYAxis {
             if ([self.delegate respondsToSelector:@selector(baseValueForYAxisOnLineGraph:)] && [self.delegate respondsToSelector:@selector(incrementValueForYAxisOnLineGraph:)]) {
                 value = [self.delegate baseValueForYAxisOnLineGraph:self];
                 increment = [self.delegate incrementValueForYAxisOnLineGraph:self];
+                if (increment <= 0) increment = 1;
                 numberOfLabels = (NSUInteger) ((self.maxValue - value)/increment)+1;
                 if (numberOfLabels > 100) {
                     NSLog(@"[BEMSimpleLineGraph] Increment does not properly lay out Y axis, bailing early");
@@ -1447,7 +1452,7 @@ - (CGFloat)yPositionForDotValue:(CGFloat)dotValue {
             CGFloat percentValue = (dotValue - self.minValue) / (self.maxValue - self.minValue);
             CGFloat topOfChart = self.frame.size.height - padding/2.0f;
             CGFloat sizeOfChart = self.frame.size.height - padding;
-            positionOnYAxis = topOfChart - percentValue * sizeOfChart + self.XAxisLabelYOffset/2;
+            positionOnYAxis = topOfChart - percentValue * sizeOfChart + self.XAxisLabelYOffset;
         }
     } else {
         positionOnYAxis = ((self.frame.size.height) - dotValue);

Sample Project/TestBed/MasterViewController.m

@@ -206,7 +206,6 @@ - (void)viewDidLoad {
 -(void) viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     if (!self.hasRestoredUI) [self restoreUI];
-    NSLog(@"VWA");
 }
 
 -(void) decodeRestorableStateWithCoder:(NSCoder *)coder {