Convert back to NSInteger in API for Swift compatibility

Enable signed conversion checking and fix issues
Fix test for white/alpha to handle extended Grey space

Author: mackworth

Classes/BEMGraphCalculator.m

@@ -237,23 +237,23 @@ - (NSNumber *)calculateCorrelationCoefficientUsingCorrelationMethod:(BEMCorrelat
     NSMutableArray <NSNumber *> *xPoints = [NSMutableArray arrayWithCapacity:yPoints.count];
     if (scale == nil || scale.floatValue == 0.0) {
         for (NSUInteger i = 1; i <= yPoints.count; i++) {
-            [xPoints addObject:[NSNumber numberWithInteger:i]];
+            [xPoints addObject:@(i)];
         }
     } else {
         for (NSUInteger i = 1; i <= yPoints.count; i++) {
-            [xPoints addObject:[NSNumber numberWithFloat:(i*scale.floatValue)]];
+            [xPoints addObject:@(i*scale.floatValue)];
         }
     }
 
     // Set the initial values of our sum counts
-    NSInteger pointsCount = yPoints.count;
+    NSUInteger pointsCount = yPoints.count;
     CGFloat sumY = 0.0;
     CGFloat sumX = 0.0;
     CGFloat sumXY = 0.0;
     CGFloat sumX2 = 0.0;
     CGFloat sumY2 = 0.0;
 
-    NSInteger iterationCount = 0;
+    NSUInteger iterationCount = 0;
     for (NSNumber *yPoint in yPoints) {
         NSNumber *xPoint = xPoints[iterationCount];
         iterationCount++;

Classes/BEMLine.m

@@ -153,19 +153,19 @@ - (void)drawRect:(CGRect)rect {
 
             } else if (value == self.points[numPoints-1]) {
                 //extrapolate a right edge poit from previous two actual values
-                NSInteger firstPos = numPoints-2; //look for first real value
-                while (firstPos >= 0 && self.points[firstPos].CGPointValue.y >= BEMNullGraphValue) firstPos--;
+                NSInteger firstPos = ((NSInteger)numPoints)-2; //look for first real value
+                while (firstPos >= 0 && self.points[(NSUInteger)firstPos].CGPointValue.y >= BEMNullGraphValue) firstPos--;
                 if (firstPos < 0 ) continue;  // all NaNs?? =>don't create any line; should already be gone
 
-                CGFloat firstValue = self.points[firstPos].CGPointValue.y;
+                CGFloat firstValue = self.points[(NSUInteger)firstPos].CGPointValue.y;
                 NSInteger secondPos = firstPos-1; //look for second real value
-                while (secondPos >= 0 && self.points[secondPos].CGPointValue.y >= BEMNullGraphValue) secondPos--;
+                while (secondPos >= 0 && self.points[(NSUInteger)secondPos].CGPointValue.y >= BEMNullGraphValue) secondPos--;
                 if (secondPos < 0) {
                     // only one real number
                     yValue = firstValue;
                 } else {
-                    CGFloat delta = firstValue - self.points[secondPos].CGPointValue.y;
-                    yValue = firstValue + (numPoints - firstPos-1)*delta/(firstPos - secondPos);
+                    CGFloat delta = firstValue - self.points[(NSUInteger)secondPos].CGPointValue.y;
+                    yValue = firstValue + ((NSInteger)numPoints - firstPos-1)*delta/(firstPos - secondPos);
                 }
 
             } else {

Classes/BEMSimpleLineGraphView.h

@@ -162,15 +162,15 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
 
 /** The number of fingers required to report touches to the graph's delegate. The default value is 1.
  @discussion Setting this value to greater than 1 might be beneficial in interfaces that allow the graph to scroll and still want to use touch reporting. */
-@property (nonatomic) NSUInteger touchReportFingersRequired;
+@property (nonatomic) NSInteger touchReportFingersRequired;
 
 
 /// If set to YES, a label will pop up on the graph when the user touches it. It will be displayed on top of the closest point from the user current touch location. Default value is NO.
 @property (nonatomic) BOOL enablePopUpReport;
 
 
 /// If set to YES, the graph will react to pinch/zoom gesture to allow user to focus on one section of data. When zoomed, double-finger paning means "move graph" and double-tap will restore scale. Default value is NO.
-@property (nonatomic) BOOL enableUserScaling;
+@property (nonatomic) IBInspectable BOOL enableUserScaling;
 
 /// Current zoom level; normally set by user through pinch/zoom gestures. Min value is 1.0, which means all data should be displayed.
 @property (nonatomic) CGFloat zoomScale;
@@ -402,14 +402,14 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
 /** The number of points along the X-axis of the graph.
  @param graph The graph object requesting the total number of points.
  @return The total number of points in the line graph. */
-- (NSUInteger)numberOfPointsInLineGraph:(BEMSimpleLineGraphView *)graph;
+- (NSInteger)numberOfPointsInLineGraph:(BEMSimpleLineGraphView *)graph;
 
 
 /** The vertical position for a point at the given index. It corresponds to the Y-axis value of the Graph.
  @param graph The graph object requesting the point value.
  @param index The index from left to right of a given point (X-axis). The first value for the index is 0.
  @return The Y-axis value at a given index. */
-- (CGFloat)lineGraph:(BEMSimpleLineGraphView *)graph valueForPointAtIndex:(NSUInteger)index;
+- (CGFloat)lineGraph:(BEMSimpleLineGraphView *)graph valueForPointAtIndex:(NSInteger)index;
 
 
 @optional
@@ -421,7 +421,7 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
  @discussion The number of strings to be returned should be equal to the number of points in the graph (returned in \p numberOfPointsInLineGraph). Otherwise, an exception may be thrown.
  @param graph The graph object which is requesting the label on the specified X-Axis position.
  @param index The index from left to right of a given label on the X-axis. Is the same index as the one for the points. The first value for the index is 0. */
-- (nullable NSString *)lineGraph:(nonnull BEMSimpleLineGraphView *)graph labelOnXAxisForIndex:(NSUInteger)index;
+- (nullable NSString *)lineGraph:(nonnull BEMSimpleLineGraphView *)graph labelOnXAxisForIndex:(NSInteger)index;
 
 /** The string to display on the label on the X-axis at a given location.
  @discussion Use this instead of labelOnXAxisForIndex when you have implemented locationForPointAtIndex.
@@ -475,7 +475,7 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
 /** The optional text for the popup report.
  @param graph The graph object requesting the total number of points.
  @return The text to substitute for the popup. If nil is returned, the popup text will be derived using the given data point and any supplied suffix and / or prefix. */
-- (nullable NSString *)popUpTextForlineGraph:(BEMSimpleLineGraphView *)graph atIndex:(NSUInteger)index;
+- (nullable NSString *)popUpTextForlineGraph:(BEMSimpleLineGraphView *)graph atIndex:(NSInteger)index;
 
 
 /** The optional suffix to append to the popup report.
@@ -495,7 +495,7 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
  @param graph The graph object requesting the total number of points.
  @param index The index from left to right of the points on the graph. The first value for the index is 0.
  @return Return YES if you want the popup label to be displayed for this index. */
-- (BOOL)lineGraph:(BEMSimpleLineGraphView *)graph alwaysDisplayPopUpAtIndex:(NSUInteger)index;
+- (BOOL)lineGraph:(BEMSimpleLineGraphView *)graph alwaysDisplayPopUpAtIndex:(NSInteger)index;
 
 
 /** Optional method to set the maximum value of the Y-Axis. If not implemented, the maximum value will be the biggest point of the graph.
@@ -553,7 +553,7 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
  @param graph The graph object requesting the padding value.
  @param popupView The popup view owned by the graph that needs to be modified
  @param index The index of the element associated with the popup view */
-- (void)lineGraph:(BEMSimpleLineGraphView *)graph modifyPopupView:(UIView *)popupView forIndex:(NSUInteger)index;
+- (void)lineGraph:(BEMSimpleLineGraphView *)graph modifyPopupView:(UIView *)popupView forIndex:(NSInteger)index;
 
 
 //----- TOUCH EVENTS -----//
@@ -562,7 +562,7 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
 /** Sent to the delegate when the user starts touching the graph. The property 'enableTouchReport' must be set to YES.
  @param graph The graph object which was touched by the user.
  @param index The closest index (X-axis) from the location the user is currently touching. */
-- (void)lineGraph:(BEMSimpleLineGraphView *)graph didTouchGraphWithClosestIndex:(NSUInteger)index;
+- (void)lineGraph:(BEMSimpleLineGraphView *)graph didTouchGraphWithClosestIndex:(NSInteger)index;
 
 
 /** Sent to the delegate when the user stops touching the graph.
@@ -578,21 +578,21 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
  @discussion For example returning '1' would mean that half of the labels on the X-axis are not displayed: the first is not displayed, the second is, the third is not etc. Returning '0' would mean that all of the labels will be displayed. Finally, returning a value equal to the number of labels will only display the first and last label.
  @param graph The graph object which is requesting the number of gaps between the labels.
  @return The number of labels to "jump" between each displayed label on the X-axis. */
-- (NSUInteger)numberOfGapsBetweenLabelsOnLineGraph:(BEMSimpleLineGraphView *)graph;
+- (NSInteger)numberOfGapsBetweenLabelsOnLineGraph:(BEMSimpleLineGraphView *)graph;
 
 
 /** The starting index to plot X-Axis values.  MUST ALSO IMPLEMENT incrementIndexForXAxisOnLineGraph FOR THIS TO TAKE EFFECT
  @discussion This allows you to specify a custom starting index for drawing x axis labels
  @param graph The graph object which is requesting the number of gaps between the labels.
  @return The graph data index to begin drawing labels */
-- (NSUInteger)baseIndexForXAxisOnLineGraph:(BEMSimpleLineGraphView *)graph;
+- (NSInteger)baseIndexForXAxisOnLineGraph:(BEMSimpleLineGraphView *)graph;
 
 
 /** The increment to apply when drawing X-Axis labels.  This increment is applied to the base x axis index.  MUST ALSO IMPLEMENT baseIndexForXAxisOnLineGraph FOR THIS TO TAKE EFFECT
  @discussion This allows you to set a custom interval in drawing x axis labels. When this is set in conjuction with baseIndexForXAxisOnLineGraph, `numberOfGapsBetweenLabelsOnLineGraph` is ignored
  @param graph The graph object which is requesting the number of gaps between the labels.
  @return The increment between X-Axis labels */
-- (NSUInteger)incrementIndexForXAxisOnLineGraph:(BEMSimpleLineGraphView *)graph;
+- (NSInteger)incrementIndexForXAxisOnLineGraph:(BEMSimpleLineGraphView *)graph;
 
 
 /** An array of graph indices where X-Axis labels should be drawn
@@ -608,7 +608,7 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
  @param graph The graph object requesting the point value.
  @param index The index from left to right of a given point (X-axis). The first value for the index is 0.
  @return The X-axis value at a given index. */
-- (CGFloat)lineGraph:(BEMSimpleLineGraphView *)graph locationForPointAtIndex:(NSUInteger)index;
+- (CGFloat)lineGraph:(BEMSimpleLineGraphView *)graph locationForPointAtIndex:(NSInteger)index;
 
 /** The total number of X-axis labels on the line graph.
  @discussion Calculates the total wdith of the graph and evenly spaces the labels based on the graph width. If this and lineGraph:locationForPointAtIndex: are implemented, labels may diverge from data points
@@ -632,7 +632,7 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
  @discussion Calculates the total height of the graph and evenly spaces the labels based on the graph height. Default value is 3.
  @param graph The graph object which is requesting the number of labels.
  @return The number of labels displayed on the Y-axis. */
-- (NSUInteger)numberOfYAxisLabelsOnLineGraph:(BEMSimpleLineGraphView *)graph;
+- (NSInteger)numberOfYAxisLabelsOnLineGraph:(BEMSimpleLineGraphView *)graph;
 
 
 /** The optional prefix to append to the y axis.

Classes/BEMSimpleLineGraphView.m

@@ -28,7 +28,7 @@ @interface BEMSimpleLineGraphView ()
 #pragma mark Properties to store data and computed locations
 /// The number of Points in the Graph
 /// Set by layoutself.numberOfPoints
-@property (assign, nonatomic ) NSUInteger numberOfPoints;
+@property (assign, nonatomic ) NSInteger numberOfPoints;
 
 /// All of the Data Points from datasource (Y values)
 /// Set by getData and used throughout.
@@ -893,7 +893,7 @@ - (void)drawXAxis {
                 if (indexLabels) {
                     xAxisLabelText = [self.dataSource lineGraph:self labelOnXAxisForIndex:realIndex ];
                 } else {
-                    xAxisLabelText = [NSString stringWithFormat:@"%lu", realIndex];
+                    xAxisLabelText = [NSString stringWithFormat:@"%lu", (long)realIndex];
                 }
             }
             [newAxisLabelTexts addObject:xAxisLabelText];
@@ -1346,7 +1346,7 @@ -(CGFloat) xValueForLocation: (CGFloat) location {
 - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer {
     CGFloat xLoc = [gestureRecognizer locationInView:self.labelsView].x;
     if ([gestureRecognizer isEqual:self.touchReportPanGesture]) {
-        if (gestureRecognizer.numberOfTouches >= self.touchReportFingersRequired) {
+        if ((NSInteger)gestureRecognizer.numberOfTouches >= self.touchReportFingersRequired) {
             CGPoint translation = [self.touchReportPanGesture velocityInView:self.labelsView];
             return fabs(translation.y) < fabs(translation.x);
         } else {

Sample Project/SimpleLineChart.xcodeproj/project.pbxproj

@@ -641,6 +641,7 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
@@ -698,6 +699,7 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;

Sample Project/SimpleLineChart/ViewController.m

@@ -101,7 +101,7 @@ - (void)hydrateDatasets {
     BOOL showNullValue = YES;
 
     // Add objects to the array based on the stepper value
-    for (int i = 0; i < 9; i++) {
+    for (NSUInteger i = 0; i < 9; i++) {
         [self.arrayOfValues addObject:@([self getRandomFloat])]; // Random values for the graph
         if (i == 0) {
             [self.arrayOfDates addObject:baseDate]; // Dates for the X-Axis of the graph
@@ -123,7 +123,7 @@ - (NSDate *)dateForGraphAfterDate:(NSDate *)date {
 }
 
 - (NSString *)labelForDateAtIndex:(NSInteger)index {
-    NSDate *date = self.arrayOfDates[index];
+    NSDate *date = self.arrayOfDates[(NSUInteger)index];
     NSDateFormatter *df = [[NSDateFormatter alloc] init];
     df.dateFormat = @"MM/dd";
     NSString *label = [df stringFromDate:date];
@@ -203,28 +203,28 @@ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
 
 #pragma mark - SimpleLineGraph Data Source
 
-- (NSUInteger)numberOfPointsInLineGraph:(BEMSimpleLineGraphView *)graph {
+- (NSInteger)numberOfPointsInLineGraph:(BEMSimpleLineGraphView *)graph {
     return (int)[self.arrayOfValues count];
 }
 
-- (CGFloat)lineGraph:(BEMSimpleLineGraphView *)graph valueForPointAtIndex:(NSUInteger)index {
-    return [[self.arrayOfValues objectAtIndex:index] doubleValue];
+- (CGFloat)lineGraph:(BEMSimpleLineGraphView *)graph valueForPointAtIndex:(NSInteger)index {
+    return self.arrayOfValues [(NSUInteger)index].doubleValue;
 }
 
 #pragma mark - SimpleLineGraph Delegate
 
-- (NSUInteger)numberOfGapsBetweenLabelsOnLineGraph:(BEMSimpleLineGraphView *)graph {
+- (NSInteger)numberOfGapsBetweenLabelsOnLineGraph:(BEMSimpleLineGraphView *)graph {
     return 2;
 }
 
-- (NSString *)lineGraph:(BEMSimpleLineGraphView *)graph labelOnXAxisForIndex:(NSUInteger)index {
+- (NSString *)lineGraph:(BEMSimpleLineGraphView *)graph labelOnXAxisForIndex:(NSInteger)index {
 
     NSString *label = [self labelForDateAtIndex:index];
     return [label stringByReplacingOccurrencesOfString:@" " withString:@"\n"];
 }
 
-- (void)lineGraph:(BEMSimpleLineGraphView *)graph didTouchGraphWithClosestIndex:(NSUInteger)index {
-    self.labelValues.text = [NSString stringWithFormat:@"%@", [self.arrayOfValues objectAtIndex:index]];
+- (void)lineGraph:(BEMSimpleLineGraphView *)graph didTouchGraphWithClosestIndex:(NSInteger)index {
+    self.labelValues.text = [NSString stringWithFormat:@"%@", self.arrayOfValues [(NSUInteger)index]];
     self.labelDates.text = [NSString stringWithFormat:@"in %@", [self labelForDateAtIndex:index]];
 }
 
@@ -234,7 +234,7 @@ - (void)lineGraph:(BEMSimpleLineGraphView *)graph didReleaseTouchFromGraphWithCl
         self.labelDates.alpha = 0.0f;
     } completion:^(BOOL finished) {
         self.labelValues.text = [NSString stringWithFormat:@"%i", [[[BEMGraphCalculator sharedCalculator] calculatePointValueSumOnGraph:self.myGraph] intValue]];
-        self.labelDates.text = [NSString stringWithFormat:@"between %@ and %@", [self labelForDateAtIndex:0], [self labelForDateAtIndex:self.arrayOfDates.count - 1]];
+        self.labelDates.text = [NSString stringWithFormat:@"between %@ and %@", [self labelForDateAtIndex:0], [self labelForDateAtIndex:(NSInteger)(self.arrayOfDates.count) - 1]];
 
         [UIView animateWithDuration:0.5 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
             self.labelValues.alpha = 1.0f;
@@ -247,7 +247,7 @@ - (void)lineGraphDidFinishLoading:(BEMSimpleLineGraphView *)graph {
     if (self.arrayOfValues.count > 0) {
         NSNumber *pointSum = [[BEMGraphCalculator sharedCalculator] calculatePointValueSumOnGraph:self.myGraph];
         self.labelValues.text = [NSString stringWithFormat:@"%i", [pointSum intValue]];
-        self.labelDates.text = [NSString stringWithFormat:@"between %@ and %@", [self labelForDateAtIndex:0], [self labelForDateAtIndex:self.arrayOfDates.count - 1]];
+        self.labelDates.text = [NSString stringWithFormat:@"between %@ and %@", [self labelForDateAtIndex:0], [self labelForDateAtIndex:(NSInteger)(self.arrayOfDates.count) - 1]];
     } else {
         self.labelValues.text = @"No data";
         self.labelDates.text = @"";

Sample Project/SimpleLineChartTests/CustomizationTests.m

@@ -40,15 +40,15 @@ - (void)setUp {
 
 #pragma mark BEMSimpleLineGraph Data Source
 
-- (NSUInteger)numberOfPointsInLineGraph:(BEMSimpleLineGraphView * __nonnull)graph {
-    return numberOfPoints;
+- (NSInteger)numberOfPointsInLineGraph:(BEMSimpleLineGraphView * __nonnull)graph {
+    return (NSInteger)numberOfPoints;
 }
 
-- (CGFloat)lineGraph:(BEMSimpleLineGraphView * __nonnull)graph valueForPointAtIndex:(NSUInteger)index {
+- (CGFloat)lineGraph:(BEMSimpleLineGraphView * __nonnull)graph valueForPointAtIndex:(NSInteger)index {
     return pointValue;
 }
 
-- (NSString *)lineGraph:(nonnull BEMSimpleLineGraphView *)graph labelOnXAxisForIndex:(NSUInteger)index {
+- (NSString *)lineGraph:(nonnull BEMSimpleLineGraphView *)graph labelOnXAxisForIndex:(NSInteger)index {
     return xAxisLabelString;
 }