Handle one datapoint in regular routines, not as special case

Simplify handling of zero points
Add NumberOfPoints field to TestBed
Fix bug when increasing numberofPoints by more than two
Add Activity Indicator to testBed to test didFinishDrawing

Author: mackworth

Classes/BEMLine.m

@@ -30,7 +30,11 @@ - (void)drawRect:(CGRect)rect {
     //---- Draw Reference Lines ---//
     //----------------------------//
     self.layer.sublayers = nil;
-
+    if (self.points.count == 0) {
+        self.backgroundColor = self.bottomColor ?: [UIColor clearColor];
+        return;
+    };
+    
     UIBezierPath *verticalReferenceLinesPath = [UIBezierPath bezierPath];
     UIBezierPath *horizontalReferenceLinesPath = [UIBezierPath bezierPath];
     UIBezierPath *referenceFramePath = [UIBezierPath bezierPath];

Classes/BEMSimpleLineGraphView.h

@@ -157,7 +157,9 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
 
 
 /** Animation style used when the graph appears. Default value is BEMLineAnimationDraw.
- @see Refer to \p BEMLineAnimation for a complete list of animation styles. */
+ @see Refer to \p BEMLineAnimation for a complete list of animation styles. 
+ @discussion Setting this to BEMLineANimationNone also sets animationGraphEntranceTime to zero.
+ */
 @property (nonatomic) BEMLineAnimation animationGraphStyle;
 
 
@@ -484,7 +486,7 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
 /** Sent to the delegate each time the line graph finishes animating and drawing.
  @discussion The respective graph object has been completely drawn and animated at this point. It is safe to use \p graphSnapshotImage after recieving this method call on the delegate.
 
- This method may be called in addition to the \p lineGraphDidFinishLoading: method, after drawing has completed. \p animationGraphEntranceTime is taken into account when calling this method.
+ This method will be called in addition to the \p lineGraphDidFinishLoading: method, after drawing has completed. \p animationGraphEntranceTime is taken into account when calling this method.
 
  @seealso lineGraphDidFinishLoading:
  @param graph The graph object that finished drawing. */

Classes/BEMSimpleLineGraphView.m

@@ -20,7 +20,7 @@
 
 @property (readonly) NSDate * oldestDate, * newestDate;
 @property (readonly) CGFloat smallestValue, biggestValue;
-@property (readonly) NSInteger numberOfPoints;
+@property (assign, nonatomic) NSInteger numberOfPoints;
 @property (assign, nonatomic) float percentNulls;
 
 //data needed to implement delegate methods

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

@@ -14,10 +14,9 @@ @interface DetailViewController ()
 
 @property (strong, nonatomic) NSDate * oldestDate, * newestDate;
 @property (assign, nonatomic) CGFloat smallestValue, biggestValue;
-@property (nonatomic, assign) NSInteger numberOfPoints;
-
 
 @property (weak, nonatomic) IBOutlet UIStepper *graphObjectIncrement;
+@property (strong, nonatomic) IBOutlet UIActivityIndicatorView * activity;
 
 @property (strong, nonatomic) NSMutableArray <NSNumber *> *arrayOfValues;
 @property (strong, nonatomic) NSMutableArray <NSDate *> *arrayOfDates;
@@ -41,9 +40,11 @@ @implementation DetailViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.navigationItem.leftBarButtonItem = self.splitViewController.displayModeButtonItem;
+    self.activity = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
     self.navigationItem.leftItemsSupplementBackButton = YES;
-
+    UIBarButtonItem * activityButton =  [[UIBarButtonItem alloc] initWithCustomView:self.activity];
+    self.navigationItem.rightBarButtonItems = [self.navigationItem.rightBarButtonItems arrayByAddingObject:activityButton];
+    
     self.maxValue = -1.0;
     self.minValue = -1.0;
     self.maxXValue = -1.0;
@@ -66,7 +67,7 @@ - (void)viewDidLoad {
 
     // Do any additional setup after loading the view.
 
-    self.graphObjectIncrement.value = 1000;
+    _numberOfPoints = 10;
 
     [self hydrateDatasets];
 
@@ -75,21 +76,35 @@ - (void)viewDidLoad {
 
 #pragma mark Data management
 
+-(void) setNumberOfPoints:(NSInteger)numberOfPoints {
+    if (numberOfPoints != _numberOfPoints) {
+        NSInteger oldNumberOfPoints = _numberOfPoints;
+
+        _numberOfPoints = numberOfPoints;
+
+        if (numberOfPoints == oldNumberOfPoints + 1) {
+            [self addPointToGraph];
+        } else if (numberOfPoints == oldNumberOfPoints - 1) {
+            [self removePointFromGraph];
+        } else {
+            [self hydrateDatasets];
+        }
+        [self.myGraph reloadGraph];
+    }
+}
+
 float randomProbability () {
     return  (float) ((double)(arc4random())) / UINT32_MAX;
 }
 
-
 - (void)hydrateDatasets {
     // Reset the arrays of values (Y-Axis points) and dates (X-Axis points / labels)
     if (!self.arrayOfValues) self.arrayOfValues = [[NSMutableArray alloc] init];
     if (!self.arrayOfDates) self.arrayOfDates = [[NSMutableArray alloc] init];
     [self.arrayOfValues removeAllObjects];
     [self.arrayOfDates removeAllObjects];
 
-    self.totalNumber = 0;
     NSDate *date = [NSDate date];
-    self.numberOfPoints = self.graphObjectIncrement.value;
     // Add objects to the array based on the stepper value
     CGFloat lastValue = 5000;
     for (int i = 0; i < self.numberOfPoints; i++) {
@@ -104,13 +119,15 @@ - (void)hydrateDatasets {
         date = [self dateForGraphAfterDate:date];
     }
     [self checkMaximums];
+    self.graphObjectIncrement.value = self.numberOfPoints;
 }
 
 -(void) checkMaximums {
     self.oldestDate = [NSDate distantFuture];
     self.newestDate = [NSDate distantPast];
     self.biggestValue = -INFINITY;
     self.smallestValue = INFINITY;
+    self.totalNumber = 0;
     for (NSInteger i = 0; i < self.numberOfPoints; i++) {
         CGFloat value = self.arrayOfValues[(NSUInteger)i].floatValue;
         if (value < BEMNullGraphValue) {
@@ -119,7 +136,7 @@ -(void) checkMaximums {
             self.smallestValue = MIN(self.smallestValue,value );
         }
     }
-    self.oldestDate = self.arrayOfDates[0];
+     if (self.arrayOfDates.count > 0) self.oldestDate = self.arrayOfDates[0];
     self.newestDate = [self.arrayOfDates lastObject]; //needs to be last for notification
 
 }
@@ -157,14 +174,7 @@ - (float)getRandomFloat {
 }
 
 - (IBAction)addOrRemovePointFromGraph:(id)sender {
-    if (self.graphObjectIncrement.value > self.numberOfPoints) {
-        [self addPointToGraph];
-    } else if (self.graphObjectIncrement.value < self.numberOfPoints) {
-        [self removePointFromGraph];
-    }
     self.numberOfPoints = self.graphObjectIncrement.value;
-    [self checkMaximums];
-    [self.myGraph reloadGraph];
 }
 
 - (void) addPointToGraph {
@@ -180,6 +190,7 @@ - (void) addPointToGraph {
     [self.arrayOfValues addObject:newValue];
     NSDate *lastDate = self.arrayOfDates.count > 0 ? [self.arrayOfDates lastObject]: [NSDate date];
     NSDate *newDate = [self dateForGraphAfterDate:lastDate];
+    self.oldestDate = newDate;
     [self.arrayOfDates addObject:newDate];
 }
 
@@ -188,8 +199,10 @@ - (void) removePointFromGraph {
         // Remove point
         [self.arrayOfValues removeObjectAtIndex:0];
         [self.arrayOfDates removeObjectAtIndex:0];
+        [self checkMaximums];
     }
 }
+
 -(NSString *) formatNumber: (NSNumber *) number {
     return [NSNumberFormatter localizedStringFromNumber:number
                                                          numberStyle:NSNumberFormatterDecimalStyle];
@@ -287,6 +300,16 @@ -(BOOL) respondsToSelector:(SEL)aSelector {
     }
 }
 
+-(void) lineGraphDidBeginLoading:(BEMSimpleLineGraphView *)graph {
+    [self.activity startAnimating];
+
+}
+
+-(void) lineGraphDidFinishDrawing:(BEMSimpleLineGraphView *)graph {
+    [self.activity stopAnimating];
+
+}
+
 
 - (NSString *)lineGraph:(BEMSimpleLineGraphView *)graph labelOnXAxisForIndex:(NSInteger)index {
 //    return [NSString stringWithFormat:@"%lu", (long)index];

Sample Project/TestBed/DetailViewController.h

@@ -94,6 +94,7 @@ @interface MasterViewController () <ARFontPickerViewControllerDelegate, UITextFi
 @property (strong, nonatomic) IBOutlet BEMSimpleLineGraphView *myGraph;
 
 @property (strong, nonatomic) NSDictionary <NSString *, id> *methodList;
+@property (strong, nonatomic) IBOutlet UITextField *numberOfPointsField;
 
 @property (strong, nonatomic) IBOutlet UITextField *widthLine;
 @property (strong, nonatomic) IBOutlet UITextField *staticPaddingField;
@@ -219,13 +220,15 @@ - (void)viewDidLoad {
     [self.detailViewController addObserver:self forKeyPath:@"newestDate" options:NSKeyValueObservingOptionNew context:nil];
     [self restoreProperties];
     [self restoreUI];
-
+    [self.detailViewController addObserver:self forKeyPath:@"numberOfPoints" options:NSKeyValueObservingOptionNew context:nil];
 }
 
 -(void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
-//    if ([keyPath isEqualToString:@"newestDate"]) {
+    if ([keyPath isEqualToString:@"newestDate"]) {
         [self rangePlaceHolders:self];
-//    }
+    } else if ([keyPath isEqualToString:@"numberOfPoints"]) {
+        self.numberOfPointsField.intValue = self.detailViewController.numberOfPoints ;
+    }
 }
 
 -(void) applicationWillResign:(id) sender {
@@ -309,6 +312,7 @@ -(void) restoreProperties {
 self.detailViewController.property = [defaults   type ##ForKey:@#property]; \
 }
 
+    RestoreDetail (numberOfPoints, integer );
     RestoreDetail (percentNulls, float );
     RestoreDetail (popUpText, object);
     RestoreDetail (popUpPrefix, object);
@@ -396,6 +400,7 @@ -(void) saveProperties{
     [defaults setFloat:self.myGraph.labelFont.pointSize forKey:@"labelFontSize"] ;
 
 #define EncodeDetail(property, type) [defaults set ## type: self.detailViewController.property forKey:@#property]
+    EncodeDetail (numberOfPoints, Integer );
     EncodeDetail (percentNulls, Float );
 
     EncodeDetail (popUpText, Object);
@@ -425,6 +430,7 @@ -(void) saveProperties{
 
 
 -(void) restoreUI {
+    self.numberOfPointsField.intValue = self.detailViewController.numberOfPoints;
     self.widthLine.floatValue = self.myGraph.widthLine;
     self.staticPaddingField.floatValue = self.detailViewController.staticPaddingValue;
     self.bezierSwitch.on = self.myGraph.enableBezierCurve;
@@ -535,6 +541,12 @@ -(void) rangePlaceHolders: (id) sender {
     Gradient choices
  */
 
+- (IBAction)numberOfPointsDidChange:(UITextField *)sender {
+    NSInteger value = sender.intValue;
+    if (value >= 0 ) {
+        self.detailViewController.numberOfPoints = value;
+    }
+}
 
 #pragma mark Main Line
 - (IBAction)widthLineDidChange:(UITextField *)sender {
@@ -879,6 +891,7 @@ -(void) updateAnimationGraphStyle {
 - (IBAction)animationGraphStyle:(UIButton *)sender {
     if (self.myGraph.animationGraphStyle == BEMLineAnimationNone) {
         self.myGraph.animationGraphStyle = BEMLineAnimationDraw;
+        self.myGraph.animationGraphEntranceTime = self.animationEntranceTime.floatValue;
     } else {
         self.myGraph.animationGraphStyle ++;
     }
@@ -887,7 +900,7 @@ - (IBAction)animationGraphStyle:(UIButton *)sender {
 }
 
 - (IBAction)animationGraphEntranceTimeDidChange:(UITextField *)sender {
-    self.myGraph.animationGraphEntranceTime = (CGFloat) sender.text.floatValue;
+    self.myGraph.animationGraphEntranceTime = (CGFloat) sender.floatValue;
     [self.myGraph reloadGraph];
 }
 
@@ -1202,7 +1215,8 @@ -(BOOL) textFieldShouldReturn:(UITextField *)textField {
 
 -(void) dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
-    [self.detailViewController removeObserver:self forKeyPath:@"totalNumber" ];
+    [self.detailViewController removeObserver:self forKeyPath:@"newestDate" ];
+    [self.detailViewController removeObserver:self forKeyPath:@"numberOfPoints" ];
 
 }
 @end