From 9548933739251b3ea5cd09b9cc6bcc6c54a90aba Mon Sep 17 00:00:00 2001 From: Eugene Mozharovsky Date: Sat, 23 Jan 2016 23:16:06 +0300 Subject: [PATCH] Added new selection features MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Constantly showing the most recent circle selected * A property for getting the selected circle (it’s going to be NULL on reload) --- Classes/BEMAverageLine.h | 0 Classes/BEMAverageLine.m | 0 Classes/BEMCircle.h | 0 Classes/BEMCircle.m | 0 Classes/BEMLine.h | 0 Classes/BEMLine.m | 0 Classes/BEMPermanentPopupView.h | 0 Classes/BEMPermanentPopupView.m | 0 Classes/BEMSimpleLineGraphView.h | 7 +++++++ Classes/BEMSimpleLineGraphView.m | 7 ++++++- 10 files changed, 13 insertions(+), 1 deletion(-) mode change 100644 => 100755 Classes/BEMAverageLine.h mode change 100644 => 100755 Classes/BEMAverageLine.m mode change 100644 => 100755 Classes/BEMCircle.h mode change 100644 => 100755 Classes/BEMCircle.m mode change 100644 => 100755 Classes/BEMLine.h mode change 100644 => 100755 Classes/BEMLine.m mode change 100644 => 100755 Classes/BEMPermanentPopupView.h mode change 100644 => 100755 Classes/BEMPermanentPopupView.m mode change 100644 => 100755 Classes/BEMSimpleLineGraphView.h mode change 100644 => 100755 Classes/BEMSimpleLineGraphView.m diff --git a/Classes/BEMAverageLine.h b/Classes/BEMAverageLine.h old mode 100644 new mode 100755 diff --git a/Classes/BEMAverageLine.m b/Classes/BEMAverageLine.m old mode 100644 new mode 100755 diff --git a/Classes/BEMCircle.h b/Classes/BEMCircle.h old mode 100644 new mode 100755 diff --git a/Classes/BEMCircle.m b/Classes/BEMCircle.m old mode 100644 new mode 100755 diff --git a/Classes/BEMLine.h b/Classes/BEMLine.h old mode 100644 new mode 100755 diff --git a/Classes/BEMLine.m b/Classes/BEMLine.m old mode 100644 new mode 100755 diff --git a/Classes/BEMPermanentPopupView.h b/Classes/BEMPermanentPopupView.h old mode 100644 new mode 100755 diff --git a/Classes/BEMPermanentPopupView.m b/Classes/BEMPermanentPopupView.m old mode 100644 new mode 100755 diff --git a/Classes/BEMSimpleLineGraphView.h b/Classes/BEMSimpleLineGraphView.h old mode 100644 new mode 100755 index 153f353..8837950 --- a/Classes/BEMSimpleLineGraphView.h +++ b/Classes/BEMSimpleLineGraphView.h @@ -138,6 +138,13 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView = DotFirstTag100 && closestDot.tag < DotLastTag1000 && [closestDot isKindOfClass:[BEMCircle class]] && self.alwaysDisplayPopUpLabels == NO) { [self setUpPopUpLabelAbovePoint:closestDot]; @@ -1355,7 +1360,7 @@ - (void)handleGestureAction:(UIGestureRecognizer *)recognizer { } [UIView animateWithDuration:0.2 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{ - if (self.alwaysDisplayDots == NO && self.displayDotsOnly == NO) { + if (self.alwaysDisplayDots == NO && self.displayDotsOnly == NO && self.alwaysShowSelectedCircle == NO) { closestDot.alpha = 0; }