Merge pull request #218 from dkk/master

Reference Line Width
Boris-Em · Jul 31, 2015 · 0bb60c9 · 0bb60c9
2 parents 929df84 + fb81820
commit 0bb60c9
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 33 deletions.
diff --git a/Classes/BEMLine.h b/Classes/BEMLine.h
@@ -156,6 +156,9 @@ typedef NS_ENUM(NSUInteger, BEMLineGradientDirection) {
 /// The width of the line
 @property (nonatomic) float lineWidth;
 
+/// The width of a reference line
+@property (nonatomic) float referenceLineWidth;
+
 
 
 //----- BEZIER CURVE -----//

diff --git a/Classes/BEMLine.m b/Classes/BEMLine.m
@@ -56,20 +56,20 @@ - (void)drawRect:(CGRect)rect {
 
         if (self.enableLeftReferenceFrameLine) {
             // Left Line
-            [referenceFramePath moveToPoint:CGPointMake(0+self.lineWidth/4, self.frame.size.height)];
-            [referenceFramePath addLineToPoint:CGPointMake(0+self.lineWidth/4, 0)];
+            [referenceFramePath moveToPoint:CGPointMake(0+self.referenceLineWidth/4, self.frame.size.height)];
+            [referenceFramePath addLineToPoint:CGPointMake(0+self.referenceLineWidth/4, 0)];
         }
 
         if (self.enableTopReferenceFrameLine) {
             // Top Line
-            [referenceFramePath moveToPoint:CGPointMake(0+self.lineWidth/4, 0)];
+            [referenceFramePath moveToPoint:CGPointMake(0+self.referenceLineWidth/4, 0)];
             [referenceFramePath addLineToPoint:CGPointMake(self.frame.size.width, 0)];
         }
 
         if (self.enableRightReferenceFrameLine) {
             // Right Line
-            [referenceFramePath moveToPoint:CGPointMake(self.frame.size.width - self.lineWidth/4, self.frame.size.height)];
-            [referenceFramePath addLineToPoint:CGPointMake(self.frame.size.width - self.lineWidth/4, 0)];
+            [referenceFramePath moveToPoint:CGPointMake(self.frame.size.width - self.referenceLineWidth/4, self.frame.size.height)];
+            [referenceFramePath addLineToPoint:CGPointMake(self.frame.size.width - self.referenceLineWidth/4, 0)];
         }
 
         [referenceFramePath closePath];
@@ -268,7 +268,7 @@ - (void)drawRect:(CGRect)rect {
         verticalReferenceLinesPathLayer.path = verticalReferenceLinesPath.CGPath;
         verticalReferenceLinesPathLayer.opacity = self.lineAlpha == 0 ? 0.1 : self.lineAlpha/2;
         verticalReferenceLinesPathLayer.fillColor = nil;
-        verticalReferenceLinesPathLayer.lineWidth = self.lineWidth/2;
+        verticalReferenceLinesPathLayer.lineWidth = self.referenceLineWidth/2;
 
         if (self.lineDashPatternForReferenceYAxisLines) {
             verticalReferenceLinesPathLayer.lineDashPattern = self.lineDashPatternForReferenceYAxisLines;
@@ -290,7 +290,7 @@ - (void)drawRect:(CGRect)rect {
         horizontalReferenceLinesPathLayer.path = horizontalReferenceLinesPath.CGPath;
         horizontalReferenceLinesPathLayer.opacity = self.lineAlpha == 0 ? 0.1 : self.lineAlpha/2;
         horizontalReferenceLinesPathLayer.fillColor = nil;
-        horizontalReferenceLinesPathLayer.lineWidth = self.lineWidth/2;
+        horizontalReferenceLinesPathLayer.lineWidth = self.referenceLineWidth/2;
         if(self.lineDashPatternForReferenceXAxisLines) {
             horizontalReferenceLinesPathLayer.lineDashPattern = self.lineDashPatternForReferenceXAxisLines;
         }
@@ -311,7 +311,7 @@ - (void)drawRect:(CGRect)rect {
     referenceLinesPathLayer.path = referenceFramePath.CGPath;
     referenceLinesPathLayer.opacity = self.lineAlpha == 0 ? 0.1 : self.lineAlpha/2;
     referenceLinesPathLayer.fillColor = nil;
-    referenceLinesPathLayer.lineWidth = self.lineWidth/2;
+    referenceLinesPathLayer.lineWidth = self.referenceLineWidth/2;
 
     if (self.refrenceLineColor) referenceLinesPathLayer.strokeColor = self.refrenceLineColor.CGColor;
     else referenceLinesPathLayer.strokeColor = self.color.CGColor;

diff --git a/Classes/BEMSimpleLineGraphView.h b/Classes/BEMSimpleLineGraphView.h
@@ -265,6 +265,10 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
 @property (nonatomic) IBInspectable CGFloat widthLine;
 
 
+/// Width of the reference lines of the graph. Default is the value of widthLine/2.
+@property (nonatomic) IBInspectable CGFloat widthReferenceLines;
+
+
 /// Color of the reference lines of the graph. Default is same color as `colorLine`.
 @property (strong, nonatomic) UIColor *colorReferenceLines;
 

diff --git a/Classes/BEMSimpleLineGraphView.m b/Classes/BEMSimpleLineGraphView.m
@@ -169,6 +169,7 @@ - (void)commonInit {
 
     // Set Size Values
     _widthLine = 1.0;
+    _widthReferenceLines = 1.0;
     _sizePoint = 10.0;
 
     // Set Default Feature Values
@@ -580,6 +581,7 @@ - (void)drawLine {
     line.topGradient = self.gradientTop;
     line.bottomGradient = self.gradientBottom;
     line.lineWidth = self.widthLine;
+    line.referenceLineWidth = self.widthReferenceLines?self.widthReferenceLines:(self.widthLine/2);
     line.lineAlpha = self.alphaLine;
     line.bezierCurveIsEnabled = self.enableBezierCurve;
     line.arrayOfPoints = yAxisValues;