Simplify those

hardikamal · May 7, 2015 · 2f470c5 · 2f470c5
1 parent e056480
commit 2f470c5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 64 deletions.
diff --git a/Charts/Classes/Charts/BarLineChartViewBase.swift b/Charts/Classes/Charts/BarLineChartViewBase.swift
@@ -106,12 +106,13 @@ public class BarLineChartViewBase: ChartViewBase, UIGestureRecognizerDelegate
  _panGestureRecognizer.delegate = self;
 
  self.addGestureRecognizer(_tapGestureRecognizer);
- if (_doubleTapToZoomEnabled)
- {
- self.addGestureRecognizer(_doubleTapGestureRecognizer);
- }
- updateScaleGestureRecognizers();
+ self.addGestureRecognizer(_doubleTapGestureRecognizer);
+ self.addGestureRecognizer(_pinchGestureRecognizer);
  self.addGestureRecognizer(_panGestureRecognizer);
+
+ _doubleTapGestureRecognizer.enabled = _doubleTapToZoomEnabled;
+ _pinchGestureRecognizer.enabled = _pinchZoomEnabled || _scaleXEnabled || _scaleYEnabled;
+ _panGestureRecognizer.enabled = _dragEnabled;
  }
 
  public override func drawRect(rect: CGRect)
@@ -974,7 +975,7 @@ public class BarLineChartViewBase: ChartViewBase, UIGestureRecognizerDelegate
  {
  _scaleXEnabled = enabled;
  _scaleYEnabled = enabled;
- updateScaleGestureRecognizers();
+ _pinchGestureRecognizer.enabled = _pinchZoomEnabled || _scaleXEnabled || _scaleYEnabled;
  }
  }
 
@@ -989,7 +990,7 @@ public class BarLineChartViewBase: ChartViewBase, UIGestureRecognizerDelegate
  if (_scaleXEnabled != newValue)
  {
  _scaleXEnabled = newValue;
- updateScaleGestureRecognizers();
+ _pinchGestureRecognizer.enabled = _pinchZoomEnabled || _scaleXEnabled || _scaleYEnabled;
  }
  }
  }
@@ -1005,7 +1006,7 @@ public class BarLineChartViewBase: ChartViewBase, UIGestureRecognizerDelegate
  if (_scaleYEnabled != newValue)
  {
  _scaleYEnabled = newValue;
- updateScaleGestureRecognizers();
+ _pinchGestureRecognizer.enabled = _pinchZoomEnabled || _scaleXEnabled || _scaleYEnabled;
  }
  }
  }
@@ -1025,24 +1026,7 @@ public class BarLineChartViewBase: ChartViewBase, UIGestureRecognizerDelegate
  if (_doubleTapToZoomEnabled != newValue)
  {
  _doubleTapToZoomEnabled = newValue;
- if (_doubleTapToZoomEnabled)
- {
- self.addGestureRecognizer(_doubleTapGestureRecognizer);
- }
- else
- {
- if (self.gestureRecognizers != nil)
- {
- for (var i = 0; i < self.gestureRecognizers!.count; i++)
- {
- if (self.gestureRecognizers?[i] === _doubleTapGestureRecognizer)
- {
- self.gestureRecognizers!.removeAtIndex(i);
- break;
- }
- }
- }
- }
+ _doubleTapGestureRecognizer.enabled = _doubleTapToZoomEnabled;
  }
  }
  }
@@ -1329,29 +1313,9 @@ public class BarLineChartViewBase: ChartViewBase, UIGestureRecognizerDelegate
  if (_pinchZoomEnabled != newValue)
  {
  _pinchZoomEnabled = newValue;
- updateScaleGestureRecognizers();
- }
- }
- }
-
- private func updateScaleGestureRecognizers()
- {
- if (self.gestureRecognizers != nil)
- {
- for (var i = 0; i < self.gestureRecognizers!.count; i++)
- {
- if (self.gestureRecognizers![i] === _pinchGestureRecognizer)
- {
- self.gestureRecognizers!.removeAtIndex(i);
- break;
- }
+ _pinchGestureRecognizer.enabled = _pinchZoomEnabled || _scaleXEnabled || _scaleYEnabled;
  }
  }
- 
- if (_pinchZoomEnabled || _scaleXEnabled || _scaleYEnabled)
- {
- self.addGestureRecognizer(_pinchGestureRecognizer);
- }
  }
 
  /// returns true if pinch-zoom is enabled, false if not

diff --git a/Charts/Classes/Charts/PieRadarChartViewBase.swift b/Charts/Classes/Charts/PieRadarChartViewBase.swift
@@ -55,11 +55,9 @@ public class PieRadarChartViewBase: ChartViewBase
  _rotationGestureRecognizer = UIRotationGestureRecognizer(target: self, action: Selector("rotationGestureRecognized:"));
 
  self.addGestureRecognizer(_tapGestureRecognizer);
+ self.addGestureRecognizer(_rotationGestureRecognizer);
 
- if (rotationWithTwoFingers)
- {
- self.addGestureRecognizer(_rotationGestureRecognizer);
- }
+ _rotationGestureRecognizer.enabled = rotationWithTwoFingers;
  }
 
  internal override func calcMinMax()
@@ -369,19 +367,8 @@ public class PieRadarChartViewBase: ChartViewBase
  }
  set
  {
- if (newValue != _rotationWithTwoFingers)
- {
- _rotationWithTwoFingers = newValue;
-
- if (_rotationWithTwoFingers)
- {
- self.addGestureRecognizer(_rotationGestureRecognizer);
- }
- else
- {
- self.removeGestureRecognizer(_rotationGestureRecognizer);
- }
- }
+ _rotationWithTwoFingers = newValue;
+ _rotationGestureRecognizer.enabled = _rotationWithTwoFingers;
  }
  }