Misc NSInteger type issues when compiling with strict and floats on 32 bit fr

Add EOL to some files
Fix for bezier edge of closed background (need to simplify)
New delegate to reformat yaxis labels
don't remove top level views when no data
Calc locations after sections laid out
Fix for right hand label out of bounds

Author: mackworth

Classes/BEMAverageLine.m

@@ -35,9 +35,9 @@ - (instancetype) initWithCoder:(NSCoder *)coder {
 
     RestoreProperty (enableAverageLine, Bool);
     RestoreProperty (color, Object);
-    RestoreProperty (yValue, Double);
-    RestoreProperty (alpha, Double);
-    RestoreProperty (width, Double);
+    RestoreProperty (yValue, Float);
+    RestoreProperty (alpha, Float);
+    RestoreProperty (width, Float);
     RestoreProperty (dashPattern, Object);
     RestoreProperty (title, Object);
 #pragma clang diagnostic pop
@@ -51,9 +51,9 @@ - (void) encodeWithCoder: (NSCoder *)coder {
 #define EncodeProperty(property, type) [coder encode ## type: self.property forKey:@#property]
     EncodeProperty (enableAverageLine, Bool);
     EncodeProperty (color, Object);
-    EncodeProperty (yValue, Float);
-    EncodeProperty (alpha, Float);
-    EncodeProperty (width, Float);
+    EncodeProperty (yValue, Double);
+    EncodeProperty (alpha, Double);
+    EncodeProperty (width, Double);
     EncodeProperty (dashPattern, Object);
     EncodeProperty (title, Object);
 }

Classes/BEMCircle.h

@@ -28,4 +28,4 @@
 /// The value of the point
 @property (nonatomic) CGFloat absoluteValue;
 
-@end
+@end

Classes/BEMCircle.m

@@ -27,4 +27,4 @@ - (void)drawRect:(CGRect)rect {
     CGContextFillPath(ctx);
 }
 
-@end
+@end

Classes/BEMGraphCalculator.m

@@ -272,13 +272,13 @@ - (NSNumber *)calculateCorrelationCoefficientUsingCorrelationMethod:(BEMCorrelat
     // Calculate the correlational value
     CGFloat numeratorFirstChunk = (pointsCount * sumXY); // Calculate the mean of the points
     CGFloat numeratorSecondChunk = (sumX * sumY); // Calculate total graph values
-    CGFloat denomenatorFirstChunk = sqrt(pointsCount * sumX2 - (sumX * sumX)); // Square root of the sum of all X-Values squared
-    CGFloat denomenatorSecondChunk = sqrt(pointsCount * sumY2 - (sumY * sumY)); // Square root of the sum of all Y-Values squared
-    CGFloat correlation = (numeratorFirstChunk - numeratorSecondChunk) / (denomenatorFirstChunk * denomenatorSecondChunk);
+    double denomenatorFirstChunk = sqrt(pointsCount * sumX2 - (sumX * sumX)); // Square root of the sum of all X-Values squared
+    double denomenatorSecondChunk = sqrt(pointsCount * sumY2 - (sumY * sumY)); // Square root of the sum of all Y-Values squared
+    double correlation = (numeratorFirstChunk - numeratorSecondChunk) / (denomenatorFirstChunk * denomenatorSecondChunk);
 
     // NSLog(@"CORRELATION:\nSlope: %f\nIntercept:%f\nCorrelation:%f", slope, intercept, correlation);
 
-    return [NSNumber numberWithFloat:correlation];
+    return @(correlation);
 }
 
 - (BEMPearsonCorrelationStrength)calculatePearsonCorrelationStrengthOnGraph:(BEMSimpleLineGraphView *)graph xAxisScale:(nonnull NSNumber *)scale {

Classes/BEMLine.m

@@ -73,7 +73,7 @@ - (void)drawRect:(CGRect)rect {
     if (self.enableReferenceLines == YES) {
         if (self.arrayOfVerticalReferenceLinePoints.count > 0) {
             for (NSNumber *xNumber in self.arrayOfVerticalReferenceLinePoints) {
-                CGFloat xValue =[xNumber doubleValue];
+                CGFloat xValue =[xNumber floatValue];
                 CGPoint initialPoint = CGPointMake(xValue, self.frame.size.height);
                 CGPoint finalPoint = CGPointMake(xValue, 0);
 
@@ -333,7 +333,7 @@ - (void)drawRect:(CGRect)rect {
 }
 
 static CGPoint midPointForPoints(CGPoint p1, CGPoint p2) {
-    CGFloat avgY = (p1.y + p2.y) / 2.0;
+    CGFloat avgY = (p1.y + p2.y) / 2.0f;
     if (isinf(avgY)) avgY = BEMNullGraphValue;
     return CGPointMake((p1.x + p2.x) / 2, avgY);
 }
@@ -344,14 +344,16 @@ + (UIBezierPath *)pathWithPoints:(NSArray <NSValue *> *)points curved:(BOOL) cur
     //Also, if not open, then first/last points are for frame, and should not affect curve.
     UIBezierPath *path = [UIBezierPath bezierPath];
     CGPoint p1 = [points[0] CGPointValue];
-    NSUInteger dataStart = open ? 1 : 2;
-    NSUInteger dataEnd = points.count-(open ? 1 : 2);
+    NSUInteger dataStart = 1;
+    NSUInteger dataEnd = points.count-1;
     [path moveToPoint:p1];
     if (!open) {
-        //skip first point (not data)
-        dataStart = 2;
-        p1 = [points[1] CGPointValue];
+        //skip first/last points (frame, not data) to ensure line/frame use same bezier path
+        [path addLineToPoint:[points[1] CGPointValue]];
+        p1 = [points[2] CGPointValue];
         [path addLineToPoint:p1];
+        dataStart += 2;
+        dataEnd -= 2;
     }
     CGPoint oldControlPoint = p1;
     for (NSUInteger pointIndex = dataStart; pointIndex< points.count; pointIndex++) {

Classes/BEMSimpleLineGraphView.h

@@ -430,6 +430,15 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
  */
 - (nullable NSString *)lineGraph:(nonnull BEMSimpleLineGraphView *)graph labelOnXAxisForLocation:(CGFloat)location;
 
+//------- Y AXIS -------//
+
+/** The string to display on the label on the Y-axis at a given value.
+ @discussion this overrids yAxisPrefixOnLineGraph and yAxisSuffixfixOnLineGraph.
+ @param graph The graph object which is requesting the label on the specified Y-Axis position.
+ @param location The value for a label in the same units/range as valueForPointAtIndex.
+ */
+- (nullable NSString *)lineGraph:(nonnull BEMSimpleLineGraphView *)graph labelOnYAxisForValue:(CGFloat)value;
+
 
 @end